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

author: Evan Prodromou <evan@status.net> 2009-11-08 17:06:41 -0500
committer: Evan Prodromou <evan@status.net> 2009-11-08 17:06:41 -0500
commit: 111f6a775daf9334adb05c9f8e539d682238f4dd (patch)
tree: ce98d1968560538272e53a79ef4551b194eb1ab8
parent: b7e2e3fd2b7e36f75c810a599334c2ca8abcca55 (diff)
parent: da444f8a15043f326aa9a629ba5f0b25bc35b1e5 (diff)
92 files changed, 13683 insertions, 5180 deletions
diff --git a/EVENTS.txt b/EVENTS.txt
index 201ce7dfe..25a51516b 100644
--- a/EVENTS.txt
+++ b/EVENTS.txt
@@ -298,99 +298,99 @@ CheckSchema: chance to check the schema
 StartProfilePageProfileSection: Starting to show the section of the
                               profile page with the actual profile data;
                               hook to prevent showing the profile (e.g.)
-- $action: the current action
+- $userprofile: UserProfile widget
 - &$profile: the profile being shown
 
 StartProfilePageProfileElements: inside the section, before the first
                                element; prepend elements here
-- $action: the current action
+- $userprofile: UserProfile widget
 - &$profile: the profile being shown
 
 EndProfilePageProfileElements: inside the section, after the last element;
                              append elements here
-- $action: the current action
+- $userprofile: UserProfile widget
 - &$profile: the profile being shown
 
 EndProfilePageProfileSection: After showing the section of the profile
                             page with the profile elements
-- $action: the current action
+- $userprofile: UserProfile widget
 - &$profile: the profile being shown
 
 StartProfilePageActionsSection: Starting to show the section of the
                                     profile page with action links; hook
                                     to hide them (for example)
-- $action: the current action
+- $userprofile: UserProfile widget
 - &$profile: the profile being shown
 
 StartProfilePageActionsElements: inside the list, before the first
                                      element; prepend elements here
-- $action: the current action
+- $userprofile: UserProfile widget
 - &$profile: the profile being shown
 
 EndProfilePageActionsElements: inside the list, after the last element;
                                    append elements here
-- $action: the current action
+- $userprofile: UserProfile widget
 - &$profile: the profile being shown
 
 EndProfilePageActionsSection: After showing the section of the profile
                                   page with the entity actions
-- $action: the current action
+- $userprofile: UserProfile widget
 - &$profile: the profile being shown
 
 StartProfilePageAvatar: before showing the avatar on the profile page
-- $action: the current action
+- $userprofile: UserProfile widget
 - &$profile: the profile being shown
 
 EndProfilePageAvatar: after showing the avatar on the profile page
-- $action: the current action
+- $userprofile: UserProfile widget
 - &$profile: the profile being shown
 
 StartProfilePageNickname: before showing the nickname on the profile page
-- $action: the current action
+- $userprofile: UserProfile widget
 - &$profile: the profile being shown
 
 EndProfilePageNickname: after showing the nickname on the profile page
-- $action: the current action
+- $userprofile: UserProfile widget
 - &$profile: the profile being shown
 
 StartProfilePageFullName: before showing the fullname on the profile page
-- $action: the current action
+- $userprofile: UserProfile widget
 - &$profile: the profile being shown
 
 EndProfilePageFullName: after showing the fullname on the profile page
-- $action: the current action
+- $userprofile: UserProfile widget
 - &$profile: the profile being shown
 
 StartProfilePageLocation: before showing the location on the profile page
-- $action: the current action
+- $userprofile: UserProfile widget
 - &$profile: the profile being shown
 
 EndProfilePageLocation: after showing the location on the profile page
-- $action: the current action
+- $userprofile: UserProfile widget
 - &$profile: the profile being shown
 
 StartProfilePageHomepage: before showing the homepage link on the profile page
-- $action: the current action
+- $userprofile: UserProfile widget
 - &$profile: the profile being shown
 
 EndProfilePageHomepage: after showing the homepage on the profile page
-- $action: the current action
+- $userprofile: UserProfile widget
 - &$profile: the profile being shown
 
 StartProfilePageBio: before showing the bio on the profile page
-- $action: the current action
+- $userprofile: UserProfile widget
 - &$profile: the profile being shown
 
 EndProfilePageBio: after showing the bio on the profile page
-- $action: the current action
+- $userprofile: UserProfile widget
 - &$profile: the profile being shown
 
 StartProfilePageProfileTags: before showing the tags on the profile page
-- $action: the current action
+- $userprofile: UserProfile widget
 - &$profile: the profile being shown
 
 EndProfilePageProfileTags: after showing the tags on the profile page
-- $action: the current action
+- $userprofile: UserProfile widget
 - &$profile: the profile being shown
 
 StartProfileList: when starting a list of profiles (before <ul>)
@@ -489,3 +489,6 @@ ChangePassword: Handle a password change request
 - $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
 
+UserDeleteRelated: Specify additional tables to delete entries from when deleting users
+- $user: User object
+- &$related: array of DB_DataObject class names to delete entries on matching user_id.
diff --git a/actions/all.php b/actions/all.php
index 61cedce74..b0fd8ee77 100644
--- a/actions/all.php
+++ b/actions/all.php
@@ -129,7 +129,7 @@ class AllAction extends ProfileAction
         if (common_logged_in()) {
             $current_user = common_current_user();
             if ($this->user->id === $current_user->id) {
-                $message .= _('Try subscribing to more people, [join a group](%%action.groups%%) or post something yourself.');
+                $message .= _('Try subscribing to more users, [join a group](%%action.groups%%) or post something yourself.');
             } else {
                 $message .= sprintf(_('You can try to [nudge %s](../%s) from his profile or [post something to his or her attention](%%%%action.newnotice%%%%?status_textarea=%s).'), $this->user->nickname, $this->user->nickname, '@' . $this->user->nickname);
             }
diff --git a/actions/foaf.php b/actions/foaf.php
index 356393304..dd2747069 100644
--- a/actions/foaf.php
+++ b/actions/foaf.php
@@ -136,7 +136,7 @@ class FoafAction extends Action
         $person = $this->showMicrobloggingAccount($this->profile,
                                      common_root_url(), $this->user->uri, false);
 
-        // Get people who subscribe to user
+        // Get users who subscribe to user
 
         $sub = new Subscription();
         $sub->subscribed = $this->profile->id;
@@ -250,7 +250,7 @@ class FoafAction extends Action
         if ($isSubscriber) {
              $this->element('sioc:follows', array('rdf:resource'=>$this->user->uri . '#acct'));
         } else {
-            // Get people user is subscribed to
+            // Get users user is subscribed to
             $sub = new Subscription();
             $sub->subscriber = $profile->id;
             $sub->whereAdd('subscriber != subscribed');
diff --git a/actions/groups.php b/actions/groups.php
index 10a1d5964..c713d0a98 100644
--- a/actions/groups.php
+++ b/actions/groups.php
@@ -88,11 +88,12 @@ class GroupsAction extends Action
     {
         $notice =
           sprintf(_('%%%%site.name%%%% groups let you find and talk with ' .
-                    'people of similar interests. After you join a group ' .
+                    'users 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 ' .
+                    'syntax "!groupname". Are you not seeing any groups ' .
+                    'you like? Try ' .
                     '[searching for one](%%%%action.groupsearch%%%%) or ' .
-                    '[start your own!](%%%%action.newgroup%%%%)'));
+                    '[start your own](%%%%action.newgroup%%%%)!'));
         $this->elementStart('div', 'instructions');
         $this->raw(common_markup_to_html($notice));
         $this->elementEnd('div');
diff --git a/actions/imsettings.php b/actions/imsettings.php
index f57933b43..49c7b2a0e 100644
--- a/actions/imsettings.php
+++ b/actions/imsettings.php
@@ -69,7 +69,7 @@ class ImsettingsAction extends ConnectSettingsAction
     {
         return _('You can send and receive notices through '.
                  'Jabber/GTalk [instant messages](%%doc.im%%). '.
-                 'Configure your address and settings below.');
+                 'Configure your instant messages address and settings below.');
     }
 
     /**
@@ -97,7 +97,7 @@ class ImsettingsAction extends ConnectSettingsAction
                                           'action' =>
                                           common_local_url('imsettings')));
         $this->elementStart('fieldset', array('id' => 'settings_im_address'));
-        $this->element('legend', null, _('Address'));
+        $this->element('legend', null, _('IM address'));
         $this->hidden('token', common_session_token());
 
         if ($user->jabber) {
@@ -111,7 +111,7 @@ class ImsettingsAction extends ConnectSettingsAction
             if ($confirm) {
                 $this->element('p', 'form_unconfirmed', $confirm->address);
                 $this->element('p', 'form_note',
-                               sprintf(_('Awaiting confirmation on this address. '.
+                               sprintf(_('Awaiting confirmation on this IM address. '.
                                          'Check your Jabber/GTalk account for a '.
                                          'message with further instructions. '.
                                          '(Did you add %s to your buddy list?)'),
@@ -151,7 +151,7 @@ class ImsettingsAction extends ConnectSettingsAction
         $this->elementStart('li');
         $this->checkbox('jabberreplies',
                         _('Send me replies through Jabber/GTalk '.
-                          'from people I\'m not subscribed to.'),
+                          'from users I am not subscribed to.'),
                         $user->jabberreplies);
         $this->elementEnd('li');
         $this->elementStart('li');
diff --git a/actions/invite.php b/actions/invite.php
index 3015202e9..8a0ac8a1b 100644
--- a/actions/invite.php
+++ b/actions/invite.php
@@ -133,7 +133,7 @@ class InviteAction extends CurrentUserDesignAction
             $this->elementEnd('ul');
         }
         if ($this->subbed) {
-            $this->element('p', null, _('These people are already users and you were automatically subscribed to them:'));
+            $this->element('p', null, _('These are already users and you were automatically subscribed to them:'));
             $this->elementStart('ul');
             foreach ($this->subbed as $other) {
                 $this->element('li', null, sprintf(_('%s (%s)'), $other->nickname, $other->email));
@@ -141,7 +141,7 @@ class InviteAction extends CurrentUserDesignAction
             $this->elementEnd('ul');
         }
         if ($this->sent) {
-            $this->element('p', null, _('Invitation(s) sent to the following people:'));
+            $this->element('p', null, _('Invitation(s) sent to the following e-mail addresses:'));
             $this->elementStart('ul');
             foreach ($this->sent as $other) {
                 $this->element('li', null, $other);
@@ -226,9 +226,9 @@ class InviteAction extends CurrentUserDesignAction
         $headers['Subject'] = sprintf(_('%1$s has invited you to join them on %2$s'), $bestname, $sitename);
 
         $body = sprintf(_("%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".
+                          "%2\$s is a micro-blogging service that lets you keep up-to-date with those you know and those who interest you.\n\n".
+                          "You can also share news about yourself, your thoughts, or your life online with users who know about you. ".
+                          "It is also great for meeting others 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".
diff --git a/actions/noticesearch.php b/actions/noticesearch.php
index 79cf572cc..fe86c8cd3 100644
--- a/actions/noticesearch.php
+++ b/actions/noticesearch.php
@@ -44,7 +44,7 @@ require_once INSTALLDIR.'/lib/searchaction.php';
  * @author   Robin Millette <millette@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
- * @todo     common parent for people and content search?
+ * @todo     common parent for user and content search?
  */
 class NoticesearchAction extends SearchAction
 {
diff --git a/actions/opensearch.php b/actions/opensearch.php
index 861b53d7d..8ebb5fc82 100644
--- a/actions/opensearch.php
+++ b/actions/opensearch.php
@@ -61,7 +61,7 @@ class OpensearchAction extends Action
         $short_name = '';
         if ($type == 'people') {
             $type       = 'peoplesearch';
-            $short_name = _('People Search');
+            $short_name = _('User Search');
         } else {
             $type       = 'noticesearch';
             $short_name = _('Notice Search');
diff --git a/actions/peoplesearch.php b/actions/peoplesearch.php
index 38135ecbd..63a5c88f3 100644
--- a/actions/peoplesearch.php
+++ b/actions/peoplesearch.php
@@ -49,7 +49,7 @@ class PeoplesearchAction extends SearchAction
 {
     function getInstructions()
     {
-        return _('Search for people on %%site.name%% by their name, location, or interests. ' .
+        return _('Search for users on %%site.name%% by their name, location, or interests. ' .
                   'Separate the terms by spaces; they must be 3 characters or more.');
     }
 
diff --git a/actions/peopletag.php b/actions/peopletag.php
index 6dbbc9261..dbce417df 100644
--- a/actions/peopletag.php
+++ b/actions/peopletag.php
@@ -67,7 +67,7 @@ class PeopletagAction extends Action
         $this->tag = $this->trimmed('tag');
 
         if (!common_valid_profile_tag($this->tag)) {
-            $this->clientError(sprintf(_('Not a valid people tag: %s'),
+            $this->clientError(sprintf(_('Not a valid user tag: %s'),
                 $this->tag));
             return;
         }
diff --git a/actions/profilesettings.php b/actions/profilesettings.php
index 0a0cc5997..6a1c07f9d 100644
--- a/actions/profilesettings.php
+++ b/actions/profilesettings.php
@@ -68,8 +68,8 @@ class ProfilesettingsAction extends AccountSettingsAction
 
     function getInstructions()
     {
-        return _('You can update your personal profile info here '.
-                  'so people know more about you.');
+        return _('You can update your personal profile info here ' .
+                  'so readers know more about you.');
     }
 
     function showScripts()
diff --git a/actions/recoverpassword.php b/actions/recoverpassword.php
index 9776c1fb4..dcff35f6e 100644
--- a/actions/recoverpassword.php
+++ b/actions/recoverpassword.php
@@ -149,13 +149,13 @@ class RecoverpasswordAction extends Action
             $this->elementStart('div', 'instructions');
             if ($this->mode == 'recover') {
                 $this->element('p', null,
-                               _('If you\'ve forgotten or lost your' .
+                               _('If you have forgotten or lost your' .
                                  ' password, you can get a new one sent to' .
                                  ' the email address you have stored' .
                                  ' in your account.'));
             } else if ($this->mode == 'reset') {
                 $this->element('p', null,
-                               _('You\'ve been identified. Enter a' .
+                               _('You have been identified. Enter a' .
                                  ' new password below. '));
             }
             $this->elementEnd('div');
@@ -185,10 +185,10 @@ class RecoverpasswordAction extends Action
                                            'class' => 'form_settings',
                                            'action' => common_local_url('recoverpassword')));
         $this->elementStart('fieldset');
-        $this->element('legend', null, _('Password recover'));
+        $this->element('legend', null, _('Password recovery'));
         $this->elementStart('ul', 'form_data');
         $this->elementStart('li');
-        $this->input('nicknameoremail', _('Nickname or email'),
+        $this->input('nicknameoremail', _('Nickname or email address'),
                      $this->trimmed('nicknameoremail'),
                      _('Your nickname on this server, ' .
                         'or your registered email address.'));
diff --git a/actions/register.php b/actions/register.php
index 57f8e7bdf..584ad3ead 100644
--- a/actions/register.php
+++ b/actions/register.php
@@ -82,14 +82,14 @@ class RegisterAction extends Action
         }
 
         if (common_config('site', 'inviteonly') && empty($this->code)) {
-            $this->clientError(_('Sorry, only invited people can register.'));
+            $this->clientError(_('Sorry. Only those invited can register.'));
             return false;
         }
 
         if (!empty($this->code)) {
             $this->invite = Invitation::staticGet('code', $this->code);
             if (empty($this->invite)) {
-                $this->clientError(_('Sorry, invalid invitation code.'));
+                $this->clientError(_('Sorry. This is an invalid invitation code.'));
                 return false;
             }
             // Store this in case we need it
@@ -186,7 +186,7 @@ class RegisterAction extends Action
             }
 
             if (common_config('site', 'inviteonly') && !($code && $invite)) {
-                $this->clientError(_('Sorry, only invited people can register.'));
+                $this->clientError(_('Sorry. Only those invited can register.'));
                 return;
             }
 
@@ -401,7 +401,7 @@ class RegisterAction extends Action
         }
 
         if (common_config('site', 'inviteonly') && !($code && $invite)) {
-            $this->clientError(_('Sorry, only invited people can register.'));
+            $this->clientError(_('Sorry. Only those invited can register.'));
             return;
         }
 
@@ -542,7 +542,7 @@ class RegisterAction extends Action
                            '(%%%%action.imsettings%%%%) '.
                            'so you can send notices '.
                            'through instant messages.' . "\n" .
-                           '* [Search for people](%%%%action.peoplesearch%%%%) '.
+                           '* [Search for users](%%%%action.peoplesearch%%%%) '.
                            'that you may know or '.
                            'that share your interests. ' . "\n" .
                            '* Update your [profile settings]'.
diff --git a/actions/replies.php b/actions/replies.php
index a13b5a227..2829a7335 100644
--- a/actions/replies.php
+++ b/actions/replies.php
@@ -195,12 +195,12 @@ class RepliesAction extends OwnerDesignAction
 
     function showEmptyListMessage()
     {
-        $message = sprintf(_('This is the timeline showing replies to %s but %s hasn\'t received a notice to his attention yet.'), $this->user->nickname, $this->user->nickname) . ' ';
+        $message = sprintf(_('This is the timeline showing replies to %s but %s has not received a notice to his attention yet.'), $this->user->nickname, $this->user->nickname) . ' ';
 
         if (common_logged_in()) {
             $current_user = common_current_user();
             if ($this->user->id === $current_user->id) {
-                $message .= _('You can engage other users in a conversation, subscribe to more people or [join groups](%%action.groups%%).');
+                $message .= _('You can engage other users in a conversation, subscribe to more users or [join groups](%%action.groups%%).');
             } else {
                 $message .= sprintf(_('You can try to [nudge %s](../%s) or [post something to his or her attention](%%%%action.newnotice%%%%?status_textarea=%s).'), $this->user->nickname, $this->user->nickname, '@' . $this->user->nickname);
             }
diff --git a/actions/smssettings.php b/actions/smssettings.php
index 672abcef8..9fa7f62fb 100644
--- a/actions/smssettings.php
+++ b/actions/smssettings.php
@@ -101,7 +101,7 @@ class SmssettingsAction extends ConnectSettingsAction
                                           common_local_url('smssettings')));
 
         $this->elementStart('fieldset', array('id' => 'settings_sms_address'));
-        $this->element('legend', null, _('Address'));
+        $this->element('legend', null, _('SMS address'));
         $this->hidden('token', common_session_token());
 
         if ($user->sms) {
diff --git a/actions/subscribers.php b/actions/subscribers.php
index df9ec9961..1f584e2c1 100644
--- a/actions/subscribers.php
+++ b/actions/subscribers.php
@@ -60,12 +60,12 @@ class SubscribersAction extends GalleryAction
         $user =& common_current_user();
         if ($user && ($user->id == $this->profile->id)) {
             $this->element('p', null,
-                           _('These are the people who listen to '.
+                           _('These are the users who have subscribed to '.
                              'your notices.'));
         } else {
             $this->element('p', null,
-                           sprintf(_('These are the people who '.
-                                     'listen to %s\'s notices.'),
+                           sprintf(_('These are the users who '.
+                                     'have subscribed to %s\'s notices.'),
                                    $this->profile->nickname));
         }
     }
@@ -105,7 +105,7 @@ class SubscribersAction extends GalleryAction
         if (common_logged_in()) {
             $current_user = common_current_user();
             if ($this->user->id === $current_user->id) {
-                $message = _('You have no subscribers. Try subscribing to people you know and they might return the favor');
+                $message = _('You have no subscribers. Try subscribing to users you know and they might return the favor');
             } else {
                 $message = sprintf(_('%s has no subscribers. Want to be the first?'), $this->user->nickname);
             }
diff --git a/actions/subscriptions.php b/actions/subscriptions.php
index cc7b38ee4..4f65e9bf1 100644
--- a/actions/subscriptions.php
+++ b/actions/subscriptions.php
@@ -62,12 +62,12 @@ class SubscriptionsAction extends GalleryAction
         $user =& common_current_user();
         if ($user && ($user->id == $this->profile->id)) {
             $this->element('p', null,
-                           _('These are the people whose notices '.
-                             'you listen to.'));
+                           _('These are the users whose notices '.
+                             'you have subscribed to.'));
         } else {
             $this->element('p', null,
-                           sprintf(_('These are the people whose '.
-                                     'notices %s listens to.'),
+                           sprintf(_('These are the users whose '.
+                                     'notices %s has subscribed to.'),
                                    $this->profile->nickname));
         }
     }
@@ -118,7 +118,7 @@ class SubscriptionsAction extends GalleryAction
         if (common_logged_in()) {
             $current_user = common_current_user();
             if ($this->user->id === $current_user->id) {
-                $message = _('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.');
+                $message = _('You have not subscribed to anyone\'s notices right now. Try subscribing to users you know. Try [user search](%%action.peoplesearch%%), look for members in groups you\'re interested in and in our [featured users](%%action.featured%%). If you are a [Twitter user](%%action.twittersettings%%), you can automatically subscribe to users you already follow there.');
             } else {
                 $message = sprintf(_('%s is not listening to anyone.'), $this->user->nickname);
             }
diff --git a/actions/tagother.php b/actions/tagother.php
index c3f43be8b..80fa9cc95 100644
--- a/actions/tagother.php
+++ b/actions/tagother.php
@@ -190,7 +190,7 @@ class TagotherAction extends Action
             !Subscription::pkeyGet(array('subscriber' => $this->profile->id,
                                          'subscribed' => $user->id)))
         {
-            $this->clientError(_('You can only tag people you are subscribed to or who are subscribed to you.'));
+            $this->clientError(_('You can only tag users you are subscribed to or who are subscribed to you.'));
             return;
         }
 
diff --git a/classes/User.php b/classes/User.php
index 546406f71..9b90ce61b 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -721,16 +721,18 @@ class User extends Memcached_DataObject
     function delete()
     {
         $profile = $this->getProfile();
-        $profile->delete();
+        if ($profile) {
+            $profile->delete();
+        }
 
         $related = array('Fave',
-                         'User_openid',
                          'Confirm_address',
                          'Remember_me',
                          'Foreign_link',
                          'Invitation',
                          'Notice_inbox',
                          );
+        Event::handle('UserDeleteRelated', array($this, &$related));
 
         foreach ($related as $cls) {
             $inst = new $cls();
diff --git a/doc-src/badge b/doc-src/badge
index 1c368eb69..5499e334c 100644
--- a/doc-src/badge
+++ b/doc-src/badge
@@ -1,4 +1,4 @@
-Install the %%site.name%% badge on you blog or web site to show the latest updates 
+Install the %%site.name%% badge on your blog or web site to show the latest updates 
 from you and your friends!
 
 <MTMarkdownOptions output='raw'>
diff --git a/lib/action.php b/lib/action.php
index 80f398fbd..34b17063a 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -456,7 +456,7 @@ class Action extends HTMLOutputter // lawsuit
                             _('Help'), _('Help me!'), false, 'nav_help');
             if ($user || !common_config('site', 'private')) {
                 $this->menuItem(common_local_url('peoplesearch'),
-                                _('Search'), _('Search for people or text'), false, 'nav_search');
+                                _('Search'), _('Search for users or text'), false, 'nav_search');
             }
             Event::handle('EndPrimaryNav', array($this));
         }
diff --git a/lib/subs.php b/lib/subs.php
index 68c89c842..934380b76 100644
--- a/lib/subs.php
+++ b/lib/subs.php
@@ -45,7 +45,7 @@ function subs_subscribe_user($user, $other_nickname)
 function subs_subscribe_to($user, $other)
 {
     if ($user->isSubscribed($other)) {
-        return _('Already subscribed!.');
+        return _('Already subscribed!');
     }
 
     if ($other->hasBlocked($user)) {
diff --git a/locale/bg/LC_MESSAGES/statusnet.mo b/locale/bg/LC_MESSAGES/statusnet.mo
index 698158b1d..50651eb59 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 004cc141f..7a2e0d927 100644
--- a/locale/bg/LC_MESSAGES/statusnet.po
+++ b/locale/bg/LC_MESSAGES/statusnet.po
@@ -5,12 +5,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-06 13:16+0000\n"
-"PO-Revision-Date: 2009-11-06 15:42:55+0000\n"
+"POT-Creation-Date: 2009-11-08 11:53+0000\n"
+"PO-Revision-Date: 2009-11-08 11:56:03+0000\n"
 "Language-Team: Bulgarian\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r58648); Translate extension (2009-08-03)\n"
+"X-Generator: MediaWiki 1.16alpha(r58760); 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"
@@ -199,7 +199,7 @@ msgid "%s updates from everyone!"
 msgstr ""
 
 #: ../actions/register.php:213 actions/register.php:497
-#: actions/register.php:545 actions/register.php:555
+#: actions/register.php:545 actions/register.php:555 actions/register.php:561
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -237,6 +237,7 @@ msgstr "От 1 до 64 малки букви или цифри, без пунк�
 
 #: ../actions/register.php:152 actions/register.php:166
 #: actions/register.php:368 actions/register.php:414 actions/register.php:418
+#: actions/register.php:424
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr ""
 "От 1 до 64 малки букви или цифри, без пунктоация и интервали. Задължително "
@@ -255,6 +256,7 @@ msgstr "6 или повече знака. И не ги забравяйте!"
 
 #: ../actions/register.php:154 actions/register.php:168
 #: actions/register.php:373 actions/register.php:419 actions/register.php:423
+#: actions/register.php:429
 msgid "6 or more characters. Required."
 msgstr "6 или повече знака. Задължително поле."
 
@@ -435,7 +437,7 @@ msgstr "Всички бележки, намерени с \"%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
+#: actions/login.php:79 actions/register.php:137
 msgid "Already logged in."
 msgstr "Вече сте влезли."
 
@@ -458,7 +460,7 @@ 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/login.php:226
-#: actions/register.php:473
+#: actions/register.php:473 actions/login.php:253 actions/register.php:479
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Автоматично влизане занапред. Да не се ползва на общи компютри!"
 
@@ -482,6 +484,7 @@ msgstr "Аватар"
 
 #: ../actions/avatar.php:113 actions/profilesettings.php:350
 #: actions/avatarsettings.php:395 actions/avatarsettings.php:346
+#: actions/avatarsettings.php:360
 msgid "Avatar updated."
 msgstr "Аватарът е обновен."
 
@@ -517,7 +520,7 @@ msgstr "Преди »"
 #: 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
+#: actions/register.php:459 actions/register.php:465
 msgid "Bio"
 msgstr "За мен"
 
@@ -546,6 +549,7 @@ msgstr "Грешка при четене адреса на аватара '%s'"
 #: actions/passwordsettings.php:169 actions/recoverpassword.php:347
 #: actions/passwordsettings.php:174 actions/recoverpassword.php:365
 #: actions/passwordsettings.php:180 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:185
 msgid "Can't save new password."
 msgstr "Грешка при запазване на новата парола."
 
@@ -608,6 +612,7 @@ msgstr "Промяна настройките на профила"
 #: actions/recoverpassword.php:236 actions/register.php:422
 #: actions/passwordsettings.php:111 actions/recoverpassword.php:239
 #: actions/register.php:426 actions/smssettings.php:134
+#: actions/register.php:432
 msgid "Confirm"
 msgstr "Потвърждаване"
 
@@ -637,7 +642,7 @@ msgid "Confirmation code not found."
 msgstr "Кодът за потвърждение не е открит."
 
 #: ../actions/register.php:202 actions/register.php:473
-#: actions/register.php:521 actions/register.php:531
+#: actions/register.php:521 actions/register.php:531 actions/register.php:537
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -875,6 +880,7 @@ 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
+#: classes/Notice.php:1120
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Грешка в базата от данни — отговор при вмъкването: %s"
@@ -897,7 +903,8 @@ msgstr "Опишете себе си и интересите си в до 140 б
 #: 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
+#: lib/accountsettingsaction.php:117 actions/register.php:437
+#: actions/register.php:441
 msgid "Email"
 msgstr "Е-поща"
 
@@ -912,7 +919,7 @@ msgid "Email Settings"
 msgstr "Настройки на е-поща"
 
 #: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
-#: actions/register.php:200 actions/register.php:206
+#: actions/register.php:200 actions/register.php:206 actions/register.php:212
 msgid "Email address already exists."
 msgstr "Адресът на е-поща вече се използва."
 
@@ -998,7 +1005,7 @@ msgstr "Грешка при запазване на потребител."
 
 #: ../actions/password.php:80 actions/profilesettings.php:399
 #: actions/passwordsettings.php:164 actions/passwordsettings.php:169
-#: actions/passwordsettings.php:175
+#: actions/passwordsettings.php:175 actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "Грешка при запазване на потребител — невалидност."
 
@@ -1010,6 +1017,7 @@ msgstr "Грешка при запазване на потребител — н�
 #: actions/login.php:120 actions/recoverpassword.php:372
 #: actions/register.php:235 actions/login.php:122
 #: actions/recoverpassword.php:375 actions/register.php:242
+#: actions/login.php:149 actions/register.php:248
 msgid "Error setting user."
 msgstr "Грешка в настройките на потребителя."
 
@@ -1041,6 +1049,7 @@ msgstr "Въпроси"
 
 #: ../actions/avatar.php:115 actions/profilesettings.php:352
 #: actions/avatarsettings.php:397 actions/avatarsettings.php:349
+#: actions/avatarsettings.php:363
 msgid "Failed updating avatar."
 msgstr "Неуспешно обновяване на аватара."
 
@@ -1075,6 +1084,7 @@ msgid "Find people on this site"
 msgstr "Търсене на хора в сайта"
 
 #: ../actions/login.php:122 actions/login.php:247 actions/login.php:255
+#: actions/login.php:282
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -1092,6 +1102,7 @@ msgstr ""
 #: actions/showstream.php:220 lib/groupeditform.php:157
 #: actions/profilesettings.php:111 actions/register.php:441
 #: actions/showgroup.php:247 actions/showstream.php:267
+#: actions/register.php:447 lib/userprofile.php:149
 msgid "Full name"
 msgstr "Пълно име"
 
@@ -1105,7 +1116,7 @@ msgstr "Пълно име"
 #: 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
+#: actions/register.php:214 actions/register.php:220
 msgid "Full name is too long (max 255 chars)."
 msgstr "Пълното име е твърде дълго (макс. 255 знака)"
 
@@ -1126,7 +1137,7 @@ msgstr "Начало"
 #: 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
+#: actions/register.php:446 actions/register.php:452
 msgid "Homepage"
 msgstr "Лична страница"
 
@@ -1138,7 +1149,7 @@ msgstr "Лична страница"
 #: 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
+#: actions/register.php:211 actions/register.php:217
 msgid "Homepage is not a valid URL."
 msgstr "Адресът на личната страница не е правилен URL."
 
@@ -1210,7 +1221,7 @@ 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/login.php:116
+#: actions/facebookhome.php:129 actions/login.php:116 actions/login.php:143
 msgid "Incorrect username or password."
 msgstr "Грешно име или парола."
 
@@ -1290,6 +1301,7 @@ msgstr "Неправилен размер."
 #: 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
+#: actions/register.php:243 actions/register.php:264
 msgid "Invalid username or password."
 msgstr "Неправилно име или парола."
 
@@ -1366,7 +1378,7 @@ msgstr "Името на езика е твърде дълго (може да е
 #: 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
+#: lib/profilelist.php:218 actions/register.php:470 lib/userprofile.php:164
 msgid "Location"
 msgstr "Местоположение"
 
@@ -1380,7 +1392,7 @@ msgstr "Местоположение"
 #: 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
+#: actions/register.php:221 actions/register.php:227
 msgid "Location is too long (max 255 chars)."
 msgstr "Името на местоположението е твърде дълго (макс. 255 знака)."
 
@@ -1394,6 +1406,7 @@ msgstr "Името на местоположението е твърде дъл�
 #: 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
+#: actions/login.php:204 actions/login.php:257
 #, php-format
 msgid "Login"
 msgstr "Вход"
@@ -1421,12 +1434,13 @@ msgstr "Изход"
 
 #: ../actions/register.php:166 actions/register.php:180
 #: actions/register.php:393 actions/register.php:439 actions/register.php:443
+#: actions/register.php:449
 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 actions/login.php:236
+#: lib/facebookaction.php:327 actions/login.php:236 actions/login.php:263
 msgid "Lost or forgotten password?"
 msgstr "Загубена или забравена парола"
 
@@ -1468,7 +1482,7 @@ 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:487
+#: actions/register.php:477 actions/register.php:487 actions/register.php:493
 msgid "My text and files are available under "
 msgstr "Текстовете и файловите ми са достъпни под "
 
@@ -1526,7 +1540,8 @@ msgstr "Новата парола е запазена. Влязохте успе
 #: 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
+#: actions/showgroup.php:236 actions/showstream.php:249 actions/login.php:246
+#: actions/register.php:423 lib/userprofile.php:131
 msgid "Nickname"
 msgstr "Псевдоним"
 
@@ -1540,7 +1555,7 @@ msgstr "Псевдоним"
 #: 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
+#: actions/register.php:202 actions/register.php:208
 msgid "Nickname already in use. Try another one."
 msgstr "Опитайте друг псевдоним, този вече е зает."
 
@@ -1556,7 +1571,7 @@ msgstr "Опитайте друг псевдоним, този вече е за�
 #: 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
+#: actions/register.php:199 actions/register.php:205
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
 "Псевдонимът може да съдържа само малки букви, числа и никакво разстояние "
@@ -1797,7 +1812,8 @@ msgstr "Това не е регистриран потребител."
 #: 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
+#: lib/api.php:954 lib/api.php:982 lib/api.php:1092 lib/api.php:963
+#: lib/api.php:991 lib/api.php:1101
 msgid "Not a supported data format."
 msgstr "Неподдържан формат на данните"
 
@@ -1818,7 +1834,7 @@ 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
+#: actions/register.php:189 actions/register.php:195 actions/register.php:201
 msgid "Not a valid email address."
 msgstr "Неправилен адрес на е-поща."
 
@@ -1830,7 +1846,7 @@ msgstr "Неправилен адрес на е-поща."
 #: 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
+#: actions/register.php:204 actions/register.php:210
 msgid "Not a valid nickname."
 msgstr "Неправилен псевдоним."
 
@@ -1869,6 +1885,7 @@ msgstr "Неочакван отговор."
 #: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
 #: actions/twitapistatuses.php:309 actions/twitapistatuses.php:327
 #: actions/twitapistatuses.php:284 actions/apistatusesupdate.php:186
+#: actions/apistatusesupdate.php:193
 msgid "Not found"
 msgstr "Не е открито."
 
@@ -2015,7 +2032,8 @@ msgstr "Частично качване на файла."
 #: 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
+#: lib/accountsettingsaction.php:114 actions/login.php:249
+#: actions/register.php:428
 msgid "Password"
 msgstr "Парола"
 
@@ -2044,6 +2062,7 @@ msgstr "Поискано е възстановяване на парола"
 #: actions/passwordsettings.php:173 actions/recoverpassword.php:200
 #: actions/passwordsettings.php:178 actions/recoverpassword.php:208
 #: actions/passwordsettings.php:184 actions/recoverpassword.php:211
+#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "Паролата е записана."
 
@@ -2052,6 +2071,7 @@ msgstr "Паролата е записана."
 #: actions/passwordsettings.php:145 actions/register.php:183
 #: actions/passwordsettings.php:150 actions/register.php:220
 #: actions/passwordsettings.php:156 actions/register.php:227
+#: actions/register.php:233
 msgid "Passwords don't match."
 msgstr "Паролите не съвпадат."
 
@@ -2214,19 +2234,19 @@ msgstr "Код за възстановяване на непознат потр�
 #: 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
+#: lib/logingroupnav.php:85 actions/register.php:114 actions/register.php:502
 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
+#: actions/register.php:129 actions/register.php:135
 msgid "Registration not allowed."
 msgstr "Записването не е позволено."
 
 #: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67 actions/register.php:106
+#: actions/register.php:67 actions/register.php:106 actions/register.php:112
 msgid "Registration successful"
 msgstr "Записването е успешно."
 
@@ -2240,6 +2260,7 @@ msgstr "Охвърляне"
 #: 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
+#: actions/login.php:252 actions/register.php:477
 msgid "Remember me"
 msgstr "Запомни ме"
 
@@ -2338,6 +2359,7 @@ msgstr "Също като паролата по-горе"
 
 #: ../actions/register.php:156 actions/register.php:170
 #: actions/register.php:377 actions/register.php:423 actions/register.php:427
+#: actions/register.php:433
 msgid "Same as password above. Required."
 msgstr "Същото като паролата по-горе. Задължително поле."
 
@@ -2499,6 +2521,7 @@ msgstr "Няма запазен OpenID."
 #: actions/remotesubscribe.php:113 actions/showstream.php:376
 #: lib/subscribeform.php:139 actions/showstream.php:345
 #: actions/remotesubscribe.php:137 actions/showstream.php:439
+#: lib/userprofile.php:321
 msgid "Subscribe"
 msgstr "Абониране"
 
@@ -2545,6 +2568,7 @@ msgstr "Системна грешка при качване на файл."
 #: actions/profilesettings.php:123 actions/showstream.php:255
 #: lib/subscriptionlist.php:106 lib/subscriptionlist.php:108
 #: actions/profilesettings.php:138 actions/showstream.php:327
+#: lib/userprofile.php:209
 msgid "Tags"
 msgstr "Етикети"
 
@@ -2762,6 +2786,7 @@ msgstr "Този метод изисква заявка POST или DELETE."
 #: actions/apifriendshipsdestroy.php:91 actions/apigroupcreate.php:104
 #: actions/apigroupjoin.php:91 actions/apigroupleave.php:91
 #: actions/apistatusesupdate.php:109
+#: actions/apiaccountupdateprofileimage.php:84
 msgid "This method requires a POST."
 msgstr "Този метод изисква заявка POST."
 
@@ -2796,7 +2821,7 @@ msgstr ""
 
 #: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
 #: actions/twitapifriendships.php:132 actions/twitapifriendships.php:139
-#: actions/apifriendshipsexists.php:103
+#: actions/apifriendshipsexists.php:103 actions/apifriendshipsexists.php:94
 msgid "Two user ids or screen_names must be supplied."
 msgstr "Трябва да се дадат два идентификатора или имена на потребители."
 
@@ -2804,7 +2829,7 @@ msgstr "Трябва да се дадат два идентификатора и
 #: 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
+#: actions/register.php:448 actions/register.php:454
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "Адрес на личната ви страница, блог или профил в друг сайт"
 
@@ -2826,6 +2851,7 @@ msgstr "Адрес на профила ви в друга, съвместима
 #: actions/twittersettings.php:322 lib/designsettings.php:301
 #: actions/emailsettings.php:255 actions/grouplogo.php:319
 #: actions/imsettings.php:220 actions/smssettings.php:248
+#: actions/avatarsettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "Неочаквано изпращане на форма."
 
@@ -2938,7 +2964,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
+#: actions/register.php:436 actions/register.php:438 actions/register.php:442
 msgid "Used only for updates, announcements, and password recovery"
 msgstr "Използва се само за промени, обяви или възстановяване на паролата"
 
@@ -2966,7 +2992,8 @@ 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
+#: actions/apiusershow.php:108 actions/apiaccountupdateprofileimage.php:124
+#: actions/apiaccountupdateprofileimage.php:130
 msgid "User has no profile."
 msgstr "Потребителят няма профил."
 
@@ -2995,7 +3022,7 @@ msgstr "Какво става, %s?"
 #: 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
+#: actions/register.php:466 actions/register.php:472
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Къде се намирате (град, община, държава и т.н.)"
 
@@ -3095,7 +3122,7 @@ 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:192
+#: actions/register.php:186 actions/register.php:192 actions/register.php:198
 msgid "You can't register if you don't agree to the license."
 msgstr "Не можете да се регистрате, ако не сте съгласни с  лиценза."
 
@@ -3162,56 +3189,56 @@ msgstr ""
 "същ акаунт. От тук се управляват съответните OpenID."
 
 #: ../lib/util.php:943 lib/util.php:992 lib/util.php:945 lib/util.php:756
-#: lib/util.php:770 lib/util.php:816
+#: lib/util.php:770 lib/util.php:816 lib/util.php:844
 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:828
+#: lib/util.php:782 lib/util.php:828 lib/util.php:856
 #, php-format
 msgid "about %d days ago"
 msgstr "преди около %d дни"
 
 #: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953 lib/util.php:764
-#: lib/util.php:778 lib/util.php:824
+#: lib/util.php:778 lib/util.php:824 lib/util.php:852
 #, php-format
 msgid "about %d hours ago"
 msgstr "преди около %d часа"
 
 #: ../lib/util.php:947 lib/util.php:996 lib/util.php:949 lib/util.php:760
-#: lib/util.php:774 lib/util.php:820
+#: lib/util.php:774 lib/util.php:820 lib/util.php:848
 #, php-format
 msgid "about %d minutes ago"
 msgstr "преди около %d минути"
 
 #: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961 lib/util.php:772
-#: lib/util.php:786 lib/util.php:832
+#: lib/util.php:786 lib/util.php:832 lib/util.php:860
 #, php-format
 msgid "about %d months ago"
 msgstr "преди около %d месеца"
 
 #: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955 lib/util.php:766
-#: lib/util.php:780 lib/util.php:826
+#: lib/util.php:780 lib/util.php:826 lib/util.php:854
 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:818
+#: lib/util.php:772 lib/util.php:818 lib/util.php:846
 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:830
+#: lib/util.php:784 lib/util.php:830 lib/util.php:858
 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:834
+#: lib/util.php:788 lib/util.php:834 lib/util.php:862
 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:822
+#: lib/util.php:776 lib/util.php:822 lib/util.php:850
 msgid "about an hour ago"
 msgstr "преди около час"
 
@@ -3280,7 +3307,9 @@ msgstr "« След"
 #: 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
+#: actions/userauthorization.php:52 actions/login.php:131
+#: actions/register.php:165 actions/avatarsettings.php:265
+#: lib/designsettings.php:294
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Имаше проблем със сесията ви в сайта. Моля, опитайте отново!"
 
@@ -3504,6 +3533,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
+#: actions/register.php:230
 msgid "Password must be 6 or more characters."
 msgstr "Паролата трябва да е 6 или повече знака."
 
@@ -4054,13 +4084,13 @@ msgid "There was a problem with your session token. "
 msgstr "Имаше проблем със сесията ви в сайта. Моля, опитайте отново!"
 
 #: actions/avatarsettings.php:303 actions/grouplogo.php:360
-#: actions/avatarsettings.php:308
+#: actions/avatarsettings.php:308 actions/avatarsettings.php:322
 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
+#: actions/grouplogo.php:377 actions/avatarsettings.php:337
 msgid "Lost our file data."
 msgstr ""
 
@@ -4534,7 +4564,7 @@ msgid "%s left group %s"
 msgstr ""
 
 #: actions/login.php:225 lib/facebookaction.php:304 actions/login.php:208
-#: actions/login.php:216
+#: actions/login.php:216 actions/login.php:243
 msgid "Login to site"
 msgstr ""
 
@@ -4719,7 +4749,8 @@ 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
+#: actions/register.php:398 actions/register.php:85 actions/register.php:189
+#: actions/register.php:404
 msgid "Sorry, only invited people can register."
 msgstr ""
 
@@ -4808,7 +4839,7 @@ msgstr "Профил на групата"
 #: 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
+#: lib/profilelist.php:230 lib/userprofile.php:177
 msgid "URL"
 msgstr ""
 
@@ -4819,7 +4850,7 @@ msgstr ""
 #: 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
+#: lib/profilelist.php:245 lib/userprofile.php:194
 #, fuzzy
 msgid "Note"
 msgstr "Бележки"
@@ -4868,6 +4899,7 @@ msgid "Only the sender and recipient "
 msgstr "Само подателят и получателят могат да четат това съобщение."
 
 #: actions/showstream.php:73 actions/showstream.php:78
+#: actions/showstream.php:79
 #, php-format
 msgid "%s, page %d"
 msgstr "%s, страница %d"
@@ -4879,28 +4911,29 @@ msgstr "Профил на "
 
 #: actions/showstream.php:236 actions/tagother.php:77
 #: actions/showstream.php:220 actions/showstream.php:185
-#: actions/showstream.php:193
+#: actions/showstream.php:193 lib/userprofile.php:75
 msgid "User profile"
 msgstr "Потребителски профил"
 
 #: actions/showstream.php:240 actions/tagother.php:81
 #: actions/showstream.php:224 actions/showstream.php:189
-#: actions/showstream.php:220
+#: actions/showstream.php:220 lib/userprofile.php:102
 msgid "Photo"
 msgstr "Снимка"
 
 #: actions/showstream.php:317 actions/showstream.php:309
 #: actions/showstream.php:274 actions/showstream.php:354
+#: lib/userprofile.php:236
 msgid "User actions"
 msgstr "Потребителски действия"
 
 #: actions/showstream.php:342 actions/showstream.php:307
-#: actions/showstream.php:390
+#: actions/showstream.php:390 lib/userprofile.php:272
 msgid "Send a direct message to this user"
 msgstr "Изпращате на пряко съобщение до този потребител."
 
 #: actions/showstream.php:343 actions/showstream.php:308
-#: actions/showstream.php:391
+#: actions/showstream.php:391 lib/userprofile.php:273
 msgid "Message"
 msgstr "Съобщение"
 
@@ -5623,7 +5656,7 @@ msgstr "%s и приятели"
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr "Можете да качите личен аватар тук."
 
-#: actions/avatarsettings.php:373
+#: actions/avatarsettings.php:373 actions/avatarsettings.php:387
 #, fuzzy
 msgid "Avatar deleted."
 msgstr "Аватарът е обновен."
@@ -5758,10 +5791,12 @@ msgid ""
 msgstr ""
 
 #: actions/register.php:432 actions/register.php:479 actions/register.php:489
+#: actions/register.php:495
 msgid "Creative Commons Attribution 3.0"
 msgstr ""
 
 #: actions/register.php:433 actions/register.php:480 actions/register.php:490
+#: actions/register.php:496
 #, fuzzy
 msgid ""
 " except this private data: password, email address, IM address, and phone "
@@ -5796,44 +5831,48 @@ msgid "%s's profile"
 msgstr "Профил на "
 
 #: actions/showstream.php:163 actions/showstream.php:128
+#: actions/showstream.php:129
 #, fuzzy, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "Емисия с бележки на %s"
 
 #: actions/showstream.php:170 actions/showstream.php:135
+#: actions/showstream.php:136
 #, fuzzy, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "Емисия с бележки на %s"
 
 #: actions/showstream.php:177 actions/showstream.php:142
+#: actions/showstream.php:143
 #, fuzzy, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "Емисия с бележки на %s"
 
 #: actions/showstream.php:182 actions/showstream.php:147
+#: actions/showstream.php:148
 #, fuzzy, php-format
 msgid "FOAF for %s"
 msgstr "Изходяща кутия за %s"
 
 #: actions/showstream.php:237 actions/showstream.php:202
-#: actions/showstream.php:234
+#: actions/showstream.php:234 lib/userprofile.php:116
 #, fuzzy
 msgid "Edit Avatar"
 msgstr "Аватар"
 
 #: actions/showstream.php:316 actions/showstream.php:281
-#: actions/showstream.php:366
+#: actions/showstream.php:366 lib/userprofile.php:248
 #, fuzzy
 msgid "Edit profile settings"
 msgstr "Настройки на профила"
 
 #: actions/showstream.php:317 actions/showstream.php:282
-#: actions/showstream.php:367
+#: actions/showstream.php:367 lib/userprofile.php:249
 msgid "Edit"
 msgstr ""
 
 #: actions/showstream.php:542 actions/showstream.php:388
-#: actions/showstream.php:487
+#: actions/showstream.php:487 actions/showstream.php:234
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5879,6 +5918,9 @@ msgstr ""
 #: actions/apistatusesupdate.php:125 actions/apisubscriptions.php:87
 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#: actions/apiaccountupdateprofileimage.php:91
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apistatusesupdate.php:139
 #, fuzzy
 msgid "No such user!"
 msgstr "Няма такъв потребител"
@@ -5939,36 +5981,6 @@ msgid ""
 "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 ""
@@ -6139,6 +6151,7 @@ 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
+#: actions/showstream.php:202
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -6320,7 +6333,8 @@ 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
+#: lib/designsettings.php:461 lib/designsettings.php:434
+#: lib/designsettings.php:464
 #, fuzzy
 msgid "Couldn't update your design."
 msgstr "Грешка при обновяване на потребителя."
@@ -6415,7 +6429,9 @@ msgid "Message sent"
 msgstr "Съобщение"
 
 #: actions/newnotice.php:93 lib/designsettings.php:281
-#: actions/newnotice.php:94
+#: actions/newnotice.php:94 actions/apiaccountupdateprofileimage.php:97
+#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254
+#: lib/designsettings.php:283
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s bytes) due to its "
@@ -6583,7 +6599,7 @@ msgstr "Разпознати сте. Въведете паролата си по
 msgid "Password recover"
 msgstr "Поискано е възстановяване на парола"
 
-#: actions/register.php:86
+#: actions/register.php:86 actions/register.php:92
 #, fuzzy
 msgid "Sorry, invalid invitation code."
 msgstr "Грешка в кода за потвърждение."
@@ -6682,28 +6698,31 @@ msgstr ""
 msgid "Not a local notice"
 msgstr "Няма такъв потребител"
 
-#: actions/showstream.php:72
+#: actions/showstream.php:72 actions/showstream.php:73
 #, fuzzy, php-format
 msgid " tagged %s"
 msgstr "Бележки с етикет %s"
 
-#: actions/showstream.php:121
+#: actions/showstream.php:121 actions/showstream.php:122
 #, fuzzy, php-format
 msgid "Notice feed for %s tagged %s (RSS 1.0)"
 msgstr "Емисия с бележки на %s"
 
 #: actions/showstream.php:350 actions/showstream.php:444
+#: actions/showstream.php:191
 #, 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
+#: actions/showstream.php:196
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
 msgstr ""
 
 #: actions/showstream.php:357 actions/showstream.php:451
+#: actions/showstream.php:198
 #, php-format
 msgid ""
 "You can try to nudge %s or [post something to his or her attention](%%%%"
@@ -6711,6 +6730,7 @@ msgid ""
 msgstr ""
 
 #: actions/showstream.php:393 actions/showstream.php:492
+#: actions/showstream.php:239
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -6861,6 +6881,7 @@ msgid "Problem saving notice. Too long."
 msgstr "Проблем при записване на бележката."
 
 #: classes/User.php:319 classes/User.php:327 classes/User.php:334
+#: classes/User.php:333
 #, fuzzy, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "Съобщение до %1$s в %2$s"
@@ -6971,10 +6992,12 @@ msgid "Save design"
 msgstr ""
 
 #: lib/designsettings.php:378 lib/designsettings.php:369
+#: lib/designsettings.php:372
 msgid "Bad default color settings: "
 msgstr ""
 
 #: lib/designsettings.php:474 lib/designsettings.php:465
+#: lib/designsettings.php:468
 msgid "Design defaults restored."
 msgstr ""
 
@@ -7181,16 +7204,18 @@ msgid "Status deleted."
 msgstr "Аватарът е обновен."
 
 #: actions/apistatusesupdate.php:132
+#: actions/apiaccountupdateprofileimage.php:99
 msgid "Unable to handle that much POST data!"
 msgstr ""
 
 #: actions/apistatusesupdate.php:145 actions/newnotice.php:155
-#: scripts/maildaemon.php:71
+#: scripts/maildaemon.php:71 actions/apistatusesupdate.php:152
 #, fuzzy, php-format
 msgid "That's too long. Max notice size is %d chars."
 msgstr "Твърде дълга бележка. Трябва да е най-много 140 знака."
 
 #: actions/apistatusesupdate.php:209 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:216
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
@@ -7255,7 +7280,7 @@ msgstr "Бележки от %1$s в %2$s."
 msgid "IM is not available."
 msgstr "Страницата не е достъпна във вида медия, който приемате"
 
-#: actions/login.php:259
+#: actions/login.php:259 actions/login.php:286
 #, fuzzy, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -7289,21 +7314,24 @@ msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
 msgstr ""
 
 #: actions/profilesettings.php:122 actions/register.php:454
+#: actions/register.php:460
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d chars"
 msgstr "Опишете себе си и интересите си в до 140 букви"
 
 #: actions/profilesettings.php:125 actions/register.php:457
+#: actions/register.php:463
 #, fuzzy
 msgid "Describe yourself and your interests"
 msgstr "Опишете себе си и интересите си в до 140 букви"
 
 #: actions/profilesettings.php:221 actions/register.php:217
+#: actions/register.php:223
 #, fuzzy, php-format
 msgid "Bio is too long (max %d chars)."
 msgstr "Автобиографията е твърде дълга (до 140 символа)."
 
-#: actions/register.php:336
+#: actions/register.php:336 actions/register.php:342
 msgid ""
 "With this form you can create  a new account. You can then post notices and "
 "link up to friends and colleagues. "
@@ -7345,17 +7373,17 @@ msgid "Replies to %1$s on %2$s!"
 msgstr "Съобщение до %1$s в %2$s"
 
 #: actions/showfavorites.php:170
-#, fuzzy, php-format
+#, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
 msgstr "Емисия с приятелите на %s"
 
 #: actions/showfavorites.php:177
-#, fuzzy, php-format
+#, php-format
 msgid "Feed for favorites of %s (RSS 2.0)"
 msgstr "Емисия с приятелите на %s"
 
 #: actions/showfavorites.php:184
-#, fuzzy, php-format
+#, php-format
 msgid "Feed for favorites of %s (Atom)"
 msgstr "Емисия с приятелите на %s"
 
@@ -7368,7 +7396,7 @@ msgid ""
 msgstr ""
 
 #: actions/showgroup.php:345
-#, fuzzy, php-format
+#, php-format
 msgid "FOAF for %s group"
 msgstr "Изходяща кутия за %s"
 
@@ -7507,41 +7535,6 @@ 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 "No configuration file found. "
@@ -7576,7 +7569,7 @@ msgid "Describe the group or topic in %d characters"
 msgstr "Опишете групата или темата й в до 140 букви"
 
 #: lib/jabber.php:192
-#, fuzzy, php-format
+#, php-format
 msgid "notice id: %s"
 msgstr "Нова бележка"
 
@@ -7636,7 +7629,6 @@ 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 "Грешка при изтегляне на общия поток"
 
@@ -7644,3 +7636,59 @@ msgstr "Грешка при изтегляне на общия поток"
 #, fuzzy
 msgid "Duplicate notice"
 msgstr "Изтриване на бележката"
+
+#: actions/login.php:110 actions/login.php:120
+#, fuzzy
+msgid "Invalid or expired token."
+msgstr "Невалидно съдържание на бележка"
+
+#: lib/command.php:597
+#, fuzzy, php-format
+msgid "Could not create login token for %s"
+msgstr "Грешка при създаване на OpenID форма: %s"
+
+#: lib/command.php:602
+#, php-format
+msgid "This link is useable only once, and is good for only 2 minutes: %s"
+msgstr ""
+
+#: lib/imagefile.php:75
+#, fuzzy, php-format
+msgid "That file is too big. The maximum file size is %s."
+msgstr "Може да качите лого за групата ви."
+
+#: lib/command.php:613
+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"
+"login - Get a link to login to the web interface\n"
+"drop <group> - leave group\n"
+"stats - get your stats\n"
+"stop - same as 'off'\n"
+"quit - same as 'off'\n"
+"sub <nickname> - same as 'follow'\n"
+"unsub <nickname> - same as 'leave'\n"
+"last <nickname> - same as 'get'\n"
+"on <nickname> - not yet implemented.\n"
+"off <nickname> - not yet implemented.\n"
+"nudge <nickname> - remind a user to update.\n"
+"invite <phone number> - not yet implemented.\n"
+"track <word> - not yet implemented.\n"
+"untrack <word> - not yet implemented.\n"
+"track off - not yet implemented.\n"
+"untrack all - not yet implemented.\n"
+"tracks - not yet implemented.\n"
+"tracking - not yet implemented.\n"
+msgstr ""
diff --git a/locale/ca/LC_MESSAGES/statusnet.mo b/locale/ca/LC_MESSAGES/statusnet.mo
index 3d48e40e3..86fd07da9 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 2ae3ba293..82be16d89 100644
--- a/locale/ca/LC_MESSAGES/statusnet.po
+++ b/locale/ca/LC_MESSAGES/statusnet.po
@@ -5,12 +5,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-06 13:16+0000\n"
-"PO-Revision-Date: 2009-11-06 15:42:59+0000\n"
+"POT-Creation-Date: 2009-11-08 11:53+0000\n"
+"PO-Revision-Date: 2009-11-08 11:56:06+0000\n"
 "Language-Team: Catalan\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r58648); Translate extension (2009-08-03)\n"
+"X-Generator: MediaWiki 1.16alpha(r58760); 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"
@@ -201,7 +201,7 @@ msgid "%s updates from everyone!"
 msgstr "%s notificacions de tots!"
 
 #: ../actions/register.php:213 actions/register.php:497
-#: actions/register.php:545 actions/register.php:555
+#: actions/register.php:545 actions/register.php:555 actions/register.php:561
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -241,6 +241,7 @@ msgstr ""
 
 #: ../actions/register.php:152 actions/register.php:166
 #: actions/register.php:368 actions/register.php:414 actions/register.php:418
+#: actions/register.php:424
 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."
@@ -258,6 +259,7 @@ 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:419 actions/register.php:423
+#: actions/register.php:429
 msgid "6 or more characters. Required."
 msgstr "6 o més caràcters. Requerit."
 
@@ -438,7 +440,7 @@ msgstr "Totes les actualitzacions que corresponen a la frase a cercar \"%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
+#: actions/login.php:79 actions/register.php:137
 msgid "Already logged in."
 msgstr "Ja estàs connectat."
 
@@ -461,7 +463,7 @@ msgstr "Autoritzar subscripció"
 #: ../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
+#: actions/register.php:473 actions/login.php:253 actions/register.php:479
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Iniciar sessió automàticament en el futur; no utilitzar en ordinadors "
@@ -487,6 +489,7 @@ msgstr "Avatar"
 
 #: ../actions/avatar.php:113 actions/profilesettings.php:350
 #: actions/avatarsettings.php:395 actions/avatarsettings.php:346
+#: actions/avatarsettings.php:360
 msgid "Avatar updated."
 msgstr "Avatar actualitzat."
 
@@ -523,7 +526,7 @@ msgstr "Anterior »"
 #: 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
+#: actions/register.php:459 actions/register.php:465
 msgid "Bio"
 msgstr "Biografia"
 
@@ -552,6 +555,7 @@ msgstr "No es pot llegir l'URL de l'avatar '%s'"
 #: actions/passwordsettings.php:169 actions/recoverpassword.php:347
 #: actions/passwordsettings.php:174 actions/recoverpassword.php:365
 #: actions/passwordsettings.php:180 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:185
 msgid "Can't save new password."
 msgstr "No es pot guardar la nova contrasenya."
 
@@ -614,6 +618,7 @@ msgstr "Canviar les preferències del teu perfil"
 #: actions/recoverpassword.php:236 actions/register.php:422
 #: actions/passwordsettings.php:111 actions/recoverpassword.php:239
 #: actions/register.php:426 actions/smssettings.php:134
+#: actions/register.php:432
 msgid "Confirm"
 msgstr "Confirmar"
 
@@ -643,7 +648,7 @@ msgid "Confirmation code not found."
 msgstr "Codi de confirmació no trobat. "
 
 #: ../actions/register.php:202 actions/register.php:473
-#: actions/register.php:521 actions/register.php:531
+#: actions/register.php:521 actions/register.php:531 actions/register.php:537
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -880,6 +885,7 @@ 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
+#: classes/Notice.php:1120
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Error de BD en inserir resposta: %s"
@@ -902,7 +908,8 @@ msgstr "Explica'ns alguna cosa sobre tu i els teus interessos en 140 caràcters"
 #: 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
+#: lib/accountsettingsaction.php:117 actions/register.php:437
+#: actions/register.php:441
 msgid "Email"
 msgstr "Correu electrònic"
 
@@ -917,7 +924,7 @@ 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
+#: actions/register.php:200 actions/register.php:206 actions/register.php:212
 msgid "Email address already exists."
 msgstr "L'adreça de correu electrònic ja existeix."
 
@@ -1003,7 +1010,7 @@ msgstr "Error en guardar l'usuari."
 
 #: ../actions/password.php:80 actions/profilesettings.php:399
 #: actions/passwordsettings.php:164 actions/passwordsettings.php:169
-#: actions/passwordsettings.php:175
+#: actions/passwordsettings.php:175 actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "Error en guardar usuari; invàlid."
 
@@ -1015,6 +1022,7 @@ msgstr "Error en guardar usuari; invàlid."
 #: actions/login.php:120 actions/recoverpassword.php:372
 #: actions/register.php:235 actions/login.php:122
 #: actions/recoverpassword.php:375 actions/register.php:242
+#: actions/login.php:149 actions/register.php:248
 msgid "Error setting user."
 msgstr "Error en configurar l'usuari."
 
@@ -1046,6 +1054,7 @@ msgstr "Preguntes freqüents"
 
 #: ../actions/avatar.php:115 actions/profilesettings.php:352
 #: actions/avatarsettings.php:397 actions/avatarsettings.php:349
+#: actions/avatarsettings.php:363
 msgid "Failed updating avatar."
 msgstr "Error en actualitzar avatar."
 
@@ -1080,6 +1089,7 @@ msgid "Find people on this site"
 msgstr "Trobar gent en aquest lloc"
 
 #: ../actions/login.php:122 actions/login.php:247 actions/login.php:255
+#: actions/login.php:282
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -1097,6 +1107,7 @@ msgstr ""
 #: actions/showstream.php:220 lib/groupeditform.php:157
 #: actions/profilesettings.php:111 actions/register.php:441
 #: actions/showgroup.php:247 actions/showstream.php:267
+#: actions/register.php:447 lib/userprofile.php:149
 msgid "Full name"
 msgstr "Nom complet"
 
@@ -1110,7 +1121,7 @@ msgstr "Nom complet"
 #: 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
+#: actions/register.php:214 actions/register.php:220
 msgid "Full name is too long (max 255 chars)."
 msgstr "El teu nom és massa llarg (màx. 255 caràcters)."
 
@@ -1131,7 +1142,7 @@ msgstr "Inici"
 #: 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
+#: actions/register.php:446 actions/register.php:452
 msgid "Homepage"
 msgstr "Pàgina personal"
 
@@ -1143,7 +1154,7 @@ msgstr "Pàgina personal"
 #: 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
+#: actions/register.php:211 actions/register.php:217
 msgid "Homepage is not a valid URL."
 msgstr "La pàgina personal no és un URL vàlid."
 
@@ -1215,7 +1226,7 @@ msgstr "Contrasenya antiga incorrecta"
 
 #: ../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
+#: actions/facebookhome.php:129 actions/login.php:116 actions/login.php:143
 msgid "Incorrect username or password."
 msgstr "Nom d'usuari o contrasenya incorrectes."
 
@@ -1295,6 +1306,7 @@ msgstr "Mida invàlida."
 #: 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
+#: actions/register.php:243 actions/register.php:264
 msgid "Invalid username or password."
 msgstr "Nom d'usuari o contrasenya invàlids."
 
@@ -1372,7 +1384,7 @@ msgstr "L'idioma és massa llarg (màx 50 caràcters)."
 #: 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
+#: lib/profilelist.php:218 actions/register.php:470 lib/userprofile.php:164
 msgid "Location"
 msgstr "Ubicació"
 
@@ -1386,7 +1398,7 @@ msgstr "Ubicació"
 #: 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
+#: actions/register.php:221 actions/register.php:227
 msgid "Location is too long (max 255 chars)."
 msgstr "La ubicació és massa llarga (màx. 255 caràcters)."
 
@@ -1400,6 +1412,7 @@ msgstr "La ubicació és massa llarga (màx. 255 caràcters)."
 #: 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
+#: actions/login.php:204 actions/login.php:257
 #, php-format
 msgid "Login"
 msgstr "Inici de sessió"
@@ -1428,12 +1441,13 @@ msgstr "Sortir"
 
 #: ../actions/register.php:166 actions/register.php:180
 #: actions/register.php:393 actions/register.php:439 actions/register.php:443
+#: actions/register.php:449
 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 actions/login.php:228 lib/facebookaction.php:325
-#: lib/facebookaction.php:327 actions/login.php:236
+#: lib/facebookaction.php:327 actions/login.php:236 actions/login.php:263
 msgid "Lost or forgotten password?"
 msgstr "Contrasenya oblidada o perduda?"
 
@@ -1476,7 +1490,7 @@ 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:487
+#: actions/register.php:477 actions/register.php:487 actions/register.php:493
 msgid "My text and files are available under "
 msgstr "El meu text i els meus fitxers estan disponibles sota "
 
@@ -1534,7 +1548,8 @@ msgstr "Nova contrasenya guardada correctament. Has iniciat una sessió."
 #: 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
+#: actions/showgroup.php:236 actions/showstream.php:249 actions/login.php:246
+#: actions/register.php:423 lib/userprofile.php:131
 msgid "Nickname"
 msgstr "Sobrenom"
 
@@ -1548,7 +1563,7 @@ msgstr "Sobrenom"
 #: 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
+#: actions/register.php:202 actions/register.php:208
 msgid "Nickname already in use. Try another one."
 msgstr "Aquest sobrenom ja existeix. Prova un altre. "
 
@@ -1564,7 +1579,7 @@ msgstr "Aquest sobrenom ja existeix. Prova un altre. "
 #: 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
+#: actions/register.php:199 actions/register.php:205
 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 "
@@ -1805,7 +1820,8 @@ msgstr "Usuari no registrat."
 #: 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
+#: lib/api.php:954 lib/api.php:982 lib/api.php:1092 lib/api.php:963
+#: lib/api.php:991 lib/api.php:1101
 msgid "Not a supported data format."
 msgstr "Format de data no suportat."
 
@@ -1826,7 +1842,7 @@ 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
+#: actions/register.php:189 actions/register.php:195 actions/register.php:201
 msgid "Not a valid email address."
 msgstr "Adreça de correu electrònic no vàlida."
 
@@ -1838,7 +1854,7 @@ msgstr "Adreça de correu electrònic no vàlida."
 #: 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
+#: actions/register.php:204 actions/register.php:210
 msgid "Not a valid nickname."
 msgstr "Sobrenom no vàlid."
 
@@ -1877,6 +1893,7 @@ msgstr "Resposta inesperada!"
 #: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
 #: actions/twitapistatuses.php:309 actions/twitapistatuses.php:327
 #: actions/twitapistatuses.php:284 actions/apistatusesupdate.php:186
+#: actions/apistatusesupdate.php:193
 msgid "Not found"
 msgstr "No s'ha trobat"
 
@@ -2023,7 +2040,8 @@ msgstr "Càrrega parcial."
 #: 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
+#: lib/accountsettingsaction.php:114 actions/login.php:249
+#: actions/register.php:428
 msgid "Password"
 msgstr "Contrasenya"
 
@@ -2052,6 +2070,7 @@ msgstr "Recuperació de contrasenya sol·licitada"
 #: actions/passwordsettings.php:173 actions/recoverpassword.php:200
 #: actions/passwordsettings.php:178 actions/recoverpassword.php:208
 #: actions/passwordsettings.php:184 actions/recoverpassword.php:211
+#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "Contrasenya guardada."
 
@@ -2060,6 +2079,7 @@ msgstr "Contrasenya guardada."
 #: actions/passwordsettings.php:145 actions/register.php:183
 #: actions/passwordsettings.php:150 actions/register.php:220
 #: actions/passwordsettings.php:156 actions/register.php:227
+#: actions/register.php:233
 msgid "Passwords don't match."
 msgstr "Les contrasenyes no coincideixen."
 
@@ -2223,19 +2243,19 @@ msgstr "Codi de recuperació d'un usuari desconegut."
 #: 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
+#: lib/logingroupnav.php:85 actions/register.php:114 actions/register.php:502
 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
+#: actions/register.php:129 actions/register.php:135
 msgid "Registration not allowed."
 msgstr "Registre no permès."
 
 #: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67 actions/register.php:106
+#: actions/register.php:67 actions/register.php:106 actions/register.php:112
 msgid "Registration successful"
 msgstr "Registre satisfactori"
 
@@ -2249,6 +2269,7 @@ msgstr "Rebutjar"
 #: 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
+#: actions/login.php:252 actions/register.php:477
 msgid "Remember me"
 msgstr "Recorda'm"
 
@@ -2347,6 +2368,7 @@ msgstr "Igual a la contrasenya de dalt"
 
 #: ../actions/register.php:156 actions/register.php:170
 #: actions/register.php:377 actions/register.php:423 actions/register.php:427
+#: actions/register.php:433
 msgid "Same as password above. Required."
 msgstr "Igual a la contrasenya de dalt. Requerit."
 
@@ -2513,6 +2535,7 @@ msgstr "No s'ha trobat l'OpenID emmagatzemat."
 #: actions/remotesubscribe.php:113 actions/showstream.php:376
 #: lib/subscribeform.php:139 actions/showstream.php:345
 #: actions/remotesubscribe.php:137 actions/showstream.php:439
+#: lib/userprofile.php:321
 msgid "Subscribe"
 msgstr "Subscriure's"
 
@@ -2559,6 +2582,7 @@ msgstr "Error del sistema en pujar el fitxer."
 #: actions/profilesettings.php:123 actions/showstream.php:255
 #: lib/subscriptionlist.php:106 lib/subscriptionlist.php:108
 #: actions/profilesettings.php:138 actions/showstream.php:327
+#: lib/userprofile.php:209
 msgid "Tags"
 msgstr "Etiquetes"
 
@@ -2778,6 +2802,7 @@ msgstr "Aquest mètode requereix POST o DELETE."
 #: actions/apifriendshipsdestroy.php:91 actions/apigroupcreate.php:104
 #: actions/apigroupjoin.php:91 actions/apigroupleave.php:91
 #: actions/apistatusesupdate.php:109
+#: actions/apiaccountupdateprofileimage.php:84
 msgid "This method requires a POST."
 msgstr "Aquest mètode requereix POST."
 
@@ -2812,7 +2837,7 @@ msgstr ""
 
 #: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
 #: actions/twitapifriendships.php:132 actions/twitapifriendships.php:139
-#: actions/apifriendshipsexists.php:103
+#: actions/apifriendshipsexists.php:103 actions/apifriendshipsexists.php:94
 msgid "Two user ids or screen_names must be supplied."
 msgstr "Dos ids d'usuari o screen_names has de ser substituïts."
 
@@ -2820,7 +2845,7 @@ msgstr "Dos ids d'usuari o screen_names has de ser substituïts."
 #: 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
+#: actions/register.php:448 actions/register.php:454
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "URL del teu web, blog o perfil en un altre lloc"
 
@@ -2842,6 +2867,7 @@ msgstr "URL del teu perfil en un altre servei de microblogging compatible"
 #: actions/twittersettings.php:322 lib/designsettings.php:301
 #: actions/emailsettings.php:255 actions/grouplogo.php:319
 #: actions/imsettings.php:220 actions/smssettings.php:248
+#: actions/avatarsettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "Enviament de formulari inesperat."
 
@@ -2954,7 +2980,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
+#: actions/register.php:436 actions/register.php:438 actions/register.php:442
 msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
 "Utilitzat només per a actualitzacions, anuncis i recuperació de contrasenyes"
@@ -2983,7 +3009,8 @@ msgstr "L'usuari que vols seguir no existeix."
 #: 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
+#: actions/apiusershow.php:108 actions/apiaccountupdateprofileimage.php:124
+#: actions/apiaccountupdateprofileimage.php:130
 msgid "User has no profile."
 msgstr "L'usuari no té perfil."
 
@@ -3012,7 +3039,7 @@ msgstr "Què tal, %s?"
 #: 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
+#: actions/register.php:466 actions/register.php:472
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "On ets, per exemple \"Ciutat, Estat (o Regió), País\""
 
@@ -3116,7 +3143,7 @@ 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/register.php:149
-#: actions/register.php:186 actions/register.php:192
+#: actions/register.php:186 actions/register.php:192 actions/register.php:198
 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."
 
@@ -3195,56 +3222,56 @@ msgstr ""
 "compte d'usuari. Administra els teus OpenID associats aquí."
 
 #: ../lib/util.php:943 lib/util.php:992 lib/util.php:945 lib/util.php:756
-#: lib/util.php:770 lib/util.php:816
+#: lib/util.php:770 lib/util.php:816 lib/util.php:844
 msgid "a few seconds ago"
 msgstr "fa pocs segons"
 
 #: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957 lib/util.php:768
-#: lib/util.php:782 lib/util.php:828
+#: lib/util.php:782 lib/util.php:828 lib/util.php:856
 #, 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:764
-#: lib/util.php:778 lib/util.php:824
+#: lib/util.php:778 lib/util.php:824 lib/util.php:852
 #, 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:760
-#: lib/util.php:774 lib/util.php:820
+#: lib/util.php:774 lib/util.php:820 lib/util.php:848
 #, 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:772
-#: lib/util.php:786 lib/util.php:832
+#: lib/util.php:786 lib/util.php:832 lib/util.php:860
 #, 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:766
-#: lib/util.php:780 lib/util.php:826
+#: lib/util.php:780 lib/util.php:826 lib/util.php:854
 msgid "about a day ago"
 msgstr "fa un dia"
 
 #: ../lib/util.php:945 lib/util.php:994 lib/util.php:947 lib/util.php:758
-#: lib/util.php:772 lib/util.php:818
+#: lib/util.php:772 lib/util.php:818 lib/util.php:846
 msgid "about a minute ago"
 msgstr "fa un minut"
 
 #: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959 lib/util.php:770
-#: lib/util.php:784 lib/util.php:830
+#: lib/util.php:784 lib/util.php:830 lib/util.php:858
 msgid "about a month ago"
 msgstr "fa un mes"
 
 #: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963 lib/util.php:774
-#: lib/util.php:788 lib/util.php:834
+#: lib/util.php:788 lib/util.php:834 lib/util.php:862
 msgid "about a year ago"
 msgstr "fa un any"
 
 #: ../lib/util.php:949 lib/util.php:998 lib/util.php:951 lib/util.php:762
-#: lib/util.php:776 lib/util.php:822
+#: lib/util.php:776 lib/util.php:822 lib/util.php:850
 msgid "about an hour ago"
 msgstr "fa una hora"
 
@@ -3313,7 +3340,9 @@ msgstr "« Posterior"
 #: 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
+#: actions/userauthorization.php:52 actions/login.php:131
+#: actions/register.php:165 actions/avatarsettings.php:265
+#: lib/designsettings.php:294
 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 "
@@ -3542,6 +3571,7 @@ 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
+#: actions/register.php:230
 msgid "Password must be 6 or more characters."
 msgstr "La contrasenya hauria de ser d'entre 6 a més caràcters."
 
@@ -4093,7 +4123,7 @@ 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
+#: actions/avatarsettings.php:308 actions/avatarsettings.php:322
 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 "
@@ -4101,7 +4131,7 @@ msgstr ""
 
 #: actions/avatarsettings.php:327 actions/grouplogo.php:384
 #: actions/avatarsettings.php:323 actions/grouplogo.php:382
-#: actions/grouplogo.php:377
+#: actions/grouplogo.php:377 actions/avatarsettings.php:337
 msgid "Lost our file data."
 msgstr "S'ha perdut el nostre fitxer de dades."
 
@@ -4566,7 +4596,7 @@ msgid "%s left group %s"
 msgstr "%s ha abandonat el grup %s"
 
 #: actions/login.php:225 lib/facebookaction.php:304 actions/login.php:208
-#: actions/login.php:216
+#: actions/login.php:216 actions/login.php:243
 msgid "Login to site"
 msgstr "Accedir al lloc"
 
@@ -4748,7 +4778,8 @@ msgstr "Núvol d'etiquetes"
 
 #: 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
+#: actions/register.php:398 actions/register.php:85 actions/register.php:189
+#: actions/register.php:404
 msgid "Sorry, only invited people can register."
 msgstr "Ho senti, però només la gent convidada pot registrar-se."
 
@@ -4831,7 +4862,7 @@ msgstr "Perfil del grup"
 #: 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
+#: lib/profilelist.php:230 lib/userprofile.php:177
 msgid "URL"
 msgstr "URL"
 
@@ -4842,7 +4873,7 @@ msgstr "URL"
 #: 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
+#: lib/profilelist.php:245 lib/userprofile.php:194
 msgid "Note"
 msgstr "Avisos"
 
@@ -4891,6 +4922,7 @@ msgid "Only the sender and recipient "
 msgstr "Només el remitent i el destinatari "
 
 #: actions/showstream.php:73 actions/showstream.php:78
+#: actions/showstream.php:79
 #, php-format
 msgid "%s, page %d"
 msgstr "%s, pàgina %d"
@@ -4901,28 +4933,29 @@ msgstr "perfil"
 
 #: actions/showstream.php:236 actions/tagother.php:77
 #: actions/showstream.php:220 actions/showstream.php:185
-#: actions/showstream.php:193
+#: actions/showstream.php:193 lib/userprofile.php:75
 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
+#: actions/showstream.php:220 lib/userprofile.php:102
 msgid "Photo"
 msgstr "Foto"
 
 #: actions/showstream.php:317 actions/showstream.php:309
 #: actions/showstream.php:274 actions/showstream.php:354
+#: lib/userprofile.php:236
 msgid "User actions"
 msgstr "Accions de l'usuari"
 
 #: actions/showstream.php:342 actions/showstream.php:307
-#: actions/showstream.php:390
+#: actions/showstream.php:390 lib/userprofile.php:272
 msgid "Send a direct message to this user"
 msgstr "Enviar un missatge directe a aquest usuari"
 
 #: actions/showstream.php:343 actions/showstream.php:308
-#: actions/showstream.php:391
+#: actions/showstream.php:391 lib/userprofile.php:273
 msgid "Message"
 msgstr "Missatge"
 
@@ -5629,7 +5662,7 @@ msgstr "%s i amics"
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr "Pots pujar el teu avatar personal."
 
-#: actions/avatarsettings.php:373
+#: actions/avatarsettings.php:373 actions/avatarsettings.php:387
 #, fuzzy
 msgid "Avatar deleted."
 msgstr "Avatar actualitzat."
@@ -5770,10 +5803,12 @@ msgid ""
 msgstr ""
 
 #: actions/register.php:432 actions/register.php:479 actions/register.php:489
+#: actions/register.php:495
 msgid "Creative Commons Attribution 3.0"
 msgstr ""
 
 #: actions/register.php:433 actions/register.php:480 actions/register.php:490
+#: actions/register.php:496
 #, fuzzy
 msgid ""
 " except this private data: password, email address, IM address, and phone "
@@ -5810,44 +5845,48 @@ msgid "%s's profile"
 msgstr "perfil"
 
 #: actions/showstream.php:163 actions/showstream.php:128
+#: actions/showstream.php:129
 #, 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
+#: actions/showstream.php:136
 #, 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
+#: actions/showstream.php:143
 #, fuzzy, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "Feed d'avisos de %s"
 
 #: actions/showstream.php:182 actions/showstream.php:147
+#: actions/showstream.php:148
 #, 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
+#: actions/showstream.php:234 lib/userprofile.php:116
 #, fuzzy
 msgid "Edit Avatar"
 msgstr "Avatar"
 
 #: actions/showstream.php:316 actions/showstream.php:281
-#: actions/showstream.php:366
+#: actions/showstream.php:366 lib/userprofile.php:248
 #, fuzzy
 msgid "Edit profile settings"
 msgstr "Configuració del perfil"
 
 #: actions/showstream.php:317 actions/showstream.php:282
-#: actions/showstream.php:367
+#: actions/showstream.php:367 lib/userprofile.php:249
 msgid "Edit"
 msgstr ""
 
 #: actions/showstream.php:542 actions/showstream.php:388
-#: actions/showstream.php:487
+#: actions/showstream.php:487 actions/showstream.php:234
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5893,6 +5932,9 @@ msgstr ""
 #: actions/apistatusesupdate.php:125 actions/apisubscriptions.php:87
 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#: actions/apiaccountupdateprofileimage.php:91
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apistatusesupdate.php:139
 #, fuzzy
 msgid "No such user!"
 msgstr "Aquest usuari no existeix"
@@ -5954,36 +5996,6 @@ msgid ""
 "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 ""
@@ -6152,6 +6164,7 @@ 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
+#: actions/showstream.php:202
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -6333,7 +6346,8 @@ 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
+#: lib/designsettings.php:461 lib/designsettings.php:434
+#: lib/designsettings.php:464
 #, fuzzy
 msgid "Couldn't update your design."
 msgstr "No s'ha pogut actualitzar l'usuari."
@@ -6429,7 +6443,9 @@ msgid "Message sent"
 msgstr "Missatge"
 
 #: actions/newnotice.php:93 lib/designsettings.php:281
-#: actions/newnotice.php:94
+#: actions/newnotice.php:94 actions/apiaccountupdateprofileimage.php:97
+#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254
+#: lib/designsettings.php:283
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s bytes) due to its "
@@ -6599,7 +6615,7 @@ msgstr "T'has identificat. Escriu una nova contrasenya a continuació."
 msgid "Password recover"
 msgstr "Recuperació de contrasenya sol·licitada"
 
-#: actions/register.php:86
+#: actions/register.php:86 actions/register.php:92
 #, fuzzy
 msgid "Sorry, invalid invitation code."
 msgstr "Error amb el codi de confirmació."
@@ -6701,28 +6717,31 @@ msgstr "Admin"
 msgid "Not a local notice"
 msgstr "No existeix aquest usuari."
 
-#: actions/showstream.php:72
+#: actions/showstream.php:72 actions/showstream.php:73
 #, fuzzy, php-format
 msgid " tagged %s"
 msgstr "Aviso etiquetats amb %s"
 
-#: actions/showstream.php:121
+#: actions/showstream.php:121 actions/showstream.php:122
 #, 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
+#: actions/showstream.php:191
 #, 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
+#: actions/showstream.php:196
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
 msgstr ""
 
 #: actions/showstream.php:357 actions/showstream.php:451
+#: actions/showstream.php:198
 #, php-format
 msgid ""
 "You can try to nudge %s or [post something to his or her attention](%%%%"
@@ -6730,6 +6749,7 @@ msgid ""
 msgstr ""
 
 #: actions/showstream.php:393 actions/showstream.php:492
+#: actions/showstream.php:239
 #, fuzzy, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -6882,6 +6902,7 @@ 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
+#: classes/User.php:333
 #, fuzzy, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "Missatge per a %1$s a %2$s"
@@ -6992,10 +7013,12 @@ msgid "Save design"
 msgstr ""
 
 #: lib/designsettings.php:378 lib/designsettings.php:369
+#: lib/designsettings.php:372
 msgid "Bad default color settings: "
 msgstr ""
 
 #: lib/designsettings.php:474 lib/designsettings.php:465
+#: lib/designsettings.php:468
 msgid "Design defaults restored."
 msgstr ""
 
@@ -7202,16 +7225,18 @@ msgid "Status deleted."
 msgstr "Avatar actualitzat."
 
 #: actions/apistatusesupdate.php:132
+#: actions/apiaccountupdateprofileimage.php:99
 msgid "Unable to handle that much POST data!"
 msgstr ""
 
 #: actions/apistatusesupdate.php:145 actions/newnotice.php:155
-#: scripts/maildaemon.php:71
+#: scripts/maildaemon.php:71 actions/apistatusesupdate.php:152
 #, 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
+#: actions/apistatusesupdate.php:216
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
@@ -7276,7 +7301,7 @@ msgstr "Actualitzacions de %1$s a %2$s!"
 msgid "IM is not available."
 msgstr "Aquesta pàgina no està disponible en "
 
-#: actions/login.php:259
+#: actions/login.php:259 actions/login.php:286
 #, fuzzy, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -7311,21 +7336,24 @@ msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
 msgstr ""
 
 #: actions/profilesettings.php:122 actions/register.php:454
+#: actions/register.php:460
 #, 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
+#: actions/register.php:463
 #, fuzzy
 msgid "Describe yourself and your interests"
 msgstr "Explica'ns alguna cosa sobre tu "
 
 #: actions/profilesettings.php:221 actions/register.php:217
+#: actions/register.php:223
 #, 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
+#: actions/register.php:336 actions/register.php:342
 msgid ""
 "With this form you can create  a new account. You can then post notices and "
 "link up to friends and colleagues. "
@@ -7358,7 +7386,7 @@ msgid "Replies feed for %s (RSS 2.0)"
 msgstr "Feed d'avisos de %s"
 
 #: actions/replies.php:158
-#, fuzzy, php-format
+#, php-format
 msgid "Replies feed for %s (Atom)"
 msgstr "Feed d'avisos de %s"
 
@@ -7368,17 +7396,17 @@ msgid "Replies to %1$s on %2$s!"
 msgstr "Missatge per a %1$s a %2$s"
 
 #: actions/showfavorites.php:170
-#, fuzzy, php-format
+#, 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
+#, 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
+#, php-format
 msgid "Feed for favorites of %s (Atom)"
 msgstr "Feed per a amics de %s"
 
@@ -7391,7 +7419,7 @@ msgid ""
 msgstr ""
 
 #: actions/showgroup.php:345
-#, fuzzy, php-format
+#, php-format
 msgid "FOAF for %s group"
 msgstr "Safata de sortida per %s"
 
@@ -7530,41 +7558,6 @@ msgstr "respondre a aquesta nota"
 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. "
@@ -7599,7 +7592,7 @@ msgid "Describe the group or topic in %d characters"
 msgstr "Descriu el grup amb 140 caràcters"
 
 #: lib/jabber.php:192
-#, fuzzy, php-format
+#, php-format
 msgid "notice id: %s"
 msgstr "Nou avís"
 
@@ -7659,7 +7652,6 @@ 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."
 
@@ -7667,3 +7659,59 @@ msgstr "No s'ha pogut recuperar la conversa pública."
 #, fuzzy
 msgid "Duplicate notice"
 msgstr "Eliminar nota."
+
+#: actions/login.php:110 actions/login.php:120
+#, fuzzy
+msgid "Invalid or expired token."
+msgstr "El contingut de l'avís és invàlid"
+
+#: lib/command.php:597
+#, fuzzy, php-format
+msgid "Could not create login token for %s"
+msgstr "No s'ha pogut crear el formulari OpenID: %s"
+
+#: lib/command.php:602
+#, php-format
+msgid "This link is useable only once, and is good for only 2 minutes: %s"
+msgstr ""
+
+#: lib/imagefile.php:75
+#, fuzzy, php-format
+msgid "That file is too big. The maximum file size is %s."
+msgstr "Pots pujar una imatge de logo per al grup."
+
+#: lib/command.php:613
+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"
+"login - Get a link to login to the web interface\n"
+"drop <group> - leave group\n"
+"stats - get your stats\n"
+"stop - same as 'off'\n"
+"quit - same as 'off'\n"
+"sub <nickname> - same as 'follow'\n"
+"unsub <nickname> - same as 'leave'\n"
+"last <nickname> - same as 'get'\n"
+"on <nickname> - not yet implemented.\n"
+"off <nickname> - not yet implemented.\n"
+"nudge <nickname> - remind a user to update.\n"
+"invite <phone number> - not yet implemented.\n"
+"track <word> - not yet implemented.\n"
+"untrack <word> - not yet implemented.\n"
+"track off - not yet implemented.\n"
+"untrack all - not yet implemented.\n"
+"tracks - not yet implemented.\n"
+"tracking - not yet implemented.\n"
+msgstr ""
diff --git a/locale/cs/LC_MESSAGES/statusnet.mo b/locale/cs/LC_MESSAGES/statusnet.mo
index 69d67bfa2..26311ff1f 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 ddb48f050..f1d95850c 100644
--- a/locale/cs/LC_MESSAGES/statusnet.po
+++ b/locale/cs/LC_MESSAGES/statusnet.po
@@ -5,12 +5,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-06 13:16+0000\n"
-"PO-Revision-Date: 2009-11-06 15:43:04+0000\n"
+"POT-Creation-Date: 2009-11-08 11:53+0000\n"
+"PO-Revision-Date: 2009-11-08 11:56:10+0000\n"
 "Language-Team: Czech\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r58648); Translate extension (2009-08-03)\n"
+"X-Generator: MediaWiki 1.16alpha(r58760); 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"
@@ -175,7 +175,7 @@ msgid "%s updates from everyone!"
 msgstr ""
 
 #: ../actions/register.php:213 actions/register.php:497
-#: actions/register.php:545 actions/register.php:555
+#: actions/register.php:545 actions/register.php:555 actions/register.php:561
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -211,6 +211,7 @@ 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
+#: actions/register.php:424
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr ""
 
@@ -227,6 +228,7 @@ msgstr "6 a více znaků, a nezapomeňte"
 
 #: ../actions/register.php:154 actions/register.php:168
 #: actions/register.php:373 actions/register.php:419 actions/register.php:423
+#: actions/register.php:429
 msgid "6 or more characters. Required."
 msgstr ""
 
@@ -401,7 +403,7 @@ msgstr "Všechny položky obsahující \"%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
+#: actions/login.php:79 actions/register.php:137
 msgid "Already logged in."
 msgstr "Již přihlášen"
 
@@ -424,7 +426,7 @@ msgstr "Autorizovaný odběr"
 #: ../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
+#: actions/register.php:473 actions/login.php:253 actions/register.php:479
 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á "
 
@@ -446,6 +448,7 @@ msgstr "Obrázek"
 
 #: ../actions/avatar.php:113 actions/profilesettings.php:350
 #: actions/avatarsettings.php:395 actions/avatarsettings.php:346
+#: actions/avatarsettings.php:360
 msgid "Avatar updated."
 msgstr "Obrázek nahrán"
 
@@ -480,7 +483,7 @@ msgstr "Starší »"
 #: 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
+#: actions/register.php:459 actions/register.php:465
 msgid "Bio"
 msgstr "O mě"
 
@@ -509,6 +512,7 @@ msgstr "Nelze přečíst adresu obrázku '%s'"
 #: actions/passwordsettings.php:169 actions/recoverpassword.php:347
 #: actions/passwordsettings.php:174 actions/recoverpassword.php:365
 #: actions/passwordsettings.php:180 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:185
 msgid "Can't save new password."
 msgstr "Nelze uložit nové heslo"
 
@@ -571,6 +575,7 @@ msgstr ""
 #: actions/recoverpassword.php:236 actions/register.php:422
 #: actions/passwordsettings.php:111 actions/recoverpassword.php:239
 #: actions/register.php:426 actions/smssettings.php:134
+#: actions/register.php:432
 msgid "Confirm"
 msgstr "Heslo znovu"
 
@@ -600,7 +605,7 @@ msgid "Confirmation code not found."
 msgstr "Potvrzující kód nebyl nalezen"
 
 #: ../actions/register.php:202 actions/register.php:473
-#: actions/register.php:521 actions/register.php:531
+#: actions/register.php:521 actions/register.php:531 actions/register.php:537
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -824,6 +829,7 @@ 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
+#: classes/Notice.php:1120
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Chyba v DB při vkládání odpovědi: %s"
@@ -846,7 +852,8 @@ msgstr "Popiš sebe a své zájmy ve 140 znacích"
 #: 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
+#: lib/accountsettingsaction.php:117 actions/register.php:437
+#: actions/register.php:441
 msgid "Email"
 msgstr "Email"
 
@@ -861,7 +868,7 @@ msgid "Email Settings"
 msgstr ""
 
 #: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
-#: actions/register.php:200 actions/register.php:206
+#: actions/register.php:200 actions/register.php:206 actions/register.php:212
 msgid "Email address already exists."
 msgstr "Emailová adresa již existuje"
 
@@ -947,7 +954,7 @@ msgstr "Chyba při ukládaní uživatele"
 
 #: ../actions/password.php:80 actions/profilesettings.php:399
 #: actions/passwordsettings.php:164 actions/passwordsettings.php:169
-#: actions/passwordsettings.php:175
+#: actions/passwordsettings.php:175 actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "Chyba při ukládaní uživatele; neplatný"
 
@@ -959,6 +966,7 @@ msgstr "Chyba při ukládaní uživatele; neplatný"
 #: actions/login.php:120 actions/recoverpassword.php:372
 #: actions/register.php:235 actions/login.php:122
 #: actions/recoverpassword.php:375 actions/register.php:242
+#: actions/login.php:149 actions/register.php:248
 msgid "Error setting user."
 msgstr "Chyba nastavení uživatele"
 
@@ -990,6 +998,7 @@ msgstr "FAQ"
 
 #: ../actions/avatar.php:115 actions/profilesettings.php:352
 #: actions/avatarsettings.php:397 actions/avatarsettings.php:349
+#: actions/avatarsettings.php:363
 msgid "Failed updating avatar."
 msgstr "Nahrávání obrázku selhalo."
 
@@ -1024,6 +1033,7 @@ msgid "Find people on this site"
 msgstr ""
 
 #: ../actions/login.php:122 actions/login.php:247 actions/login.php:255
+#: actions/login.php:282
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -1039,6 +1049,7 @@ msgstr "Z bezpečnostních důvodů, prosím zadejte znovu své jméno a heslo."
 #: actions/showstream.php:220 lib/groupeditform.php:157
 #: actions/profilesettings.php:111 actions/register.php:441
 #: actions/showgroup.php:247 actions/showstream.php:267
+#: actions/register.php:447 lib/userprofile.php:149
 msgid "Full name"
 msgstr "Celé jméno"
 
@@ -1052,7 +1063,7 @@ msgstr "Celé jméno"
 #: 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
+#: actions/register.php:214 actions/register.php:220
 msgid "Full name is too long (max 255 chars)."
 msgstr "Jméno je moc dlouhé (maximální délka je 255 znaků)"
 
@@ -1073,7 +1084,7 @@ msgstr "Domů"
 #: 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
+#: actions/register.php:446 actions/register.php:452
 msgid "Homepage"
 msgstr "Moje stránky"
 
@@ -1085,7 +1096,7 @@ msgstr "Moje stránky"
 #: 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
+#: actions/register.php:211 actions/register.php:217
 msgid "Homepage is not a valid URL."
 msgstr "Stránka není platnou URL."
 
@@ -1155,7 +1166,7 @@ msgstr "Neplatné heslo"
 
 #: ../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
+#: actions/facebookhome.php:129 actions/login.php:116 actions/login.php:143
 msgid "Incorrect username or password."
 msgstr "Neplatné jméno nebo heslo"
 
@@ -1235,6 +1246,7 @@ msgstr "Neplatná velikost"
 #: 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
+#: actions/register.php:243 actions/register.php:264
 msgid "Invalid username or password."
 msgstr "Neplatné jméno nebo heslo"
 
@@ -1311,7 +1323,7 @@ msgstr ""
 #: 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
+#: lib/profilelist.php:218 actions/register.php:470 lib/userprofile.php:164
 msgid "Location"
 msgstr "Umístění"
 
@@ -1325,7 +1337,7 @@ msgstr "Umístění"
 #: 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
+#: actions/register.php:221 actions/register.php:227
 msgid "Location is too long (max 255 chars)."
 msgstr "Umístění příliš dlouhé (maximálně 255 znaků)"
 
@@ -1339,6 +1351,7 @@ msgstr "Umístění příliš dlouhé (maximálně 255 znaků)"
 #: 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
+#: actions/login.php:204 actions/login.php:257
 #, php-format
 msgid "Login"
 msgstr "Přihlásit"
@@ -1367,12 +1380,13 @@ msgstr "Odhlásit"
 
 #: ../actions/register.php:166 actions/register.php:180
 #: actions/register.php:393 actions/register.php:439 actions/register.php:443
+#: actions/register.php:449
 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 actions/login.php:236
+#: lib/facebookaction.php:327 actions/login.php:236 actions/login.php:263
 msgid "Lost or forgotten password?"
 msgstr "Ztracené nebo zapomenuté heslo?"
 
@@ -1412,7 +1426,7 @@ 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:487
+#: actions/register.php:477 actions/register.php:487 actions/register.php:493
 msgid "My text and files are available under "
 msgstr "Mé texty a soubory jsou k dispozici pod"
 
@@ -1470,7 +1484,8 @@ msgstr "Nové heslo bylo uloženo. Nyní jste přihlášen."
 #: 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
+#: actions/showgroup.php:236 actions/showstream.php:249 actions/login.php:246
+#: actions/register.php:423 lib/userprofile.php:131
 msgid "Nickname"
 msgstr "Přezdívka"
 
@@ -1484,7 +1499,7 @@ msgstr "Přezdívka"
 #: 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
+#: actions/register.php:202 actions/register.php:208
 msgid "Nickname already in use. Try another one."
 msgstr "Přezdívku již někdo používá. Zkuste jinou"
 
@@ -1500,7 +1515,7 @@ msgstr "Přezdívku již někdo používá. Zkuste jinou"
 #: 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
+#: actions/register.php:199 actions/register.php:205
 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"
 
@@ -1739,7 +1754,8 @@ msgstr ""
 #: 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
+#: lib/api.php:954 lib/api.php:982 lib/api.php:1092 lib/api.php:963
+#: lib/api.php:991 lib/api.php:1101
 msgid "Not a supported data format."
 msgstr ""
 
@@ -1760,7 +1776,7 @@ 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
+#: actions/register.php:189 actions/register.php:195 actions/register.php:201
 msgid "Not a valid email address."
 msgstr "Není platnou mailovou adresou."
 
@@ -1772,7 +1788,7 @@ msgstr "Není platnou mailovou adresou."
 #: 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
+#: actions/register.php:204 actions/register.php:210
 msgid "Not a valid nickname."
 msgstr "Není platnou přezdívkou."
 
@@ -1811,6 +1827,7 @@ msgstr "Nečekaná odpověď."
 #: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
 #: actions/twitapistatuses.php:309 actions/twitapistatuses.php:327
 #: actions/twitapistatuses.php:284 actions/apistatusesupdate.php:186
+#: actions/apistatusesupdate.php:193
 msgid "Not found"
 msgstr ""
 
@@ -1957,7 +1974,8 @@ msgstr "Částečné náhrání."
 #: 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
+#: lib/accountsettingsaction.php:114 actions/login.php:249
+#: actions/register.php:428
 msgid "Password"
 msgstr "Heslo"
 
@@ -1986,6 +2004,7 @@ msgstr "Žádost o obnovu hesla"
 #: actions/passwordsettings.php:173 actions/recoverpassword.php:200
 #: actions/passwordsettings.php:178 actions/recoverpassword.php:208
 #: actions/passwordsettings.php:184 actions/recoverpassword.php:211
+#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "Heslo uloženo"
 
@@ -1994,6 +2013,7 @@ msgstr "Heslo uloženo"
 #: actions/passwordsettings.php:145 actions/register.php:183
 #: actions/passwordsettings.php:150 actions/register.php:220
 #: actions/passwordsettings.php:156 actions/register.php:227
+#: actions/register.php:233
 msgid "Passwords don't match."
 msgstr "Hesla nesouhlasí"
 
@@ -2158,19 +2178,19 @@ msgstr "Obnovyt kód pro neznámého uživatele"
 #: 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
+#: lib/logingroupnav.php:85 actions/register.php:114 actions/register.php:502
 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
+#: actions/register.php:129 actions/register.php:135
 msgid "Registration not allowed."
 msgstr ""
 
 #: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67 actions/register.php:106
+#: actions/register.php:67 actions/register.php:106 actions/register.php:112
 msgid "Registration successful"
 msgstr ""
 
@@ -2184,6 +2204,7 @@ msgstr "Odmítnout"
 #: 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
+#: actions/login.php:252 actions/register.php:477
 msgid "Remember me"
 msgstr "Zapamatuj si mě"
 
@@ -2282,6 +2303,7 @@ msgstr "Stejné jako heslo výše"
 
 #: ../actions/register.php:156 actions/register.php:170
 #: actions/register.php:377 actions/register.php:423 actions/register.php:427
+#: actions/register.php:433
 msgid "Same as password above. Required."
 msgstr ""
 
@@ -2442,6 +2464,7 @@ msgstr "Uložené OpenID nebylo nalezeno."
 #: actions/remotesubscribe.php:113 actions/showstream.php:376
 #: lib/subscribeform.php:139 actions/showstream.php:345
 #: actions/remotesubscribe.php:137 actions/showstream.php:439
+#: lib/userprofile.php:321
 msgid "Subscribe"
 msgstr "Odebírat"
 
@@ -2488,6 +2511,7 @@ msgstr "Chyba systému při nahrávání souboru"
 #: actions/profilesettings.php:123 actions/showstream.php:255
 #: lib/subscriptionlist.php:106 lib/subscriptionlist.php:108
 #: actions/profilesettings.php:138 actions/showstream.php:327
+#: lib/userprofile.php:209
 msgid "Tags"
 msgstr ""
 
@@ -2706,6 +2730,7 @@ msgstr ""
 #: actions/apifriendshipsdestroy.php:91 actions/apigroupcreate.php:104
 #: actions/apigroupjoin.php:91 actions/apigroupleave.php:91
 #: actions/apistatusesupdate.php:109
+#: actions/apiaccountupdateprofileimage.php:84
 msgid "This method requires a POST."
 msgstr ""
 
@@ -2739,7 +2764,7 @@ msgstr ""
 
 #: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
 #: actions/twitapifriendships.php:132 actions/twitapifriendships.php:139
-#: actions/apifriendshipsexists.php:103
+#: actions/apifriendshipsexists.php:103 actions/apifriendshipsexists.php:94
 msgid "Two user ids or screen_names must be supplied."
 msgstr ""
 
@@ -2747,7 +2772,7 @@ msgstr ""
 #: 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
+#: actions/register.php:448 actions/register.php:454
 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."
 
@@ -2769,6 +2794,7 @@ msgstr "Adresa profilu na jiných kompatibilních mikroblozích."
 #: actions/twittersettings.php:322 lib/designsettings.php:301
 #: actions/emailsettings.php:255 actions/grouplogo.php:319
 #: actions/imsettings.php:220 actions/smssettings.php:248
+#: actions/avatarsettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "Nečekaná forma submission."
 
@@ -2877,7 +2903,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
+#: actions/register.php:436 actions/register.php:438 actions/register.php:442
 msgid "Used only for updates, announcements, and password recovery"
 msgstr "Použije se pouze pro aktualizace, oznámení a obnovu hesla."
 
@@ -2905,7 +2931,8 @@ msgstr "Úživatel, kterému nasloucháte neexistuje."
 #: 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
+#: actions/apiusershow.php:108 actions/apiaccountupdateprofileimage.php:124
+#: actions/apiaccountupdateprofileimage.php:130
 msgid "User has no profile."
 msgstr "Uživatel nemá profil."
 
@@ -2934,7 +2961,7 @@ msgstr "Co se děje %s?"
 #: 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
+#: actions/register.php:466 actions/register.php:472
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Místo. Město, stát."
 
@@ -3035,7 +3062,7 @@ 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/register.php:149
-#: actions/register.php:186 actions/register.php:192
+#: actions/register.php:186 actions/register.php:192 actions/register.php:198
 msgid "You can't register if you don't agree to the license."
 msgstr "Nemůžete se registrovat, pokud nesouhlasíte s licencí."
 
@@ -3100,56 +3127,56 @@ msgstr ""
 "Zde může spravovat vaše OpenID"
 
 #: ../lib/util.php:943 lib/util.php:992 lib/util.php:945 lib/util.php:756
-#: lib/util.php:770 lib/util.php:816
+#: lib/util.php:770 lib/util.php:816 lib/util.php:844
 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:768
-#: lib/util.php:782 lib/util.php:828
+#: lib/util.php:782 lib/util.php:828 lib/util.php:856
 #, 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:764
-#: lib/util.php:778 lib/util.php:824
+#: lib/util.php:778 lib/util.php:824 lib/util.php:852
 #, 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:760
-#: lib/util.php:774 lib/util.php:820
+#: lib/util.php:774 lib/util.php:820 lib/util.php:848
 #, 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:772
-#: lib/util.php:786 lib/util.php:832
+#: lib/util.php:786 lib/util.php:832 lib/util.php:860
 #, 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:766
-#: lib/util.php:780 lib/util.php:826
+#: lib/util.php:780 lib/util.php:826 lib/util.php:854
 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:758
-#: lib/util.php:772 lib/util.php:818
+#: lib/util.php:772 lib/util.php:818 lib/util.php:846
 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:770
-#: lib/util.php:784 lib/util.php:830
+#: lib/util.php:784 lib/util.php:830 lib/util.php:858
 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:774
-#: lib/util.php:788 lib/util.php:834
+#: lib/util.php:788 lib/util.php:834 lib/util.php:862
 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:762
-#: lib/util.php:776 lib/util.php:822
+#: lib/util.php:776 lib/util.php:822 lib/util.php:850
 msgid "about an hour ago"
 msgstr "asi před hodinou"
 
@@ -3219,7 +3246,9 @@ msgstr "« Novější"
 #: 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
+#: actions/userauthorization.php:52 actions/login.php:131
+#: actions/register.php:165 actions/avatarsettings.php:265
+#: lib/designsettings.php:294
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
@@ -3439,6 +3468,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
+#: actions/register.php:230
 msgid "Password must be 6 or more characters."
 msgstr ""
 
@@ -3978,13 +4008,13 @@ msgid "There was a problem with your session token. "
 msgstr ""
 
 #: actions/avatarsettings.php:303 actions/grouplogo.php:360
-#: actions/avatarsettings.php:308
+#: actions/avatarsettings.php:308 actions/avatarsettings.php:322
 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
+#: actions/grouplogo.php:377 actions/avatarsettings.php:337
 msgid "Lost our file data."
 msgstr ""
 
@@ -4471,7 +4501,7 @@ msgid "%s left group %s"
 msgstr ""
 
 #: actions/login.php:225 lib/facebookaction.php:304 actions/login.php:208
-#: actions/login.php:216
+#: actions/login.php:216 actions/login.php:243
 msgid "Login to site"
 msgstr ""
 
@@ -4660,7 +4690,8 @@ 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
+#: actions/register.php:398 actions/register.php:85 actions/register.php:189
+#: actions/register.php:404
 msgid "Sorry, only invited people can register."
 msgstr ""
 
@@ -4751,7 +4782,7 @@ msgstr "Žádné takové oznámení."
 #: 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
+#: lib/profilelist.php:230 lib/userprofile.php:177
 msgid "URL"
 msgstr ""
 
@@ -4762,7 +4793,7 @@ msgstr ""
 #: 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
+#: lib/profilelist.php:245 lib/userprofile.php:194
 #, fuzzy
 msgid "Note"
 msgstr "Sdělení"
@@ -4811,6 +4842,7 @@ msgid "Only the sender and recipient "
 msgstr ""
 
 #: actions/showstream.php:73 actions/showstream.php:78
+#: actions/showstream.php:79
 #, php-format
 msgid "%s, page %d"
 msgstr ""
@@ -4822,29 +4854,30 @@ msgstr "Profil"
 
 #: actions/showstream.php:236 actions/tagother.php:77
 #: actions/showstream.php:220 actions/showstream.php:185
-#: actions/showstream.php:193
+#: actions/showstream.php:193 lib/userprofile.php:75
 #, 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
+#: actions/showstream.php:220 lib/userprofile.php:102
 msgid "Photo"
 msgstr ""
 
 #: actions/showstream.php:317 actions/showstream.php:309
 #: actions/showstream.php:274 actions/showstream.php:354
+#: lib/userprofile.php:236
 msgid "User actions"
 msgstr ""
 
 #: actions/showstream.php:342 actions/showstream.php:307
-#: actions/showstream.php:390
+#: actions/showstream.php:390 lib/userprofile.php:272
 msgid "Send a direct message to this user"
 msgstr ""
 
 #: actions/showstream.php:343 actions/showstream.php:308
-#: actions/showstream.php:391
+#: actions/showstream.php:391 lib/userprofile.php:273
 msgid "Message"
 msgstr ""
 
@@ -5588,7 +5621,7 @@ msgstr "%s a přátelé"
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr ""
 
-#: actions/avatarsettings.php:373
+#: actions/avatarsettings.php:373 actions/avatarsettings.php:387
 #, fuzzy
 msgid "Avatar deleted."
 msgstr "Obrázek nahrán"
@@ -5716,10 +5749,12 @@ msgid ""
 msgstr ""
 
 #: actions/register.php:432 actions/register.php:479 actions/register.php:489
+#: actions/register.php:495
 msgid "Creative Commons Attribution 3.0"
 msgstr ""
 
 #: actions/register.php:433 actions/register.php:480 actions/register.php:490
+#: actions/register.php:496
 #, fuzzy
 msgid ""
 " except this private data: password, email address, IM address, and phone "
@@ -5756,44 +5791,48 @@ msgid "%s's profile"
 msgstr "Profil"
 
 #: actions/showstream.php:163 actions/showstream.php:128
+#: actions/showstream.php:129
 #, 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
+#: actions/showstream.php:136
 #, 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
+#: actions/showstream.php:143
 #, fuzzy, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "Feed sdělení pro %s"
 
 #: actions/showstream.php:182 actions/showstream.php:147
+#: actions/showstream.php:148
 #, php-format
 msgid "FOAF for %s"
 msgstr ""
 
 #: actions/showstream.php:237 actions/showstream.php:202
-#: actions/showstream.php:234
+#: actions/showstream.php:234 lib/userprofile.php:116
 #, fuzzy
 msgid "Edit Avatar"
 msgstr "Obrázek"
 
 #: actions/showstream.php:316 actions/showstream.php:281
-#: actions/showstream.php:366
+#: actions/showstream.php:366 lib/userprofile.php:248
 #, fuzzy
 msgid "Edit profile settings"
 msgstr "Nastavené Profilu"
 
 #: actions/showstream.php:317 actions/showstream.php:282
-#: actions/showstream.php:367
+#: actions/showstream.php:367 lib/userprofile.php:249
 msgid "Edit"
 msgstr ""
 
 #: actions/showstream.php:542 actions/showstream.php:388
-#: actions/showstream.php:487
+#: actions/showstream.php:487 actions/showstream.php:234
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5836,6 +5875,9 @@ msgstr ""
 #: actions/apistatusesupdate.php:125 actions/apisubscriptions.php:87
 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#: actions/apiaccountupdateprofileimage.php:91
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apistatusesupdate.php:139
 #, fuzzy
 msgid "No such user!"
 msgstr "Žádný takový uživatel."
@@ -5888,36 +5930,6 @@ msgid ""
 "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 ""
@@ -6088,6 +6100,7 @@ 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
+#: actions/showstream.php:202
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -6265,7 +6278,8 @@ 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
+#: lib/designsettings.php:461 lib/designsettings.php:434
+#: lib/designsettings.php:464
 #, fuzzy
 msgid "Couldn't update your design."
 msgstr "Nelze aktualizovat uživatele"
@@ -6357,7 +6371,9 @@ msgid "Message sent"
 msgstr ""
 
 #: actions/newnotice.php:93 lib/designsettings.php:281
-#: actions/newnotice.php:94
+#: actions/newnotice.php:94 actions/apiaccountupdateprofileimage.php:97
+#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254
+#: lib/designsettings.php:283
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s bytes) due to its "
@@ -6525,7 +6541,7 @@ msgstr "Byl jste identifikován. Zadejte nové heslo"
 msgid "Password recover"
 msgstr "Žádost o obnovu hesla"
 
-#: actions/register.php:86
+#: actions/register.php:86 actions/register.php:92
 #, fuzzy
 msgid "Sorry, invalid invitation code."
 msgstr "Chyba v ověřovacím kódu"
@@ -6624,28 +6640,31 @@ msgstr ""
 msgid "Not a local notice"
 msgstr "Žádný takový uživatel."
 
-#: actions/showstream.php:72
+#: actions/showstream.php:72 actions/showstream.php:73
 #, php-format
 msgid " tagged %s"
 msgstr ""
 
-#: actions/showstream.php:121
+#: actions/showstream.php:121 actions/showstream.php:122
 #, 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
+#: actions/showstream.php:191
 #, 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
+#: actions/showstream.php:196
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
 msgstr ""
 
 #: actions/showstream.php:357 actions/showstream.php:451
+#: actions/showstream.php:198
 #, php-format
 msgid ""
 "You can try to nudge %s or [post something to his or her attention](%%%%"
@@ -6653,6 +6672,7 @@ msgid ""
 msgstr ""
 
 #: actions/showstream.php:393 actions/showstream.php:492
+#: actions/showstream.php:239
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -6799,6 +6819,7 @@ 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
+#: classes/User.php:333
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr ""
@@ -6909,10 +6930,12 @@ msgid "Save design"
 msgstr ""
 
 #: lib/designsettings.php:378 lib/designsettings.php:369
+#: lib/designsettings.php:372
 msgid "Bad default color settings: "
 msgstr ""
 
 #: lib/designsettings.php:474 lib/designsettings.php:465
+#: lib/designsettings.php:468
 msgid "Design defaults restored."
 msgstr ""
 
@@ -7118,16 +7141,18 @@ msgid "Status deleted."
 msgstr "Obrázek nahrán"
 
 #: actions/apistatusesupdate.php:132
+#: actions/apiaccountupdateprofileimage.php:99
 msgid "Unable to handle that much POST data!"
 msgstr ""
 
 #: actions/apistatusesupdate.php:145 actions/newnotice.php:155
-#: scripts/maildaemon.php:71
+#: scripts/maildaemon.php:71 actions/apistatusesupdate.php:152
 #, 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
+#: actions/apistatusesupdate.php:216
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
@@ -7191,7 +7216,7 @@ msgstr "Mikroblog od %s"
 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
+#: actions/login.php:259 actions/login.php:286
 #, fuzzy, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -7226,21 +7251,24 @@ msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
 msgstr ""
 
 #: actions/profilesettings.php:122 actions/register.php:454
+#: actions/register.php:460
 #, 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
+#: actions/register.php:463
 #, 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
+#: actions/register.php:223
 #, 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
+#: actions/register.php:336 actions/register.php:342
 msgid ""
 "With this form you can create  a new account. You can then post notices and "
 "link up to friends and colleagues. "
@@ -7407,7 +7435,7 @@ msgid "Site content license"
 msgstr "Nové sdělení"
 
 #: lib/command.php:88
-#, fuzzy, php-format
+#, php-format
 msgid "Could not find a user with nickname %s"
 msgstr "Nelze aktualizovat uživatele"
 
@@ -7444,41 +7472,6 @@ msgstr "Odpovědi na %s"
 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. "
@@ -7511,7 +7504,7 @@ 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
+#, php-format
 msgid "notice id: %s"
 msgstr "Nové sdělení"
 
@@ -7579,3 +7572,59 @@ msgstr "Nelze aktualizovat uživatele"
 #, fuzzy
 msgid "Duplicate notice"
 msgstr "Nové sdělení"
+
+#: actions/login.php:110 actions/login.php:120
+#, fuzzy
+msgid "Invalid or expired token."
+msgstr "Neplatný obsah sdělení"
+
+#: lib/command.php:597
+#, fuzzy, php-format
+msgid "Could not create login token for %s"
+msgstr "Nelze vytvořit OpenID z: %s"
+
+#: lib/command.php:602
+#, php-format
+msgid "This link is useable only once, and is good for only 2 minutes: %s"
+msgstr ""
+
+#: lib/imagefile.php:75
+#, fuzzy, php-format
+msgid "That file is too big. The maximum file size is %s."
+msgstr "Je to příliš dlouhé. Maximální sdělení délka je 140 znaků"
+
+#: lib/command.php:613
+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"
+"login - Get a link to login to the web interface\n"
+"drop <group> - leave group\n"
+"stats - get your stats\n"
+"stop - same as 'off'\n"
+"quit - same as 'off'\n"
+"sub <nickname> - same as 'follow'\n"
+"unsub <nickname> - same as 'leave'\n"
+"last <nickname> - same as 'get'\n"
+"on <nickname> - not yet implemented.\n"
+"off <nickname> - not yet implemented.\n"
+"nudge <nickname> - remind a user to update.\n"
+"invite <phone number> - not yet implemented.\n"
+"track <word> - not yet implemented.\n"
+"untrack <word> - not yet implemented.\n"
+"track off - not yet implemented.\n"
+"untrack all - not yet implemented.\n"
+"tracks - not yet implemented.\n"
+"tracking - not yet implemented.\n"
+msgstr ""
diff --git a/locale/de/LC_MESSAGES/statusnet.mo b/locale/de/LC_MESSAGES/statusnet.mo
index 5687793fa..00856c2f7 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 269a68711..09a14daea 100644
--- a/locale/de/LC_MESSAGES/statusnet.po
+++ b/locale/de/LC_MESSAGES/statusnet.po
@@ -6,12 +6,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-06 13:16+0000\n"
-"PO-Revision-Date: 2009-11-06 15:43:08+0000\n"
+"POT-Creation-Date: 2009-11-08 11:53+0000\n"
+"PO-Revision-Date: 2009-11-08 11:56:13+0000\n"
 "Language-Team: German\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r58648); Translate extension (2009-08-03)\n"
+"X-Generator: MediaWiki 1.16alpha(r58760); 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"
@@ -201,7 +201,7 @@ msgid "%s updates from everyone!"
 msgstr "%s Nachrichten von allen!"
 
 #: ../actions/register.php:213 actions/register.php:497
-#: actions/register.php:545 actions/register.php:555
+#: actions/register.php:545 actions/register.php:555 actions/register.php:561
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -241,6 +241,7 @@ 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
+#: actions/register.php:424
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr ""
 "1-64 kleingeschriebene Buchstaben oder Zahlen, keine Satz- oder Leerzeichen. "
@@ -259,6 +260,7 @@ msgstr "6 oder mehr Zeichen, und nicht vergessen!"
 
 #: ../actions/register.php:154 actions/register.php:168
 #: actions/register.php:373 actions/register.php:419 actions/register.php:423
+#: actions/register.php:429
 msgid "6 or more characters. Required."
 msgstr "6 oder mehr Buchstaben. Pflicht."
 
@@ -441,7 +443,7 @@ msgstr "Alle Aktualisierungen, die den Suchbegriff „%s“ enthalten"
 #: 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
+#: actions/login.php:79 actions/register.php:137
 msgid "Already logged in."
 msgstr "Bereits angemeldet."
 
@@ -464,7 +466,7 @@ msgstr "Abonnement bestätigen"
 #: ../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
+#: actions/register.php:473 actions/login.php:253 actions/register.php:479
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Automatisch anmelden; nicht bei gemeinsam genutzten PCs einsetzen!"
 
@@ -488,6 +490,7 @@ msgstr "Avatar"
 
 #: ../actions/avatar.php:113 actions/profilesettings.php:350
 #: actions/avatarsettings.php:395 actions/avatarsettings.php:346
+#: actions/avatarsettings.php:360
 msgid "Avatar updated."
 msgstr "Avatar aktualisiert."
 
@@ -524,7 +527,7 @@ msgstr "Ältere"
 #: 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
+#: actions/register.php:459 actions/register.php:465
 msgid "Bio"
 msgstr "Biografie"
 
@@ -553,6 +556,7 @@ msgstr "Konnte Avatar-URL nicht öffnen „%s“"
 #: actions/passwordsettings.php:169 actions/recoverpassword.php:347
 #: actions/passwordsettings.php:174 actions/recoverpassword.php:365
 #: actions/passwordsettings.php:180 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:185
 msgid "Can't save new password."
 msgstr "Konnte neues Passwort nicht speichern"
 
@@ -615,6 +619,7 @@ msgstr "Ändern der Profileinstellungen"
 #: actions/recoverpassword.php:236 actions/register.php:422
 #: actions/passwordsettings.php:111 actions/recoverpassword.php:239
 #: actions/register.php:426 actions/smssettings.php:134
+#: actions/register.php:432
 msgid "Confirm"
 msgstr "Bestätigen"
 
@@ -644,7 +649,7 @@ msgid "Confirmation code not found."
 msgstr "Bestätigungscode nicht gefunden."
 
 #: ../actions/register.php:202 actions/register.php:473
-#: actions/register.php:521 actions/register.php:531
+#: actions/register.php:521 actions/register.php:531 actions/register.php:537
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -883,6 +888,7 @@ 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
+#: classes/Notice.php:1120
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Datenbankfehler beim Einfügen der Antwort: %s"
@@ -905,7 +911,8 @@ msgstr "Beschreibe dich selbst in 140 Zeichen"
 #: 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
+#: lib/accountsettingsaction.php:117 actions/register.php:437
+#: actions/register.php:441
 msgid "Email"
 msgstr "E-Mail"
 
@@ -920,7 +927,7 @@ msgid "Email Settings"
 msgstr "E-Mail-Einstellungen"
 
 #: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
-#: actions/register.php:200 actions/register.php:206
+#: actions/register.php:200 actions/register.php:206 actions/register.php:212
 msgid "Email address already exists."
 msgstr "Diese E-Mail-Adresse existiert bereits."
 
@@ -1006,7 +1013,7 @@ msgstr "Fehler beim Speichern des Nutzers."
 
 #: ../actions/password.php:80 actions/profilesettings.php:399
 #: actions/passwordsettings.php:164 actions/passwordsettings.php:169
-#: actions/passwordsettings.php:175
+#: actions/passwordsettings.php:175 actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "Fehler beim Speichern des Nutzers, ungültig."
 
@@ -1018,6 +1025,7 @@ msgstr "Fehler beim Speichern des Nutzers, ungültig."
 #: actions/login.php:120 actions/recoverpassword.php:372
 #: actions/register.php:235 actions/login.php:122
 #: actions/recoverpassword.php:375 actions/register.php:242
+#: actions/login.php:149 actions/register.php:248
 msgid "Error setting user."
 msgstr "Fehler bei den Nutzereinstellungen."
 
@@ -1049,6 +1057,7 @@ msgstr "FAQ"
 
 #: ../actions/avatar.php:115 actions/profilesettings.php:352
 #: actions/avatarsettings.php:397 actions/avatarsettings.php:349
+#: actions/avatarsettings.php:363
 msgid "Failed updating avatar."
 msgstr "Aktualisierung des Avatars fehlgeschlagen."
 
@@ -1083,6 +1092,7 @@ msgid "Find people on this site"
 msgstr "Finde Leute auf dieser Seite"
 
 #: ../actions/login.php:122 actions/login.php:247 actions/login.php:255
+#: actions/login.php:282
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -1100,6 +1110,7 @@ msgstr ""
 #: actions/showstream.php:220 lib/groupeditform.php:157
 #: actions/profilesettings.php:111 actions/register.php:441
 #: actions/showgroup.php:247 actions/showstream.php:267
+#: actions/register.php:447 lib/userprofile.php:149
 msgid "Full name"
 msgstr "Vollständiger Name"
 
@@ -1113,7 +1124,7 @@ msgstr "Vollständiger Name"
 #: 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
+#: actions/register.php:214 actions/register.php:220
 msgid "Full name is too long (max 255 chars)."
 msgstr "Ihr vollständiger Name ist zu lang (maximal 255 Zeichen)."
 
@@ -1134,7 +1145,7 @@ msgstr "Startseite"
 #: 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
+#: actions/register.php:446 actions/register.php:452
 msgid "Homepage"
 msgstr "Homepage"
 
@@ -1146,7 +1157,7 @@ msgstr "Homepage"
 #: 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
+#: actions/register.php:211 actions/register.php:217
 msgid "Homepage is not a valid URL."
 msgstr ""
 "Homepage ist kein gültiger URL. URL´s müssen ein Präfix wie http enthalten."
@@ -1220,7 +1231,7 @@ msgstr "Altes Passwort falsch"
 
 #: ../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
+#: actions/facebookhome.php:129 actions/login.php:116 actions/login.php:143
 msgid "Incorrect username or password."
 msgstr "Falscher Benutzername oder Passwort."
 
@@ -1300,6 +1311,7 @@ msgstr "Ungültige Größe."
 #: 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
+#: actions/register.php:243 actions/register.php:264
 msgid "Invalid username or password."
 msgstr "Benutzername oder Passwort falsch."
 
@@ -1377,7 +1389,7 @@ msgstr "Die eingegebene Sprache ist zu lang (maximal 50 Zeichen)"
 #: 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
+#: lib/profilelist.php:218 actions/register.php:470 lib/userprofile.php:164
 msgid "Location"
 msgstr "Aufenthaltsort"
 
@@ -1391,7 +1403,7 @@ msgstr "Aufenthaltsort"
 #: 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
+#: actions/register.php:221 actions/register.php:227
 msgid "Location is too long (max 255 chars)."
 msgstr "Der eingegebene Aufenthaltsort ist zu lang (maximal 255 Zeichen)."
 
@@ -1405,6 +1417,7 @@ msgstr "Der eingegebene Aufenthaltsort ist zu lang (maximal 255 Zeichen)."
 #: 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
+#: actions/login.php:204 actions/login.php:257
 #, php-format
 msgid "Login"
 msgstr "Einloggen"
@@ -1433,12 +1446,13 @@ msgstr "Abmelden"
 
 #: ../actions/register.php:166 actions/register.php:180
 #: actions/register.php:393 actions/register.php:439 actions/register.php:443
+#: actions/register.php:449
 msgid "Longer name, preferably your \"real\" 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 actions/login.php:228 lib/facebookaction.php:325
-#: lib/facebookaction.php:327 actions/login.php:236
+#: lib/facebookaction.php:327 actions/login.php:236 actions/login.php:263
 msgid "Lost or forgotten password?"
 msgstr "Passwort vergessen?"
 
@@ -1483,7 +1497,7 @@ 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:487
+#: actions/register.php:477 actions/register.php:487 actions/register.php:493
 msgid "My text and files are available under "
 msgstr "Meine Texte und Daten sind verfügbar unter"
 
@@ -1541,7 +1555,8 @@ msgstr "Neues Passwort erfolgreich gespeichert. Du bist jetzt angemeldet."
 #: 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
+#: actions/showgroup.php:236 actions/showstream.php:249 actions/login.php:246
+#: actions/register.php:423 lib/userprofile.php:131
 msgid "Nickname"
 msgstr "Nutzername"
 
@@ -1555,7 +1570,7 @@ msgstr "Nutzername"
 #: 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
+#: actions/register.php:202 actions/register.php:208
 msgid "Nickname already in use. Try another one."
 msgstr "Nutzername wird bereits verwendet. Suche dir einen anderen aus."
 
@@ -1571,7 +1586,7 @@ msgstr "Nutzername wird bereits verwendet. Suche dir einen anderen aus."
 #: 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
+#: actions/register.php:199 actions/register.php:205
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
 "Der Nutzername darf nur aus Kleinbuchstaben und Ziffern bestehen. "
@@ -1812,7 +1827,8 @@ msgstr "Kein registrierter Nutzer."
 #: 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
+#: lib/api.php:954 lib/api.php:982 lib/api.php:1092 lib/api.php:963
+#: lib/api.php:991 lib/api.php:1101
 msgid "Not a supported data format."
 msgstr "Kein unterstütztes Datenformat."
 
@@ -1833,7 +1849,7 @@ 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
+#: actions/register.php:189 actions/register.php:195 actions/register.php:201
 msgid "Not a valid email address."
 msgstr "Ungültige E-Mail-Adresse."
 
@@ -1845,7 +1861,7 @@ msgstr "Ungültige E-Mail-Adresse."
 #: 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
+#: actions/register.php:204 actions/register.php:210
 msgid "Not a valid nickname."
 msgstr "Ungültiger Nutzername."
 
@@ -1884,6 +1900,7 @@ msgstr "Unerwartete Antwort!"
 #: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
 #: actions/twitapistatuses.php:309 actions/twitapistatuses.php:327
 #: actions/twitapistatuses.php:284 actions/apistatusesupdate.php:186
+#: actions/apistatusesupdate.php:193
 msgid "Not found"
 msgstr "Nicht gefunden"
 
@@ -2032,7 +2049,8 @@ msgstr "Unvollständiges Hochladen."
 #: 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
+#: lib/accountsettingsaction.php:114 actions/login.php:249
+#: actions/register.php:428
 msgid "Password"
 msgstr "Passwort"
 
@@ -2061,6 +2079,7 @@ msgstr "Wiederherstellung des Passworts angefordert"
 #: actions/passwordsettings.php:173 actions/recoverpassword.php:200
 #: actions/passwordsettings.php:178 actions/recoverpassword.php:208
 #: actions/passwordsettings.php:184 actions/recoverpassword.php:211
+#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "Passwort gespeichert."
 
@@ -2069,6 +2088,7 @@ msgstr "Passwort gespeichert."
 #: actions/passwordsettings.php:145 actions/register.php:183
 #: actions/passwordsettings.php:150 actions/register.php:220
 #: actions/passwordsettings.php:156 actions/register.php:227
+#: actions/register.php:233
 msgid "Passwords don't match."
 msgstr "Passwörter stimmen nicht überein."
 
@@ -2232,19 +2252,19 @@ msgstr "Wiederherstellungscode für unbekannten Nutzer."
 #: 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
+#: lib/logingroupnav.php:85 actions/register.php:114 actions/register.php:502
 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
+#: actions/register.php:129 actions/register.php:135
 msgid "Registration not allowed."
 msgstr "Registrierung nicht gestattet"
 
 #: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67 actions/register.php:106
+#: actions/register.php:67 actions/register.php:106 actions/register.php:112
 msgid "Registration successful"
 msgstr "Registrierung erfolgreich"
 
@@ -2258,6 +2278,7 @@ msgstr "Ablehnen"
 #: 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
+#: actions/login.php:252 actions/register.php:477
 msgid "Remember me"
 msgstr "Anmeldedaten merken"
 
@@ -2356,6 +2377,7 @@ msgstr "Gleiches Passwort wie zuvor"
 
 #: ../actions/register.php:156 actions/register.php:170
 #: actions/register.php:377 actions/register.php:423 actions/register.php:427
+#: actions/register.php:433
 msgid "Same as password above. Required."
 msgstr "Gleiches Passwort wie zuvor. Pflichteingabe."
 
@@ -2521,6 +2543,7 @@ msgstr "Gespeicherte OpenID nicht gefunden."
 #: actions/remotesubscribe.php:113 actions/showstream.php:376
 #: lib/subscribeform.php:139 actions/showstream.php:345
 #: actions/remotesubscribe.php:137 actions/showstream.php:439
+#: lib/userprofile.php:321
 msgid "Subscribe"
 msgstr "Abonnieren"
 
@@ -2567,6 +2590,7 @@ msgstr "Systemfehler beim hochladen der Datei."
 #: actions/profilesettings.php:123 actions/showstream.php:255
 #: lib/subscriptionlist.php:106 lib/subscriptionlist.php:108
 #: actions/profilesettings.php:138 actions/showstream.php:327
+#: lib/userprofile.php:209
 msgid "Tags"
 msgstr "Tags"
 
@@ -2790,6 +2814,7 @@ msgstr "Diese Methode benötigt ein POST oder DELETE."
 #: actions/apifriendshipsdestroy.php:91 actions/apigroupcreate.php:104
 #: actions/apigroupjoin.php:91 actions/apigroupleave.php:91
 #: actions/apistatusesupdate.php:109
+#: actions/apiaccountupdateprofileimage.php:84
 msgid "This method requires a POST."
 msgstr "Diese Methode benötigt ein POST."
 
@@ -2824,7 +2849,7 @@ msgstr ""
 
 #: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
 #: actions/twitapifriendships.php:132 actions/twitapifriendships.php:139
-#: actions/apifriendshipsexists.php:103
+#: actions/apifriendshipsexists.php:103 actions/apifriendshipsexists.php:94
 msgid "Two user ids or screen_names must be supplied."
 msgstr "Zwei IDs oder Benutzernamen müssen angegeben werden."
 
@@ -2832,7 +2857,7 @@ msgstr "Zwei IDs oder Benutzernamen müssen angegeben werden."
 #: 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
+#: actions/register.php:448 actions/register.php:454
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr ""
 "URL deiner Homepage, deines Blogs, oder deines Profils auf einer anderen Site"
@@ -2855,6 +2880,7 @@ msgstr "Profil-URL bei einem anderen kompatiblen Microbloggingdienst"
 #: actions/twittersettings.php:322 lib/designsettings.php:301
 #: actions/emailsettings.php:255 actions/grouplogo.php:319
 #: actions/imsettings.php:220 actions/smssettings.php:248
+#: actions/avatarsettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "Unerwartete Formulareingabe."
 
@@ -2966,7 +2992,7 @@ 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:382
 #: actions/register.php:386 actions/register.php:428 actions/register.php:432
-#: actions/register.php:436
+#: actions/register.php:436 actions/register.php:438 actions/register.php:442
 msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
 "Wird nur für Updates, wichtige Mitteilungen und zur "
@@ -2996,7 +3022,8 @@ msgstr "Aufgeführte Nutzer existiert nicht."
 #: 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
+#: actions/apiusershow.php:108 actions/apiaccountupdateprofileimage.php:124
+#: actions/apiaccountupdateprofileimage.php:130
 msgid "User has no profile."
 msgstr "Benutzer hat kein Profil."
 
@@ -3025,7 +3052,7 @@ msgstr "Was ist los, %s?"
 #: 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
+#: actions/register.php:466 actions/register.php:472
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Wo du bist, beispielsweise „Stadt, Gebiet, Land“"
 
@@ -3129,7 +3156,7 @@ 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/register.php:149
-#: actions/register.php:186 actions/register.php:192
+#: actions/register.php:186 actions/register.php:192 actions/register.php:198
 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."
@@ -3206,56 +3233,56 @@ msgstr ""
 "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:756
-#: lib/util.php:770 lib/util.php:816
+#: lib/util.php:770 lib/util.php:816 lib/util.php:844
 msgid "a few seconds ago"
 msgstr "vor wenigen Sekunden"
 
 #: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957 lib/util.php:768
-#: lib/util.php:782 lib/util.php:828
+#: lib/util.php:782 lib/util.php:828 lib/util.php:856
 #, 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:764
-#: lib/util.php:778 lib/util.php:824
+#: lib/util.php:778 lib/util.php:824 lib/util.php:852
 #, 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:760
-#: lib/util.php:774 lib/util.php:820
+#: lib/util.php:774 lib/util.php:820 lib/util.php:848
 #, 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:772
-#: lib/util.php:786 lib/util.php:832
+#: lib/util.php:786 lib/util.php:832 lib/util.php:860
 #, 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:766
-#: lib/util.php:780 lib/util.php:826
+#: lib/util.php:780 lib/util.php:826 lib/util.php:854
 msgid "about a day ago"
 msgstr "vor einem Tag"
 
 #: ../lib/util.php:945 lib/util.php:994 lib/util.php:947 lib/util.php:758
-#: lib/util.php:772 lib/util.php:818
+#: lib/util.php:772 lib/util.php:818 lib/util.php:846
 msgid "about a minute ago"
 msgstr "vor einer Minute"
 
 #: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959 lib/util.php:770
-#: lib/util.php:784 lib/util.php:830
+#: lib/util.php:784 lib/util.php:830 lib/util.php:858
 msgid "about a month ago"
 msgstr "vor einem Monat"
 
 #: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963 lib/util.php:774
-#: lib/util.php:788 lib/util.php:834
+#: lib/util.php:788 lib/util.php:834 lib/util.php:862
 msgid "about a year ago"
 msgstr "vor einem Jahr"
 
 #: ../lib/util.php:949 lib/util.php:998 lib/util.php:951 lib/util.php:762
-#: lib/util.php:776 lib/util.php:822
+#: lib/util.php:776 lib/util.php:822 lib/util.php:850
 msgid "about an hour ago"
 msgstr "vor einer Stunde"
 
@@ -3324,7 +3351,9 @@ msgstr "Früher"
 #: 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
+#: actions/userauthorization.php:52 actions/login.php:131
+#: actions/register.php:165 actions/avatarsettings.php:265
+#: lib/designsettings.php:294
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Es gab ein Problem mit deinem Sitzungstoken. Bitte versuche es erneut."
 
@@ -3369,7 +3398,6 @@ msgid "Could not create favorite."
 msgstr "Konnte keinen Favoriten erstellen."
 
 #: actions/favor.php:70
-#, fuzzy
 msgid "Disfavor"
 msgstr "Aus Favoriten entfernen"
 
@@ -3397,7 +3425,6 @@ msgid "Inbox for %s"
 msgstr "Posteingang von %s"
 
 #: actions/inbox.php:53 actions/inbox.php:115
-#, fuzzy
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr ""
 "Das hier ist dein Posteingang, der deine eingehenden privaten Nachrichten "
@@ -3557,6 +3584,7 @@ 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
+#: actions/register.php:230
 msgid "Password must be 6 or more characters."
 msgstr "Das Passwort muss aus 6 oder mehr Zeichen bestehen."
 
@@ -3959,22 +3987,19 @@ msgid "Commands:\n"
 msgstr "Befehle:\n"
 
 #: 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:65
-#, fuzzy
 msgid "Could not update message with new URI."
 msgstr "Konnte Nachricht nicht mit neuer URI versehen."
 
 #: lib/gallery.php:46
-#, fuzzy
 msgid "User without matching profile in system."
 msgstr "Benutzer ohne entsprechendes Profil im System."
 
 #: lib/mail.php:147 lib/mail.php:289
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
 "\n"
@@ -3997,12 +4022,10 @@ msgstr ""
 "\n"
 
 #: 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."
 
 #: lib/openid.php:195 lib/openid.php:203
-#, fuzzy
 msgid "This form should automatically submit itself. "
 msgstr "Dieses Formular sollte sich automatisch abschicken. "
 
@@ -4014,7 +4037,7 @@ msgstr "Favoriten"
 #: lib/personal.php:66 lib/personalgroupnav.php:114
 #: actions/favoritesrss.php:110 actions/showfavorites.php:77
 #: lib/personalgroupnav.php:115 actions/favoritesrss.php:111
-#, fuzzy, php-format
+#, php-format
 msgid "%s's favorite notices"
 msgstr "%ss favorisierte Nachrichten"
 
@@ -4059,14 +4082,13 @@ 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:66
 #: actions/facebookhome.php:161 actions/all.php:48
 #: actions/facebookhome.php:156 actions/all.php:84
-#, fuzzy, php-format
+#, php-format
 msgid "%s and friends, page %d"
 msgstr "%s und Freunde, Seite %d"
 
@@ -4112,28 +4134,25 @@ msgstr "Zuschneiden"
 #: 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 "Es gab ein Problem mit deinem Sitzungstoken. Bitte versuche es erneut."
+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
+#: actions/avatarsettings.php:308 actions/avatarsettings.php:322
 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
+#: actions/grouplogo.php:377 actions/avatarsettings.php:337
 msgid "Lost our file data."
 msgstr "Daten verloren."
 
 #: 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 "Daten verloren."
 
@@ -4170,7 +4189,6 @@ msgid "You have already blocked this user."
 msgstr "Du hast diesen Benutzer bereits blockiert."
 
 #: actions/block.php:167 actions/block.php:170
-#, fuzzy
 msgid "Failed to save block information."
 msgstr "Konnte Blockierungsdaten nicht speichern."
 
@@ -4180,12 +4198,10 @@ msgid "The address \"%s\" has been "
 msgstr "Die Adresse „%s“ wurde "
 
 #: actions/deletenotice.php:73
-#, fuzzy
 msgid "You are about to permanently delete a notice. "
 msgstr "Du bist dabei diese Nachricht dauerhaft zu entfernen. "
 
 #: actions/disfavor.php:94
-#, fuzzy
 msgid "Add to favorites"
 msgstr "Zu Favoriten hinzufügen"
 
@@ -4198,7 +4214,6 @@ msgstr "Gruppe %s bearbeiten"
 #: 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"
 
@@ -4215,7 +4230,6 @@ msgstr "Du musst angemeldet sein, um eine Gruppe zu erstellen."
 #: 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"
 
@@ -4227,7 +4241,6 @@ msgstr "Kein Benutzername"
 #: 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"
 
@@ -4246,7 +4259,6 @@ msgid "Use this form to edit the group."
 msgstr "Benutze dieses Formular, um die Gruppe zu bearbeiten."
 
 #: actions/editgroup.php:179 actions/newgroup.php:130 actions/register.php:156
-#, fuzzy
 msgid "Nickname must have only lowercase letters "
 msgstr "Der Benutzername darf nur aus Kleinbuchstaben bestehen "
 
@@ -4260,12 +4272,11 @@ msgid "Could not update group."
 msgstr "Konnte Gruppe nicht aktualisieren."
 
 #: actions/editgroup.php:226 actions/editgroup.php:269
-#, fuzzy
 msgid "Options saved."
 msgstr "Einstellungen gespeichert."
 
 #: actions/emailsettings.php:107 actions/imsettings.php:108
-#, fuzzy, php-format
+#, php-format
 msgid "Awaiting confirmation on this address. "
 msgstr "Warte auf die Bestätigung dieser Adresse. "
 
@@ -4293,12 +4304,11 @@ msgstr ""
 "hinzugefügt hast. "
 
 #: 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
-#, fuzzy, php-format
+#, php-format
 msgid "If you would like the %s app to automatically update "
 msgstr "Wenn du automatische Aktualisierungen der Anwendung %s möchtest "
 
@@ -4314,7 +4324,6 @@ msgstr "Überspringen"
 
 #: actions/facebookhome.php:235 lib/facebookaction.php:479
 #: lib/facebookaction.php:471
-#, fuzzy
 msgid "No notice content!"
 msgstr "Kein Inhalt!"
 
@@ -4322,7 +4331,6 @@ msgstr "Kein Inhalt!"
 #: 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"
 
@@ -4337,29 +4345,27 @@ msgstr "Später"
 #: 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 actions/facebookinvite.php:72
-#, fuzzy, php-format
+#, 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:74
-#, fuzzy
 msgid "Invitations have been sent to the following users:"
-msgstr "Einladung(en) an folgende Personen geschickt:"
+msgstr "Einladungen an folgende Personen geschickt:"
 
 #: actions/facebookinvite.php:96 actions/facebookinvite.php:102
 #: actions/facebookinvite.php:94
-#, fuzzy, php-format
+#, php-format
 msgid "You have been invited to %s"
 msgstr "Du wurdest von %s angestupst"
 
 #: actions/facebookinvite.php:105 actions/facebookinvite.php:111
 #: actions/facebookinvite.php:103
-#, fuzzy, php-format
+#, php-format
 msgid "Invite your friends to use %s"
 msgstr "Lade deine Freunde ein %s zu nutzen"
 
@@ -4380,13 +4386,11 @@ msgid "Couldn't remove Facebook user."
 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."
 
 #: actions/facebooksettings.php:67
-#, fuzzy
 msgid "Sync preferences saved."
 msgstr "Synchronisationseinstellungen gespeichert."
 
@@ -4404,7 +4408,6 @@ msgid "Prefix"
 msgstr "Präfix"
 
 #: actions/facebooksettings.php:108
-#, fuzzy
 msgid "A string to prefix notices with."
 msgstr "Eine Zeichenfolge, die deinen Nachrichten vorangestellt wird."
 
@@ -4414,12 +4417,10 @@ msgid "If you would like %s to automatically update "
 msgstr "Wenn du %s automatisch aktualisieren lassen möchtest "
 
 #: actions/facebooksettings.php:147
-#, fuzzy
 msgid "Sync preferences"
 msgstr "Synchronisationseinstellungen"
 
 #: actions/favor.php:94 lib/disfavorform.php:140 actions/favor.php:92
-#, fuzzy
 msgid "Disfavor favorite"
 msgstr "Aus Favoriten entfernen"
 
@@ -4442,22 +4443,20 @@ msgstr "Die momentan beliebtesten Nachrichten auf dieser Seite."
 #: actions/featured.php:69 lib/featureduserssection.php:82
 #: lib/publicgroupnav.php:87 lib/publicgroupnav.php:89
 #: lib/featureduserssection.php:87
-#, fuzzy
 msgid "Featured users"
-msgstr "Featured Benutzer"
+msgstr "Top-Benutzer"
 
 #: actions/featured.php:71
-#, fuzzy, php-format
+#, php-format
 msgid "Featured users, page %d"
-msgstr "Featured Benutzer, Seite %d"
+msgstr "Top-Benutzer, Seite %d"
 
 #: actions/featured.php:99
-#, fuzzy, php-format
+#, 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:96
-#, fuzzy
 msgid "That user has blocked you from subscribing."
 msgstr "Dieser Benutzer erlaubt dir nicht ihn zu abonnieren."
 
@@ -4477,13 +4476,11 @@ msgstr "Du kannst ein Logo für Deine Gruppe hochladen."
 
 #: 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:403
 #: actions/grouplogo.php:398
-#, fuzzy
 msgid "Failed updating logo."
 msgstr "Aktualisierung des Logos fehlgeschlagen."
 
@@ -4513,9 +4510,9 @@ msgid "Groups, page %d"
 msgstr "Gruppen, Seite %d"
 
 #: actions/groups.php:90
-#, fuzzy, php-format
+#, php-format
 msgid "%%%%site.name%%%% groups let you find and talk with "
-msgstr "%%%%site.name%%%% Gruppen - finde und tausche dich aus mit "
+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
@@ -4523,19 +4520,17 @@ msgid "Create a new group"
 msgstr "Neue Gruppe erstellen"
 
 #: actions/groupsearch.php:57
-#, fuzzy, php-format
+#, 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. "
 
 #: actions/groupsearch.php:63 actions/groupsearch.php:58
-#, fuzzy
 msgid "Group search"
 msgstr "Gruppen-Suche"
 
 #: actions/imsettings.php:70
-#, fuzzy
 msgid "You can send and receive notices through "
 msgstr "Du kannst Nachrichten senden und empfangen über "
 
@@ -4545,12 +4540,11 @@ msgid "Jabber or GTalk address, "
 msgstr "Jabber- oder GTalk-Adressen, "
 
 #: actions/imsettings.php:147
-#, fuzzy
 msgid "Send me replies through Jabber/GTalk "
-msgstr "Schicke mir Nachrichten mittels Jabber/GTalk."
+msgstr "Schicke mir Nachrichten mittels Jabber/GTalk "
 
 #: actions/imsettings.php:321
-#, fuzzy, php-format
+#, php-format
 msgid "A confirmation code was sent "
 msgstr "Es wurde ein Bestätigungscode gesendet "
 
@@ -4559,12 +4553,11 @@ 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: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:133 lib/command.php:234
-#, fuzzy, php-format
+#, php-format
 msgid "Could not join user %s to group %s"
 msgstr "Konnte Benutzer %s nicht der Gruppe %s hinzufügen"
 
@@ -4574,7 +4567,6 @@ msgid "%s joined group %s"
 msgstr "%s ist der Gruppe %s beigetreten"
 
 #: actions/leavegroup.php:60
-#, fuzzy
 msgid "Inboxes must be enabled for groups to work."
 msgstr "Damit Gruppen funktionieren müssen Posteingänge aktiviert sein."
 
@@ -4586,30 +4578,26 @@ msgstr "Du musst angemeldet sein, um aus einer Gruppe auszutreten."
 #: 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:90 lib/command.php:268
-#, fuzzy
 msgid "You are not a member of that group."
 msgstr "Du bist kein Mitglied dieser Gruppe."
 
 #: actions/leavegroup.php:100
-#, fuzzy
 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: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:132
 #: actions/leavegroup.php:127 lib/command.php:284
-#, fuzzy, php-format
+#, php-format
 msgid "Could not remove user %s to group %s"
 msgstr "Konnte Benutzer %s aus der Gruppe %s nicht entfernen"
 
@@ -4620,8 +4608,7 @@ msgid "%s left group %s"
 msgstr "%s hat die Gruppe %s verlassen"
 
 #: actions/login.php:225 lib/facebookaction.php:304 actions/login.php:208
-#: actions/login.php:216
-#, fuzzy
+#: actions/login.php:216 actions/login.php:243
 msgid "Login to site"
 msgstr "An Seite anmelden"
 
@@ -4634,24 +4621,20 @@ msgid "New group"
 msgstr "Neue Gruppe"
 
 #: 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: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:229
 #: actions/apigroupcreate.php:166 actions/newgroup.php:224
-#, fuzzy
 msgid "Could not set group membership."
 msgstr "Konnte Gruppenmitgliedschaft nicht setzen."
 
 #: actions/newmessage.php:119 actions/newnotice.php:132
-#, fuzzy
 msgid "That's too long. "
 msgstr "Das ist zu lang. "
 
@@ -4661,7 +4644,6 @@ msgstr "Schreibe dir selbst keine Nachrichten; "
 
 #: actions/newnotice.php:166 actions/newnotice.php:174
 #: actions/newnotice.php:272 actions/newnotice.php:199
-#, fuzzy
 msgid "Notice posted"
 msgstr "Nachricht hinzugefügt"
 
@@ -4691,12 +4673,10 @@ msgid "OpenID login"
 msgstr "OpenID-Anmeldung"
 
 #: actions/openidsettings.php:128
-#, fuzzy
 msgid "Removing your only OpenID "
 msgstr "Entfernen deiner einzigen OpenID "
 
 #: actions/othersettings.php:60
-#, fuzzy
 msgid "Other Settings"
 msgstr "Andere Einstellungen"
 
@@ -4723,20 +4703,18 @@ msgid "URL shortening service is too long (max 50 chars)."
 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,"
+msgstr "Ändere dein Passwort."
 
 #: actions/passwordsettings.php:89 actions/recoverpassword.php:228
 #: actions/passwordsettings.php:95 actions/recoverpassword.php:231
-#, fuzzy
 msgid "Password change"
-msgstr "Passwort gespeichert"
+msgstr "Passwort geändert"
 
 #: actions/peopletag.php:35 actions/peopletag.php:70
-#, fuzzy, php-format
+#, php-format
 msgid "Not a valid people tag: %s"
-msgstr "Ungültiger Tag: %s"
+msgstr "Ungültiger Personen-Tag: %s"
 
 #: actions/peopletag.php:47 actions/peopletag.php:144
 #, php-format
@@ -4749,7 +4727,6 @@ msgid "These are users who have tagged themselves \"%s\" "
 msgstr "Benutzer die sich selbst mit „%s“ getagged haben "
 
 #: actions/profilesettings.php:91 actions/profilesettings.php:99
-#, fuzzy
 msgid "Profile information"
 msgstr "Profilinformation"
 
@@ -4762,7 +4739,6 @@ msgstr ""
 "Leerzeichen getrennt"
 
 #: actions/profilesettings.php:144
-#, fuzzy
 msgid "Automatically subscribe to whoever "
 msgstr "Abonniere automatisch alle Kontakte, die mich abonnieren "
 
@@ -4780,7 +4756,7 @@ msgstr "Konnte Tags nicht speichern."
 
 #: actions/public.php:107 actions/public.php:110 actions/public.php:118
 #: actions/public.php:129
-#, fuzzy, php-format
+#, php-format
 msgid "Public timeline, page %d"
 msgstr "Öffentliche Zeitleiste, Seite %d"
 
@@ -4799,7 +4775,6 @@ msgstr ""
 "Mikro-blogging) Dienst "
 
 #: actions/publictagcloud.php:57
-#, fuzzy
 msgid "Public tag cloud"
 msgstr "Öffentliche Tag-Wolke"
 
@@ -4814,12 +4789,12 @@ msgstr "Tag-Wolke"
 
 #: 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
+#: actions/register.php:398 actions/register.php:85 actions/register.php:189
+#: actions/register.php:404
 msgid "Sorry, only invited people can register."
 msgstr "Es tut uns leid, zum Registrieren benötigst du eine Einladung."
 
 #: actions/register.php:149
-#, fuzzy
 msgid "You can't register if you don't "
 msgstr "Du kannst dich nicht registrieren, wenn du nicht "
 
@@ -4828,7 +4803,6 @@ msgid "With this form you can create "
 msgstr "Dieses Formular hilft dir beim Erstellen von "
 
 #: actions/register.php:368
-#, fuzzy
 msgid "1-64 lowercase letters or numbers, "
 msgstr "1-64 Kleinbuchstaben oder Ziffern, "
 
@@ -4837,48 +4811,42 @@ msgid "Used only for updates, announcements, "
 msgstr "Verwendet nur für Aktualisierungen und wichtige Mitteilungen, "
 
 #: actions/register.php:398
-#, fuzzy
 msgid "URL of your homepage, blog, "
 msgstr "URL deiner Homepage, Blogs, "
 
 #: actions/register.php:404
-#, fuzzy
 msgid "Describe yourself and your "
 msgstr "Beschreibe dich selbst und deine "
 
 #: actions/register.php:410
-#, fuzzy
 msgid "Where you are, like \"City, "
-msgstr "Wo du bist, z.B. \"Stadt, "
+msgstr "Wo du bist, beispielsweise \"Stadt, "
 
 #: actions/register.php:432
-#, fuzzy
 msgid " except this private data: password, "
 msgstr " außer folgende private Daten: Passwort, "
 
 #: actions/register.php:471
-#, fuzzy, php-format
+#, php-format
 msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. "
 msgstr "Gratuliere, %s! Und willkommen auf %%%%site.name%%%%. "
 
 #: actions/register.php:495
-#, fuzzy
 msgid "(You should receive a message by email "
 msgstr "(Du solltest eine Nachricht per E-Mail erhalten "
 
 #: actions/remotesubscribe.php:166 actions/remotesubscribe.php:171
-#, fuzzy
 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:120 actions/replies.php:119
 #: actions/replies.php:127
-#, fuzzy, php-format
+#, php-format
 msgid "Replies to %s, page %d"
 msgstr "Antworten an %s, Seite %d"
 
 #: actions/showfavorites.php:79
-#, fuzzy, php-format
+#, php-format
 msgid "%s favorite notices, page %d"
 msgstr "%ss favorisierte Nachrichten, Seite %d"
 
@@ -4894,7 +4862,6 @@ msgstr "%s Gruppe, Seite %d"
 
 #: actions/showgroup.php:206 actions/showgroup.php:208
 #: actions/showgroup.php:213 actions/showgroup.php:218
-#, fuzzy
 msgid "Group profile"
 msgstr "Gruppenprofil"
 
@@ -4905,7 +4872,7 @@ msgstr "Gruppenprofil"
 #: 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
+#: lib/profilelist.php:230 lib/userprofile.php:177
 msgid "URL"
 msgstr "URL"
 
@@ -4916,19 +4883,17 @@ msgstr "URL"
 #: 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
+#: lib/profilelist.php:245 lib/userprofile.php:194
 msgid "Note"
 msgstr "Nachricht"
 
 #: 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:304
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for %s group"
 msgstr "Nachrichtenfeed der Gruppe %s"
 
@@ -4936,7 +4901,6 @@ msgstr "Nachrichtenfeed der Gruppe %s"
 #: 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"
 
@@ -4946,7 +4910,6 @@ msgstr "Mitglieder"
 #: 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)"
 
@@ -4969,48 +4932,44 @@ msgid "Only the sender and recipient "
 msgstr "Nur der Absender und Empfänger "
 
 #: actions/showstream.php:73 actions/showstream.php:78
+#: actions/showstream.php:79
 #, php-format
 msgid "%s, page %d"
 msgstr "%s, Seite %d"
 
 #: actions/showstream.php:143
-#, fuzzy
 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
+#: actions/showstream.php:193 lib/userprofile.php:75
 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
+#: actions/showstream.php:220 lib/userprofile.php:102
 msgid "Photo"
 msgstr "Foto"
 
 #: actions/showstream.php:317 actions/showstream.php:309
 #: actions/showstream.php:274 actions/showstream.php:354
-#, fuzzy
+#: lib/userprofile.php:236
 msgid "User actions"
 msgstr "Benutzeraktionen"
 
 #: actions/showstream.php:342 actions/showstream.php:307
-#: actions/showstream.php:390
-#, fuzzy
+#: actions/showstream.php:390 lib/userprofile.php:272
 msgid "Send a direct message to this user"
 msgstr "Direkte Nachricht an Benutzer verschickt"
 
 #: actions/showstream.php:343 actions/showstream.php:308
-#: actions/showstream.php:391
-#, fuzzy
+#: actions/showstream.php:391 lib/userprofile.php:273
 msgid "Message"
 msgstr "Nachricht"
 
 #: actions/showstream.php:451 lib/profileaction.php:157
-#, fuzzy
 msgid "All subscribers"
 msgstr "Alle Abonnenten"
 
@@ -5028,39 +4987,32 @@ msgstr ""
 "(http://de.wikipedia.org/wiki/Mikro-blogging) "
 
 #: actions/smssettings.php:128
-#, fuzzy
 msgid "Phone number, no punctuation or spaces, "
 msgstr "Telefonnummer, keine Satz- oder Leerzeichen, "
 
 #: actions/smssettings.php:162
-#, fuzzy
 msgid "Send me notices through SMS; "
 msgstr "Schicke mir Nachrichten per SMS; "
 
 #: actions/smssettings.php:335
-#, fuzzy
 msgid "A confirmation code was sent to the phone number you added. "
 msgstr ""
 "Ein Bestätigungscode wurde an die Telefonnummer gesendet, die du hinzugefügt "
 "hast. "
 
 #: actions/smssettings.php:453 actions/smssettings.php:465
-#, fuzzy
 msgid "Mobile carrier"
 msgstr "Netzanbieter"
 
 #: actions/subedit.php:70
-#, fuzzy
 msgid "You are not subscribed to that profile."
 msgstr "Du hast dieses Profil nicht abonniert."
 
 #: actions/subedit.php:83
-#, fuzzy
 msgid "Could not save subscription."
 msgstr "Konnte Abonnement nicht erstellen."
 
 #: actions/subscribe.php:55
-#, fuzzy
 msgid "Not a local user."
 msgstr "Kein lokaler Benutzer."
 
@@ -5069,42 +5021,40 @@ msgid "Subscribed"
 msgstr "Abonniert"
 
 #: actions/subscribers.php:50
-#, fuzzy, php-format
+#, php-format
 msgid "%s subscribers"
 msgstr "%s Abonnenten"
 
 #: actions/subscribers.php:52
-#, fuzzy, php-format
+#, php-format
 msgid "%s subscribers, page %d"
 msgstr "%s Abonnenten, Seite %d"
 
 #: actions/subscribers.php:63
-#, fuzzy
 msgid "These are the people who listen to "
 msgstr "Folgende Leute lesen "
 
 #: actions/subscribers.php:67
-#, fuzzy, php-format
+#, php-format
 msgid "These are the people who "
 msgstr "Folgende Leute "
 
 #: actions/subscriptions.php:52
-#, fuzzy, php-format
+#, php-format
 msgid "%s subscriptions"
 msgstr "%s Abonnements"
 
 #: actions/subscriptions.php:54
-#, fuzzy, php-format
+#, php-format
 msgid "%s subscriptions, page %d"
 msgstr "%s Abonnements, Seite %d"
 
 #: actions/subscriptions.php:65
-#, fuzzy
 msgid "These are the people whose notices "
 msgstr "Dies sind die Leute, deren Nachrichten "
 
 #: actions/subscriptions.php:69
-#, fuzzy, php-format
+#, php-format
 msgid "These are the people whose "
 msgstr "Dies sind die Leute, deren "
 
@@ -5114,7 +5064,7 @@ msgid "Jabber"
 msgstr "Jabber"
 
 #: actions/tag.php:43 actions/tag.php:51 actions/tag.php:59 actions/tag.php:68
-#, fuzzy, php-format
+#, php-format
 msgid "Notices tagged with %s, page %d"
 msgstr "Nachrichten, die mit %s getagt sind, Seite %d"
 
@@ -5124,22 +5074,19 @@ msgid "Messages tagged \"%s\", most recent first"
 msgstr "Nachrichten getagt mit „%s“, neueste zuerst"
 
 #: actions/tagother.php:33
-#, fuzzy
 msgid "Not logged in"
 msgstr "Nicht angemeldet"
 
 #: actions/tagother.php:39
-#, fuzzy
 msgid "No id argument."
 msgstr "Kein id Argument."
 
 #: actions/tagother.php:65
-#, fuzzy, php-format
+#, php-format
 msgid "Tag %s"
 msgstr "Tag %s"
 
 #: actions/tagother.php:141
-#, fuzzy
 msgid "Tag user"
 msgstr "Benutzer taggen"
 
@@ -5152,7 +5099,6 @@ msgstr ""
 "Leerzeichen getrennt"
 
 #: actions/tagother.php:164
-#, fuzzy
 msgid "There was a problem with your session token."
 msgstr "Es gab ein Problem mit deinem Sessiontoken."
 
@@ -5168,21 +5114,19 @@ msgid "Could not save tags."
 msgstr "Konnte Tags nicht speichern."
 
 #: 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 ""
 "Benutze dieses Formular, um Tags zu deinen Abonnenten oder Abonnements "
 "hinzuzufügen."
 
 #: actions/tagrss.php:35
-#, fuzzy
 msgid "No such tag."
 msgstr "Tag nicht vorhanden."
 
 #: actions/tagrss.php:66 actions/tagrss.php:64
-#, fuzzy, php-format
+#, php-format
 msgid "Microblog tagged with %s"
-msgstr "Microblog getaggt mit %s"
+msgstr "Mikroblog getaggt mit %s"
 
 #: actions/twitapiblocks.php:47 actions/twitapiblocks.php:49
 #: actions/apiblockcreate.php:108
@@ -5191,7 +5135,6 @@ msgstr "Blockieren des Benutzers fehlgeschlagen."
 
 #: actions/twitapiblocks.php:69 actions/twitapiblocks.php:71
 #: actions/apiblockdestroy.php:107
-#, fuzzy
 msgid "Unblock user failed."
 msgstr "Freigeben des Benutzers fehlgeschlagen."
 
@@ -5218,32 +5161,27 @@ msgid "Twitter Friends"
 msgstr "Twitter-Freunde"
 
 #: actions/twittersettings.php:327
-#, fuzzy
 msgid "Username must have only numbers, "
 msgstr "Für den Benutzernamen gelten nur Nummern, "
 
 #: actions/twittersettings.php:341
-#, fuzzy, php-format
+#, php-format
 msgid "Unable to retrieve account information "
 msgstr "Konnte Kontoinformationen nicht abrufen "
 
 #: 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:77
-#, fuzzy
 msgid "No profile id in request."
-msgstr "Der entfernte Server hat keine Profil-ID geliefert."
+msgstr "Keine Profil-ID in der Anfrage."
 
 #: 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:98
-#, fuzzy
 msgid "Unsubscribed"
 msgstr "Abbestellt"
 
@@ -5260,7 +5198,6 @@ msgstr "%s Gruppen, Seite %d"
 
 #: 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."
 
@@ -5279,26 +5216,23 @@ msgstr ""
 "Du wurdest für das Schreiben von Nachrichten auf dieser Seite gesperrt."
 
 #: lib/accountsettingsaction.php:108 lib/accountsettingsaction.php:112
-#, fuzzy
 msgid "Upload an avatar"
 msgstr "Avatar hochladen"
 
 #: lib/accountsettingsaction.php:119 lib/accountsettingsaction.php:122
 #: lib/accountsettingsaction.php:123
-#, fuzzy
 msgid "Other"
 msgstr "Sonstige"
 
 #: 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:132 lib/action.php:142 lib/action.php:144
-#, fuzzy, php-format
+#, php-format
 msgid "%s - %s"
-msgstr "%s (%s)"
+msgstr "%s - %s"
 
 #: lib/action.php:145 lib/action.php:147 lib/action.php:157 lib/action.php:159
 msgid "Untitled page"
@@ -5309,12 +5243,10 @@ msgid "Primary site navigation"
 msgstr "Hauptnavigation"
 
 #: 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:396 lib/action.php:448 lib/action.php:459
-#, fuzzy
 msgid "Search for people or text"
 msgstr "Suche nach Leuten oder Text"
 
@@ -5323,22 +5255,18 @@ msgid "Account"
 msgstr "Konto"
 
 #: 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: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: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:412 lib/action.php:443 lib/action.php:453
-#, fuzzy
 msgid "Login to the site"
 msgstr "Auf der Seite anmelden"
 
@@ -5347,32 +5275,26 @@ msgid "Create an account"
 msgstr "Neues Konto erstellen"
 
 #: lib/action.php:341 lib/action.php:418
-#, fuzzy
 msgid "Login with OpenID"
 msgstr "Mit OpenID anmelden"
 
 #: 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:441 lib/action.php:468 lib/action.php:480
-#, fuzzy
 msgid "Site notice"
-msgstr "Neue Nachricht"
+msgstr "Seitennachricht"
 
 #: 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:559 lib/action.php:597 lib/action.php:612
-#, fuzzy
 msgid "Page notice"
 msgstr "Neue Nachricht"
 
 #: lib/action.php:562 lib/action.php:654 lib/action.php:699 lib/action.php:714
-#, fuzzy
 msgid "Secondary site navigation"
 msgstr "Unternavigation"
 
@@ -5787,7 +5709,7 @@ msgstr "%s und Freunde"
 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
+#: actions/avatarsettings.php:373 actions/avatarsettings.php:387
 #, fuzzy
 msgid "Avatar deleted."
 msgstr "Avatar aktualisiert."
@@ -5927,10 +5849,12 @@ msgid ""
 msgstr ""
 
 #: actions/register.php:432 actions/register.php:479 actions/register.php:489
+#: actions/register.php:495
 msgid "Creative Commons Attribution 3.0"
 msgstr ""
 
 #: actions/register.php:433 actions/register.php:480 actions/register.php:490
+#: actions/register.php:496
 #, fuzzy
 msgid ""
 " except this private data: password, email address, IM address, and phone "
@@ -5967,44 +5891,48 @@ msgid "%s's profile"
 msgstr "s Profil"
 
 #: actions/showstream.php:163 actions/showstream.php:128
+#: actions/showstream.php:129
 #, 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
+#: actions/showstream.php:136
 #, 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
+#: actions/showstream.php:143
 #, fuzzy, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "Feed der Nachrichten von %s"
 
 #: actions/showstream.php:182 actions/showstream.php:147
+#: actions/showstream.php:148
 #, fuzzy, php-format
 msgid "FOAF for %s"
 msgstr "Postausgang von %s"
 
 #: actions/showstream.php:237 actions/showstream.php:202
-#: actions/showstream.php:234
+#: actions/showstream.php:234 lib/userprofile.php:116
 #, fuzzy
 msgid "Edit Avatar"
 msgstr "Avatar"
 
 #: actions/showstream.php:316 actions/showstream.php:281
-#: actions/showstream.php:366
+#: actions/showstream.php:366 lib/userprofile.php:248
 #, fuzzy
 msgid "Edit profile settings"
 msgstr "Profil Einstellungen"
 
 #: actions/showstream.php:317 actions/showstream.php:282
-#: actions/showstream.php:367
+#: actions/showstream.php:367 lib/userprofile.php:249
 msgid "Edit"
 msgstr ""
 
 #: actions/showstream.php:542 actions/showstream.php:388
-#: actions/showstream.php:487
+#: actions/showstream.php:487 actions/showstream.php:234
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -6050,6 +5978,9 @@ msgstr ""
 #: actions/apistatusesupdate.php:125 actions/apisubscriptions.php:87
 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#: actions/apiaccountupdateprofileimage.php:91
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apistatusesupdate.php:139
 #, fuzzy
 msgid "No such user!"
 msgstr "Kein solcher Benutzer"
@@ -6112,36 +6043,6 @@ msgid ""
 "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 ""
@@ -6310,6 +6211,7 @@ 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
+#: actions/showstream.php:202
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -6491,7 +6393,8 @@ 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
+#: lib/designsettings.php:461 lib/designsettings.php:434
+#: lib/designsettings.php:464
 #, fuzzy
 msgid "Couldn't update your design."
 msgstr "Konnte Benutzerdaten nicht aktualisieren."
@@ -6587,7 +6490,9 @@ msgid "Message sent"
 msgstr "Nachricht"
 
 #: actions/newnotice.php:93 lib/designsettings.php:281
-#: actions/newnotice.php:94
+#: actions/newnotice.php:94 actions/apiaccountupdateprofileimage.php:97
+#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254
+#: lib/designsettings.php:283
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s bytes) due to its "
@@ -6758,7 +6663,7 @@ msgstr "Du wurdest indentifiziert. Bitte trage unten ein neues Passwort ein."
 msgid "Password recover"
 msgstr "Wiederherstellung des Passworts angefordert"
 
-#: actions/register.php:86
+#: actions/register.php:86 actions/register.php:92
 #, fuzzy
 msgid "Sorry, invalid invitation code."
 msgstr "Fehler beim Bestätigungscode."
@@ -6860,28 +6765,31 @@ msgstr "Admin"
 msgid "Not a local notice"
 msgstr "Kein lokaler Benutzer."
 
-#: actions/showstream.php:72
+#: actions/showstream.php:72 actions/showstream.php:73
 #, fuzzy, php-format
 msgid " tagged %s"
 msgstr "Nachrichten, die mit %s getagt sind"
 
-#: actions/showstream.php:121
+#: actions/showstream.php:121 actions/showstream.php:122
 #, 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
+#: actions/showstream.php:191
 #, 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
+#: actions/showstream.php:196
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
 msgstr ""
 
 #: actions/showstream.php:357 actions/showstream.php:451
+#: actions/showstream.php:198
 #, php-format
 msgid ""
 "You can try to nudge %s or [post something to his or her attention](%%%%"
@@ -6889,6 +6797,7 @@ msgid ""
 msgstr ""
 
 #: actions/showstream.php:393 actions/showstream.php:492
+#: actions/showstream.php:239
 #, fuzzy, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -7041,6 +6950,7 @@ msgid "Problem saving notice. Too long."
 msgstr "Problem bei Speichern der Nachricht."
 
 #: classes/User.php:319 classes/User.php:327 classes/User.php:334
+#: classes/User.php:333
 #, fuzzy, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "Nachricht an %1$s auf %2$s"
@@ -7151,10 +7061,12 @@ msgid "Save design"
 msgstr ""
 
 #: lib/designsettings.php:378 lib/designsettings.php:369
+#: lib/designsettings.php:372
 msgid "Bad default color settings: "
 msgstr ""
 
 #: lib/designsettings.php:474 lib/designsettings.php:465
+#: lib/designsettings.php:468
 msgid "Design defaults restored."
 msgstr ""
 
@@ -7303,7 +7215,7 @@ msgid "Direct messages from %s"
 msgstr "Direkte Nachricht an %s"
 
 #: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
-#, fuzzy, php-format
+#, 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."
@@ -7363,17 +7275,19 @@ msgid "Status deleted."
 msgstr "Avatar aktualisiert."
 
 #: actions/apistatusesupdate.php:132
+#: actions/apiaccountupdateprofileimage.php:99
 msgid "Unable to handle that much POST data!"
 msgstr ""
 
 #: actions/apistatusesupdate.php:145 actions/newnotice.php:155
-#: scripts/maildaemon.php:71
+#: scripts/maildaemon.php:71 actions/apistatusesupdate.php:152
 #, 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
+#: actions/apistatusesupdate.php:216
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
@@ -7394,7 +7308,7 @@ msgid "description is too long (max %d chars)."
 msgstr "Die Beschreibung ist zu lang (max. 140 Zeichen)."
 
 #: actions/favoritesrss.php:115
-#, fuzzy, php-format
+#, php-format
 msgid "Updates favored by %1$s on %2$s!"
 msgstr "Aktualisierungen von %1$s auf %2$s!"
 
@@ -7429,7 +7343,7 @@ msgid "Cannot read file."
 msgstr "Daten verloren."
 
 #: actions/grouprss.php:133
-#, fuzzy, php-format
+#, php-format
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "Aktualisierungen von %1$s auf %2$s!"
 
@@ -7438,7 +7352,7 @@ msgstr "Aktualisierungen von %1$s auf %2$s!"
 msgid "IM is not available."
 msgstr "Diese Seite liegt in nicht verfügbar in einem "
 
-#: actions/login.php:259
+#: actions/login.php:259 actions/login.php:286
 #, fuzzy, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -7454,7 +7368,7 @@ msgid "Updates with \"%s\""
 msgstr "Updates von %1$s auf %2$s!"
 
 #: actions/noticesearchrss.php:91
-#, fuzzy, php-format
+#, php-format
 msgid "Updates matching search term \"%1$s\" on %2$s!"
 msgstr "Alle Aktualisierungen, die den Suchbegriff „%s“ enthalten"
 
@@ -7473,21 +7387,24 @@ msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
 msgstr ""
 
 #: actions/profilesettings.php:122 actions/register.php:454
+#: actions/register.php:460
 #, 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
+#: actions/register.php:463
 #, fuzzy
 msgid "Describe yourself and your interests"
 msgstr "Beschreibe dich selbst und deine "
 
 #: actions/profilesettings.php:221 actions/register.php:217
+#: actions/register.php:223
 #, fuzzy, php-format
 msgid "Bio is too long (max %d chars)."
 msgstr "Die Biografie ist zu lang (max. 140 Zeichen)"
 
-#: actions/register.php:336
+#: actions/register.php:336 actions/register.php:342
 msgid ""
 "With this form you can create  a new account. You can then post notices and "
 "link up to friends and colleagues. "
@@ -7520,7 +7437,7 @@ msgid "Replies feed for %s (RSS 2.0)"
 msgstr "Feed der Nachrichten von %s"
 
 #: actions/replies.php:158
-#, fuzzy, php-format
+#, php-format
 msgid "Replies feed for %s (Atom)"
 msgstr "Feed der Nachrichten von %s"
 
@@ -7530,17 +7447,17 @@ msgid "Replies to %1$s on %2$s!"
 msgstr "Nachricht an %1$s auf %2$s"
 
 #: actions/showfavorites.php:170
-#, fuzzy, php-format
+#, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
 msgstr "Feed der Freunde von %s"
 
 #: actions/showfavorites.php:177
-#, fuzzy, php-format
+#, php-format
 msgid "Feed for favorites of %s (RSS 2.0)"
 msgstr "Feed der Freunde von %s"
 
 #: actions/showfavorites.php:184
-#, fuzzy, php-format
+#, php-format
 msgid "Feed for favorites of %s (Atom)"
 msgstr "Feed der Freunde von %s"
 
@@ -7553,7 +7470,7 @@ msgid ""
 msgstr ""
 
 #: actions/showgroup.php:345
-#, fuzzy, php-format
+#, php-format
 msgid "FOAF for %s group"
 msgstr "Postausgang von %s"
 
@@ -7636,12 +7553,12 @@ msgid "Avatar URL ‘%s’ is not valid."
 msgstr ""
 
 #: actions/userauthorization.php:343
-#, fuzzy, php-format
+#, php-format
 msgid "Can’t read avatar URL ‘%s’."
 msgstr "Konnte Avatar-URL nicht öffnen „%s“"
 
 #: actions/userauthorization.php:348
-#, fuzzy, php-format
+#, php-format
 msgid "Wrong image type for avatar URL ‘%s’."
 msgstr "Falscher Bildtyp für „%s“"
 
@@ -7651,12 +7568,11 @@ 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
+#, php-format
 msgid "Could not find a user with nickname %s"
 msgstr "Die bestätigte E-Mail-Adresse konnte nicht gespeichert werden."
 
@@ -7693,41 +7609,6 @@ msgstr "Auf diese Nachricht antworten"
 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 "No configuration file found. "
@@ -7762,7 +7643,7 @@ msgid "Describe the group or topic in %d characters"
 msgstr "Beschreibe die Gruppe oder das Thema in 140 Zeichen"
 
 #: lib/jabber.php:192
-#, fuzzy, php-format
+#, php-format
 msgid "notice id: %s"
 msgstr "Neue Nachricht"
 
@@ -7822,7 +7703,6 @@ 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."
 
@@ -7830,3 +7710,59 @@ msgstr "Konnte öffentlichen Stream nicht abrufen."
 #, fuzzy
 msgid "Duplicate notice"
 msgstr "Notiz löschen"
+
+#: actions/login.php:110 actions/login.php:120
+#, fuzzy
+msgid "Invalid or expired token."
+msgstr "Ungültiger Nachrichteninhalt"
+
+#: lib/command.php:597
+#, fuzzy, php-format
+msgid "Could not create login token for %s"
+msgstr "Konnte OpenID-Formular nicht erstellen: %s"
+
+#: lib/command.php:602
+#, php-format
+msgid "This link is useable only once, and is good for only 2 minutes: %s"
+msgstr ""
+
+#: lib/imagefile.php:75
+#, fuzzy, php-format
+msgid "That file is too big. The maximum file size is %s."
+msgstr "Du kannst ein Logo für Deine Gruppe hochladen."
+
+#: lib/command.php:613
+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"
+"login - Get a link to login to the web interface\n"
+"drop <group> - leave group\n"
+"stats - get your stats\n"
+"stop - same as 'off'\n"
+"quit - same as 'off'\n"
+"sub <nickname> - same as 'follow'\n"
+"unsub <nickname> - same as 'leave'\n"
+"last <nickname> - same as 'get'\n"
+"on <nickname> - not yet implemented.\n"
+"off <nickname> - not yet implemented.\n"
+"nudge <nickname> - remind a user to update.\n"
+"invite <phone number> - not yet implemented.\n"
+"track <word> - not yet implemented.\n"
+"untrack <word> - not yet implemented.\n"
+"track off - not yet implemented.\n"
+"untrack all - not yet implemented.\n"
+"tracks - not yet implemented.\n"
+"tracking - not yet implemented.\n"
+msgstr ""
diff --git a/locale/el/LC_MESSAGES/statusnet.mo b/locale/el/LC_MESSAGES/statusnet.mo
index cd2deb789..f69914abe 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 0cd27cf8d..a521aaa62 100644
--- a/locale/el/LC_MESSAGES/statusnet.po
+++ b/locale/el/LC_MESSAGES/statusnet.po
@@ -5,12 +5,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-06 13:16+0000\n"
-"PO-Revision-Date: 2009-11-06 15:43:14+0000\n"
+"POT-Creation-Date: 2009-11-08 11:53+0000\n"
+"PO-Revision-Date: 2009-11-08 11:56:16+0000\n"
 "Language-Team: Greek\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r58648); Translate extension (2009-08-03)\n"
+"X-Generator: MediaWiki 1.16alpha(r58760); 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"
@@ -169,7 +169,7 @@ msgid "%s updates from everyone!"
 msgstr ""
 
 #: ../actions/register.php:213 actions/register.php:497
-#: actions/register.php:545 actions/register.php:555
+#: actions/register.php:545 actions/register.php:555 actions/register.php:561
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -208,6 +208,7 @@ msgstr "1-64 μικρά γράμματα ή αριθμοί, χωρίς σημε�
 
 #: ../actions/register.php:152 actions/register.php:166
 #: actions/register.php:368 actions/register.php:414 actions/register.php:418
+#: actions/register.php:424
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr "1-64 μικρά γράμματα ή αριθμοί, χωρίς σημεία στίξης ή κενά. Απαραίτητο."
 
@@ -224,6 +225,7 @@ msgstr "6 ή περισσότεροι χαρακτήρες και μην το ξ
 
 #: ../actions/register.php:154 actions/register.php:168
 #: actions/register.php:373 actions/register.php:419 actions/register.php:423
+#: actions/register.php:429
 msgid "6 or more characters. Required."
 msgstr "6 ή περισσότεροι χαρακτήρες. Απαραίτητο."
 
@@ -404,7 +406,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
+#: actions/login.php:79 actions/register.php:137
 msgid "Already logged in."
 msgstr "Ήδη συνδεδεμένος."
 
@@ -427,7 +429,7 @@ 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/login.php:226
-#: actions/register.php:473
+#: actions/register.php:473 actions/login.php:253 actions/register.php:479
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Αυτόματη σύνδεση στο μέλλον. ΟΧΙ για κοινόχρηστους υπολογιστές!"
 
@@ -452,6 +454,7 @@ msgstr ""
 
 #: ../actions/avatar.php:113 actions/profilesettings.php:350
 #: actions/avatarsettings.php:395 actions/avatarsettings.php:346
+#: actions/avatarsettings.php:360
 msgid "Avatar updated."
 msgstr ""
 
@@ -490,7 +493,7 @@ msgstr "Προηγούμενο »"
 #: 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
+#: actions/register.php:459 actions/register.php:465
 msgid "Bio"
 msgstr "Βιογραφικό"
 
@@ -520,6 +523,7 @@ msgstr ""
 #: actions/passwordsettings.php:169 actions/recoverpassword.php:347
 #: actions/passwordsettings.php:174 actions/recoverpassword.php:365
 #: actions/passwordsettings.php:180 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:185
 msgid "Can't save new password."
 msgstr "Αδύνατη η αποθήκευση του νέου κωδικού"
 
@@ -582,6 +586,7 @@ msgstr "Αλλάξτε τις ρυθμίσεις του προφίλ σας"
 #: actions/recoverpassword.php:236 actions/register.php:422
 #: actions/passwordsettings.php:111 actions/recoverpassword.php:239
 #: actions/register.php:426 actions/smssettings.php:134
+#: actions/register.php:432
 msgid "Confirm"
 msgstr "Επιβεβαίωση"
 
@@ -611,7 +616,7 @@ msgid "Confirmation code not found."
 msgstr "Ο κωδικός επιβεβαίωσης δεν βρέθηκε."
 
 #: ../actions/register.php:202 actions/register.php:473
-#: actions/register.php:521 actions/register.php:531
+#: actions/register.php:521 actions/register.php:531 actions/register.php:537
 #, fuzzy, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -852,6 +857,7 @@ 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
+#: classes/Notice.php:1120
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Σφάλμα βάσης δεδομένων κατά την εισαγωγή απάντησης: %s"
@@ -874,7 +880,8 @@ msgstr "Περιέγραψε τον εαυτό σου και τα ενδιαφέ
 #: 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
+#: lib/accountsettingsaction.php:117 actions/register.php:437
+#: actions/register.php:441
 msgid "Email"
 msgstr "Email"
 
@@ -889,7 +896,7 @@ 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
+#: actions/register.php:200 actions/register.php:206 actions/register.php:212
 msgid "Email address already exists."
 msgstr "Η διεύθυνση email υπάρχει ήδη."
 
@@ -975,7 +982,7 @@ msgstr ""
 
 #: ../actions/password.php:80 actions/profilesettings.php:399
 #: actions/passwordsettings.php:164 actions/passwordsettings.php:169
-#: actions/passwordsettings.php:175
+#: actions/passwordsettings.php:175 actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr ""
 
@@ -987,6 +994,7 @@ msgstr ""
 #: actions/login.php:120 actions/recoverpassword.php:372
 #: actions/register.php:235 actions/login.php:122
 #: actions/recoverpassword.php:375 actions/register.php:242
+#: actions/login.php:149 actions/register.php:248
 msgid "Error setting user."
 msgstr ""
 
@@ -1018,6 +1026,7 @@ msgstr "Συχνές ερωτήσεις"
 
 #: ../actions/avatar.php:115 actions/profilesettings.php:352
 #: actions/avatarsettings.php:397 actions/avatarsettings.php:349
+#: actions/avatarsettings.php:363
 msgid "Failed updating avatar."
 msgstr ""
 
@@ -1052,6 +1061,7 @@ msgid "Find people on this site"
 msgstr ""
 
 #: ../actions/login.php:122 actions/login.php:247 actions/login.php:255
+#: actions/login.php:282
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -1069,6 +1079,7 @@ msgstr ""
 #: actions/showstream.php:220 lib/groupeditform.php:157
 #: actions/profilesettings.php:111 actions/register.php:441
 #: actions/showgroup.php:247 actions/showstream.php:267
+#: actions/register.php:447 lib/userprofile.php:149
 msgid "Full name"
 msgstr "Ονοματεπώνυμο"
 
@@ -1082,7 +1093,7 @@ msgstr "Ονοματεπώνυμο"
 #: 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
+#: actions/register.php:214 actions/register.php:220
 msgid "Full name is too long (max 255 chars)."
 msgstr "Το ονοματεπώνυμο είναι πολύ μεγάλο (μέγιστο 255 χαρακτ.)."
 
@@ -1103,7 +1114,7 @@ msgstr "Αρχή"
 #: 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
+#: actions/register.php:446 actions/register.php:452
 msgid "Homepage"
 msgstr "Αρχική σελίδα"
 
@@ -1115,7 +1126,7 @@ msgstr "Αρχική σελίδα"
 #: 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
+#: actions/register.php:211 actions/register.php:217
 msgid "Homepage is not a valid URL."
 msgstr "Η αρχική σελίδα δεν είναι έγκυρο URL."
 
@@ -1187,7 +1198,7 @@ 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/login.php:116
+#: actions/facebookhome.php:129 actions/login.php:116 actions/login.php:143
 msgid "Incorrect username or password."
 msgstr "Λάθος όνομα χρήστη ή κωδικός"
 
@@ -1267,6 +1278,7 @@ msgstr ""
 #: 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
+#: actions/register.php:243 actions/register.php:264
 msgid "Invalid username or password."
 msgstr ""
 
@@ -1338,7 +1350,7 @@ msgstr ""
 #: 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
+#: lib/profilelist.php:218 actions/register.php:470 lib/userprofile.php:164
 msgid "Location"
 msgstr "Τοποθεσία"
 
@@ -1352,7 +1364,7 @@ msgstr "Τοποθεσία"
 #: 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
+#: actions/register.php:221 actions/register.php:227
 msgid "Location is too long (max 255 chars)."
 msgstr "Η τοποθεσία είναι πολύ μεγάλη (μέγιστο 255 χαρακτ.)."
 
@@ -1366,6 +1378,7 @@ msgstr "Η τοποθεσία είναι πολύ μεγάλη (μέγιστο 2
 #: 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
+#: actions/login.php:204 actions/login.php:257
 #, php-format
 msgid "Login"
 msgstr "Σύνδεση"
@@ -1394,12 +1407,13 @@ msgstr "Αποσύνδεση"
 
 #: ../actions/register.php:166 actions/register.php:180
 #: actions/register.php:393 actions/register.php:439 actions/register.php:443
+#: actions/register.php:449
 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 actions/login.php:236
+#: lib/facebookaction.php:327 actions/login.php:236 actions/login.php:263
 msgid "Lost or forgotten password?"
 msgstr "Χάσατε ή ξεχάσατε τον κωδικό σας;"
 
@@ -1439,7 +1453,7 @@ 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:487
+#: actions/register.php:477 actions/register.php:487 actions/register.php:493
 msgid "My text and files are available under "
 msgstr ""
 
@@ -1497,7 +1511,8 @@ msgstr ""
 #: 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
+#: actions/showgroup.php:236 actions/showstream.php:249 actions/login.php:246
+#: actions/register.php:423 lib/userprofile.php:131
 msgid "Nickname"
 msgstr "Ψευδώνυμο"
 
@@ -1511,7 +1526,7 @@ msgstr "Ψευδώνυμο"
 #: 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
+#: actions/register.php:202 actions/register.php:208
 msgid "Nickname already in use. Try another one."
 msgstr "Το ψευδώνυμο είναι ήδη σε χρήση. Δοκιμάστε κάποιο άλλο."
 
@@ -1527,7 +1542,7 @@ msgstr "Το ψευδώνυμο είναι ήδη σε χρήση. Δοκιμά�
 #: 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
+#: actions/register.php:199 actions/register.php:205
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr "Το ψευδώνυμο πρέπει να έχει μόνο πεζούς χαρακτήρες και χωρίς κενά."
 
@@ -1766,7 +1781,8 @@ msgstr ""
 #: 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
+#: lib/api.php:954 lib/api.php:982 lib/api.php:1092 lib/api.php:963
+#: lib/api.php:991 lib/api.php:1101
 msgid "Not a supported data format."
 msgstr ""
 
@@ -1787,7 +1803,7 @@ 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
+#: actions/register.php:189 actions/register.php:195 actions/register.php:201
 msgid "Not a valid email address."
 msgstr ""
 
@@ -1799,7 +1815,7 @@ msgstr ""
 #: 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
+#: actions/register.php:204 actions/register.php:210
 msgid "Not a valid nickname."
 msgstr ""
 
@@ -1838,6 +1854,7 @@ msgstr ""
 #: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
 #: actions/twitapistatuses.php:309 actions/twitapistatuses.php:327
 #: actions/twitapistatuses.php:284 actions/apistatusesupdate.php:186
+#: actions/apistatusesupdate.php:193
 msgid "Not found"
 msgstr ""
 
@@ -1984,7 +2001,8 @@ msgstr ""
 #: 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
+#: lib/accountsettingsaction.php:114 actions/login.php:249
+#: actions/register.php:428
 msgid "Password"
 msgstr "Κωδικός"
 
@@ -2013,6 +2031,7 @@ msgstr ""
 #: actions/passwordsettings.php:173 actions/recoverpassword.php:200
 #: actions/passwordsettings.php:178 actions/recoverpassword.php:208
 #: actions/passwordsettings.php:184 actions/recoverpassword.php:211
+#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "Ο κωδικός αποθηκεύτηκε."
 
@@ -2021,6 +2040,7 @@ msgstr "Ο κωδικός αποθηκεύτηκε."
 #: actions/passwordsettings.php:145 actions/register.php:183
 #: actions/passwordsettings.php:150 actions/register.php:220
 #: actions/passwordsettings.php:156 actions/register.php:227
+#: actions/register.php:233
 msgid "Passwords don't match."
 msgstr "Οι κωδικοί δεν ταυτίζονται."
 
@@ -2181,19 +2201,19 @@ msgstr ""
 #: 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
+#: lib/logingroupnav.php:85 actions/register.php:114 actions/register.php:502
 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
+#: actions/register.php:129 actions/register.php:135
 msgid "Registration not allowed."
 msgstr ""
 
 #: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67 actions/register.php:106
+#: actions/register.php:67 actions/register.php:106 actions/register.php:112
 msgid "Registration successful"
 msgstr ""
 
@@ -2207,6 +2227,7 @@ msgstr ""
 #: 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
+#: actions/login.php:252 actions/register.php:477
 msgid "Remember me"
 msgstr ""
 
@@ -2303,6 +2324,7 @@ msgstr ""
 
 #: ../actions/register.php:156 actions/register.php:170
 #: actions/register.php:377 actions/register.php:423 actions/register.php:427
+#: actions/register.php:433
 msgid "Same as password above. Required."
 msgstr ""
 
@@ -2458,6 +2480,7 @@ msgstr ""
 #: actions/remotesubscribe.php:113 actions/showstream.php:376
 #: lib/subscribeform.php:139 actions/showstream.php:345
 #: actions/remotesubscribe.php:137 actions/showstream.php:439
+#: lib/userprofile.php:321
 msgid "Subscribe"
 msgstr ""
 
@@ -2504,6 +2527,7 @@ msgstr ""
 #: actions/profilesettings.php:123 actions/showstream.php:255
 #: lib/subscriptionlist.php:106 lib/subscriptionlist.php:108
 #: actions/profilesettings.php:138 actions/showstream.php:327
+#: lib/userprofile.php:209
 msgid "Tags"
 msgstr ""
 
@@ -2712,6 +2736,7 @@ msgstr ""
 #: actions/apifriendshipsdestroy.php:91 actions/apigroupcreate.php:104
 #: actions/apigroupjoin.php:91 actions/apigroupleave.php:91
 #: actions/apistatusesupdate.php:109
+#: actions/apiaccountupdateprofileimage.php:84
 msgid "This method requires a POST."
 msgstr ""
 
@@ -2742,7 +2767,7 @@ msgstr ""
 
 #: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
 #: actions/twitapifriendships.php:132 actions/twitapifriendships.php:139
-#: actions/apifriendshipsexists.php:103
+#: actions/apifriendshipsexists.php:103 actions/apifriendshipsexists.php:94
 msgid "Two user ids or screen_names must be supplied."
 msgstr ""
 
@@ -2750,7 +2775,7 @@ msgstr ""
 #: 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
+#: actions/register.php:448 actions/register.php:454
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr ""
 
@@ -2772,6 +2797,7 @@ msgstr ""
 #: actions/twittersettings.php:322 lib/designsettings.php:301
 #: actions/emailsettings.php:255 actions/grouplogo.php:319
 #: actions/imsettings.php:220 actions/smssettings.php:248
+#: actions/avatarsettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr ""
 
@@ -2876,7 +2902,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
+#: actions/register.php:436 actions/register.php:438 actions/register.php:442
 msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
 
@@ -2904,7 +2930,8 @@ 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
+#: actions/apiusershow.php:108 actions/apiaccountupdateprofileimage.php:124
+#: actions/apiaccountupdateprofileimage.php:130
 msgid "User has no profile."
 msgstr ""
 
@@ -2933,7 +2960,7 @@ msgstr ""
 #: 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
+#: actions/register.php:466 actions/register.php:472
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr ""
 
@@ -3029,7 +3056,7 @@ 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:192
+#: actions/register.php:186 actions/register.php:192 actions/register.php:198
 msgid "You can't register if you don't agree to the license."
 msgstr ""
 
@@ -3092,56 +3119,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:816
+#: lib/util.php:770 lib/util.php:816 lib/util.php:844
 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:828
+#: lib/util.php:782 lib/util.php:828 lib/util.php:856
 #, 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:824
+#: lib/util.php:778 lib/util.php:824 lib/util.php:852
 #, 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:820
+#: lib/util.php:774 lib/util.php:820 lib/util.php:848
 #, 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:832
+#: lib/util.php:786 lib/util.php:832 lib/util.php:860
 #, 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:826
+#: lib/util.php:780 lib/util.php:826 lib/util.php:854
 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:818
+#: lib/util.php:772 lib/util.php:818 lib/util.php:846
 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:830
+#: lib/util.php:784 lib/util.php:830 lib/util.php:858
 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:834
+#: lib/util.php:788 lib/util.php:834 lib/util.php:862
 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:822
+#: lib/util.php:776 lib/util.php:822 lib/util.php:850
 msgid "about an hour ago"
 msgstr ""
 
@@ -3210,7 +3237,9 @@ msgstr ""
 #: 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
+#: actions/userauthorization.php:52 actions/login.php:131
+#: actions/register.php:165 actions/avatarsettings.php:265
+#: lib/designsettings.php:294
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
@@ -3430,6 +3459,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
+#: actions/register.php:230
 msgid "Password must be 6 or more characters."
 msgstr ""
 
@@ -3969,13 +3999,13 @@ msgid "There was a problem with your session token. "
 msgstr ""
 
 #: actions/avatarsettings.php:303 actions/grouplogo.php:360
-#: actions/avatarsettings.php:308
+#: actions/avatarsettings.php:308 actions/avatarsettings.php:322
 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
+#: actions/grouplogo.php:377 actions/avatarsettings.php:337
 msgid "Lost our file data."
 msgstr ""
 
@@ -4443,7 +4473,7 @@ msgid "%s left group %s"
 msgstr ""
 
 #: actions/login.php:225 lib/facebookaction.php:304 actions/login.php:208
-#: actions/login.php:216
+#: actions/login.php:216 actions/login.php:243
 msgid "Login to site"
 msgstr ""
 
@@ -4626,7 +4656,8 @@ 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
+#: actions/register.php:398 actions/register.php:85 actions/register.php:189
+#: actions/register.php:404
 msgid "Sorry, only invited people can register."
 msgstr ""
 
@@ -4709,7 +4740,7 @@ msgstr "Αδύνατη η αποθήκευση του προφίλ."
 #: 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
+#: lib/profilelist.php:230 lib/userprofile.php:177
 msgid "URL"
 msgstr ""
 
@@ -4720,7 +4751,7 @@ msgstr ""
 #: 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
+#: lib/profilelist.php:245 lib/userprofile.php:194
 msgid "Note"
 msgstr ""
 
@@ -4768,6 +4799,7 @@ msgid "Only the sender and recipient "
 msgstr ""
 
 #: actions/showstream.php:73 actions/showstream.php:78
+#: actions/showstream.php:79
 #, php-format
 msgid "%s, page %d"
 msgstr ""
@@ -4779,29 +4811,30 @@ msgstr "Αδύνατη η αποθήκευση του προφίλ."
 
 #: actions/showstream.php:236 actions/tagother.php:77
 #: actions/showstream.php:220 actions/showstream.php:185
-#: actions/showstream.php:193
+#: actions/showstream.php:193 lib/userprofile.php:75
 #, 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
+#: actions/showstream.php:220 lib/userprofile.php:102
 msgid "Photo"
 msgstr ""
 
 #: actions/showstream.php:317 actions/showstream.php:309
 #: actions/showstream.php:274 actions/showstream.php:354
+#: lib/userprofile.php:236
 msgid "User actions"
 msgstr ""
 
 #: actions/showstream.php:342 actions/showstream.php:307
-#: actions/showstream.php:390
+#: actions/showstream.php:390 lib/userprofile.php:272
 msgid "Send a direct message to this user"
 msgstr ""
 
 #: actions/showstream.php:343 actions/showstream.php:308
-#: actions/showstream.php:391
+#: actions/showstream.php:391 lib/userprofile.php:273
 msgid "Message"
 msgstr ""
 
@@ -5507,7 +5540,7 @@ msgstr "%s και οι φίλοι του/της"
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr ""
 
-#: actions/avatarsettings.php:373
+#: actions/avatarsettings.php:373 actions/avatarsettings.php:387
 #, fuzzy
 msgid "Avatar deleted."
 msgstr "Ρυθμίσεις OpenID"
@@ -5633,10 +5666,12 @@ msgid ""
 msgstr ""
 
 #: actions/register.php:432 actions/register.php:479 actions/register.php:489
+#: actions/register.php:495
 msgid "Creative Commons Attribution 3.0"
 msgstr ""
 
 #: actions/register.php:433 actions/register.php:480 actions/register.php:490
+#: actions/register.php:496
 #, fuzzy
 msgid ""
 " except this private data: password, email address, IM address, and phone "
@@ -5673,43 +5708,47 @@ msgid "%s's profile"
 msgstr "Αδύνατη η αποθήκευση του προφίλ."
 
 #: actions/showstream.php:163 actions/showstream.php:128
+#: actions/showstream.php:129
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr ""
 
 #: actions/showstream.php:170 actions/showstream.php:135
+#: actions/showstream.php:136
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr ""
 
 #: actions/showstream.php:177 actions/showstream.php:142
+#: actions/showstream.php:143
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr ""
 
 #: actions/showstream.php:182 actions/showstream.php:147
+#: actions/showstream.php:148
 #, php-format
 msgid "FOAF for %s"
 msgstr ""
 
 #: actions/showstream.php:237 actions/showstream.php:202
-#: actions/showstream.php:234
+#: actions/showstream.php:234 lib/userprofile.php:116
 msgid "Edit Avatar"
 msgstr ""
 
 #: actions/showstream.php:316 actions/showstream.php:281
-#: actions/showstream.php:366
+#: actions/showstream.php:366 lib/userprofile.php:248
 #, fuzzy
 msgid "Edit profile settings"
 msgstr "Αλλάξτε τις ρυθμίσεις του προφίλ σας"
 
 #: actions/showstream.php:317 actions/showstream.php:282
-#: actions/showstream.php:367
+#: actions/showstream.php:367 lib/userprofile.php:249
 msgid "Edit"
 msgstr ""
 
 #: actions/showstream.php:542 actions/showstream.php:388
-#: actions/showstream.php:487
+#: actions/showstream.php:487 actions/showstream.php:234
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5755,6 +5794,9 @@ msgstr ""
 #: actions/apistatusesupdate.php:125 actions/apisubscriptions.php:87
 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#: actions/apiaccountupdateprofileimage.php:91
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apistatusesupdate.php:139
 #, fuzzy
 msgid "No such user!"
 msgstr "Αδύνατη η αποθήκευση του προφίλ."
@@ -5803,36 +5845,6 @@ msgid ""
 "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 ""
@@ -5996,6 +6008,7 @@ 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
+#: actions/showstream.php:202
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -6165,7 +6178,8 @@ 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
+#: lib/designsettings.php:461 lib/designsettings.php:434
+#: lib/designsettings.php:464
 #, fuzzy
 msgid "Couldn't update your design."
 msgstr "Απέτυχε η ενημέρωση του χρήστη."
@@ -6256,7 +6270,9 @@ msgid "Message sent"
 msgstr ""
 
 #: actions/newnotice.php:93 lib/designsettings.php:281
-#: actions/newnotice.php:94
+#: actions/newnotice.php:94 actions/apiaccountupdateprofileimage.php:97
+#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254
+#: lib/designsettings.php:283
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s bytes) due to its "
@@ -6420,7 +6436,7 @@ msgstr ""
 msgid "Password recover"
 msgstr "Ο κωδικός αποθηκεύτηκε."
 
-#: actions/register.php:86
+#: actions/register.php:86 actions/register.php:92
 msgid "Sorry, invalid invitation code."
 msgstr ""
 
@@ -6518,28 +6534,31 @@ msgstr "Διαχειριστής"
 msgid "Not a local notice"
 msgstr ""
 
-#: actions/showstream.php:72
+#: actions/showstream.php:72 actions/showstream.php:73
 #, php-format
 msgid " tagged %s"
 msgstr ""
 
-#: actions/showstream.php:121
+#: actions/showstream.php:121 actions/showstream.php:122
 #, php-format
 msgid "Notice feed for %s tagged %s (RSS 1.0)"
 msgstr ""
 
 #: actions/showstream.php:350 actions/showstream.php:444
+#: actions/showstream.php:191
 #, 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
+#: actions/showstream.php:196
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
 msgstr ""
 
 #: actions/showstream.php:357 actions/showstream.php:451
+#: actions/showstream.php:198
 #, php-format
 msgid ""
 "You can try to nudge %s or [post something to his or her attention](%%%%"
@@ -6547,6 +6566,7 @@ msgid ""
 msgstr ""
 
 #: actions/showstream.php:393 actions/showstream.php:492
+#: actions/showstream.php:239
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -6691,6 +6711,7 @@ msgid "Problem saving notice. Too long."
 msgstr ""
 
 #: classes/User.php:319 classes/User.php:327 classes/User.php:334
+#: classes/User.php:333
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr ""
@@ -6799,10 +6820,12 @@ msgid "Save design"
 msgstr ""
 
 #: lib/designsettings.php:378 lib/designsettings.php:369
+#: lib/designsettings.php:372
 msgid "Bad default color settings: "
 msgstr ""
 
 #: lib/designsettings.php:474 lib/designsettings.php:465
+#: lib/designsettings.php:468
 msgid "Design defaults restored."
 msgstr ""
 
@@ -7003,16 +7026,18 @@ msgid "Status deleted."
 msgstr "Ρυθμίσεις OpenID"
 
 #: actions/apistatusesupdate.php:132
+#: actions/apiaccountupdateprofileimage.php:99
 msgid "Unable to handle that much POST data!"
 msgstr ""
 
 #: actions/apistatusesupdate.php:145 actions/newnotice.php:155
-#: scripts/maildaemon.php:71
+#: scripts/maildaemon.php:71 actions/apistatusesupdate.php:152
 #, php-format
 msgid "That's too long. Max notice size is %d chars."
 msgstr ""
 
 #: actions/apistatusesupdate.php:209 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:216
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
@@ -7072,7 +7097,7 @@ msgstr ""
 msgid "IM is not available."
 msgstr "Η αρχική σελίδα δεν είναι έγκυρο URL."
 
-#: actions/login.php:259
+#: actions/login.php:259 actions/login.php:286
 #, fuzzy, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -7107,21 +7132,24 @@ msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
 msgstr ""
 
 #: actions/profilesettings.php:122 actions/register.php:454
+#: actions/register.php:460
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d chars"
 msgstr "Περιέγραψε τον εαυτό σου και τα ενδιαφέροντά σου σε 140 χαρακτήρες"
 
 #: actions/profilesettings.php:125 actions/register.php:457
+#: actions/register.php:463
 #, fuzzy
 msgid "Describe yourself and your interests"
 msgstr "Περιέγραψε τον εαυτό σου και τα ενδιαφέροντά σου σε 140 χαρακτήρες"
 
 #: actions/profilesettings.php:221 actions/register.php:217
+#: actions/register.php:223
 #, fuzzy, php-format
 msgid "Bio is too long (max %d chars)."
 msgstr "Το βιογραφικό είναι πολύ μεγάλο (μέγιστο 140 χαρακτ.)."
 
-#: actions/register.php:336
+#: actions/register.php:336 actions/register.php:342
 msgid ""
 "With this form you can create  a new account. You can then post notices and "
 "link up to friends and colleagues. "
@@ -7311,41 +7339,6 @@ 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 "No configuration file found. "
@@ -7446,3 +7439,58 @@ msgstr "Απέτυχε η ενημέρωση του χρήστη."
 #, fuzzy
 msgid "Duplicate notice"
 msgstr "Διαγραφή μηνύματος"
+
+#: actions/login.php:110 actions/login.php:120
+msgid "Invalid or expired token."
+msgstr ""
+
+#: lib/command.php:597
+#, fuzzy, php-format
+msgid "Could not create login token for %s"
+msgstr "Αδυναμία δημιουργίας φόρμας OpenID: %s "
+
+#: lib/command.php:602
+#, php-format
+msgid "This link is useable only once, and is good for only 2 minutes: %s"
+msgstr ""
+
+#: lib/imagefile.php:75
+#, php-format
+msgid "That file is too big. The maximum file size is %s."
+msgstr ""
+
+#: lib/command.php:613
+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"
+"login - Get a link to login to the web interface\n"
+"drop <group> - leave group\n"
+"stats - get your stats\n"
+"stop - same as 'off'\n"
+"quit - same as 'off'\n"
+"sub <nickname> - same as 'follow'\n"
+"unsub <nickname> - same as 'leave'\n"
+"last <nickname> - same as 'get'\n"
+"on <nickname> - not yet implemented.\n"
+"off <nickname> - not yet implemented.\n"
+"nudge <nickname> - remind a user to update.\n"
+"invite <phone number> - not yet implemented.\n"
+"track <word> - not yet implemented.\n"
+"untrack <word> - not yet implemented.\n"
+"track off - not yet implemented.\n"
+"untrack all - not yet implemented.\n"
+"tracks - not yet implemented.\n"
+"tracking - not yet implemented.\n"
+msgstr ""
diff --git a/locale/en_GB/LC_MESSAGES/statusnet.mo b/locale/en_GB/LC_MESSAGES/statusnet.mo
index 4a42208bd..ff0e83d81 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 8e36a3966..b8e8c5680 100644
--- a/locale/en_GB/LC_MESSAGES/statusnet.po
+++ b/locale/en_GB/LC_MESSAGES/statusnet.po
@@ -11,12 +11,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-06 13:16+0000\n"
-"PO-Revision-Date: 2009-11-06 15:43:22+0000\n"
+"POT-Creation-Date: 2009-11-08 11:53+0000\n"
+"PO-Revision-Date: 2009-11-08 11:56:19+0000\n"
 "Language-Team: British English\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r58648); Translate extension (2009-08-03)\n"
+"X-Generator: MediaWiki 1.16alpha(r58760); 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"
@@ -207,7 +207,7 @@ msgid "%s updates from everyone!"
 msgstr "%s updates from everyone!"
 
 #: ../actions/register.php:213 actions/register.php:497
-#: actions/register.php:545 actions/register.php:555
+#: actions/register.php:545 actions/register.php:555 actions/register.php:561
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -245,6 +245,7 @@ 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
+#: actions/register.php:424
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 
@@ -261,6 +262,7 @@ 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:419 actions/register.php:423
+#: actions/register.php:429
 msgid "6 or more characters. Required."
 msgstr "6 or more characters. Required."
 
@@ -439,7 +441,7 @@ msgstr "All updates matching search term \"%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
+#: actions/login.php:79 actions/register.php:137
 msgid "Already logged in."
 msgstr "Already logged in."
 
@@ -462,7 +464,7 @@ msgstr "Authorise subscription"
 #: ../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
+#: actions/register.php:473 actions/login.php:253 actions/register.php:479
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Automatically login in the future; not for shared computers!"
 
@@ -485,6 +487,7 @@ msgstr "Avatar"
 
 #: ../actions/avatar.php:113 actions/profilesettings.php:350
 #: actions/avatarsettings.php:395 actions/avatarsettings.php:346
+#: actions/avatarsettings.php:360
 msgid "Avatar updated."
 msgstr "Avatar updated."
 
@@ -520,7 +523,7 @@ msgstr "Before »"
 #: 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
+#: actions/register.php:459 actions/register.php:465
 msgid "Bio"
 msgstr "Bio"
 
@@ -549,6 +552,7 @@ msgstr "Can't read avatar URL '%s'"
 #: actions/passwordsettings.php:169 actions/recoverpassword.php:347
 #: actions/passwordsettings.php:174 actions/recoverpassword.php:365
 #: actions/passwordsettings.php:180 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:185
 msgid "Can't save new password."
 msgstr "Can't save new password."
 
@@ -611,6 +615,7 @@ msgstr "Change your profile settings"
 #: actions/recoverpassword.php:236 actions/register.php:422
 #: actions/passwordsettings.php:111 actions/recoverpassword.php:239
 #: actions/register.php:426 actions/smssettings.php:134
+#: actions/register.php:432
 msgid "Confirm"
 msgstr "Confirm"
 
@@ -640,7 +645,7 @@ msgid "Confirmation code not found."
 msgstr "Confirmation code not found."
 
 #: ../actions/register.php:202 actions/register.php:473
-#: actions/register.php:521 actions/register.php:531
+#: actions/register.php:521 actions/register.php:531 actions/register.php:537
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -878,6 +883,7 @@ 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
+#: classes/Notice.php:1120
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "DB error inserting reply: %s"
@@ -900,7 +906,8 @@ msgstr "Describe yourself and your interests in 140 chars"
 #: 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
+#: lib/accountsettingsaction.php:117 actions/register.php:437
+#: actions/register.php:441
 msgid "Email"
 msgstr "E-mail"
 
@@ -915,7 +922,7 @@ 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
+#: actions/register.php:200 actions/register.php:206 actions/register.php:212
 msgid "Email address already exists."
 msgstr "E-mail address already exists."
 
@@ -1001,7 +1008,7 @@ msgstr "Error saving the user."
 
 #: ../actions/password.php:80 actions/profilesettings.php:399
 #: actions/passwordsettings.php:164 actions/passwordsettings.php:169
-#: actions/passwordsettings.php:175
+#: actions/passwordsettings.php:175 actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "Error saving user; invalid."
 
@@ -1013,6 +1020,7 @@ msgstr "Error saving user; invalid."
 #: actions/login.php:120 actions/recoverpassword.php:372
 #: actions/register.php:235 actions/login.php:122
 #: actions/recoverpassword.php:375 actions/register.php:242
+#: actions/login.php:149 actions/register.php:248
 msgid "Error setting user."
 msgstr "Error setting user."
 
@@ -1044,6 +1052,7 @@ msgstr "F.A.Q."
 
 #: ../actions/avatar.php:115 actions/profilesettings.php:352
 #: actions/avatarsettings.php:397 actions/avatarsettings.php:349
+#: actions/avatarsettings.php:363
 msgid "Failed updating avatar."
 msgstr "Failed updating avatar."
 
@@ -1078,6 +1087,7 @@ msgid "Find people on this site"
 msgstr "Find people on this site"
 
 #: ../actions/login.php:122 actions/login.php:247 actions/login.php:255
+#: actions/login.php:282
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -1095,6 +1105,7 @@ msgstr ""
 #: actions/showstream.php:220 lib/groupeditform.php:157
 #: actions/profilesettings.php:111 actions/register.php:441
 #: actions/showgroup.php:247 actions/showstream.php:267
+#: actions/register.php:447 lib/userprofile.php:149
 msgid "Full name"
 msgstr "Full name"
 
@@ -1108,7 +1119,7 @@ msgstr "Full name"
 #: 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
+#: actions/register.php:214 actions/register.php:220
 msgid "Full name is too long (max 255 chars)."
 msgstr "Full name is too long (max 255 chars)."
 
@@ -1129,7 +1140,7 @@ msgstr "Home"
 #: 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
+#: actions/register.php:446 actions/register.php:452
 msgid "Homepage"
 msgstr "Homepage"
 
@@ -1141,7 +1152,7 @@ msgstr "Homepage"
 #: 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
+#: actions/register.php:211 actions/register.php:217
 msgid "Homepage is not a valid URL."
 msgstr "Homepage is not a valid URL."
 
@@ -1213,7 +1224,7 @@ msgstr "Incorrect old password"
 
 #: ../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
+#: actions/facebookhome.php:129 actions/login.php:116 actions/login.php:143
 msgid "Incorrect username or password."
 msgstr "Incorrect username or password."
 
@@ -1293,6 +1304,7 @@ msgstr "Invalid size."
 #: 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
+#: actions/register.php:243 actions/register.php:264
 msgid "Invalid username or password."
 msgstr "Invalid username or password."
 
@@ -1369,7 +1381,7 @@ msgstr "Language is too long (max 50 chars)."
 #: 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
+#: lib/profilelist.php:218 actions/register.php:470 lib/userprofile.php:164
 msgid "Location"
 msgstr "Location"
 
@@ -1383,7 +1395,7 @@ msgstr "Location"
 #: 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
+#: actions/register.php:221 actions/register.php:227
 msgid "Location is too long (max 255 chars)."
 msgstr "Location is too long (max 255 chars)."
 
@@ -1397,6 +1409,7 @@ msgstr "Location is too long (max 255 chars)."
 #: 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
+#: actions/login.php:204 actions/login.php:257
 #, php-format
 msgid "Login"
 msgstr "Login"
@@ -1425,12 +1438,13 @@ msgstr "Logout"
 
 #: ../actions/register.php:166 actions/register.php:180
 #: actions/register.php:393 actions/register.php:439 actions/register.php:443
+#: actions/register.php:449
 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 actions/login.php:228 lib/facebookaction.php:325
-#: lib/facebookaction.php:327 actions/login.php:236
+#: lib/facebookaction.php:327 actions/login.php:236 actions/login.php:263
 msgid "Lost or forgotten password?"
 msgstr "Lost or forgotten password?"
 
@@ -1472,7 +1486,7 @@ 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:487
+#: actions/register.php:477 actions/register.php:487 actions/register.php:493
 msgid "My text and files are available under "
 msgstr "My text and files are available under "
 
@@ -1530,7 +1544,8 @@ msgstr "New password successfully saved. You are now logged in."
 #: 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
+#: actions/showgroup.php:236 actions/showstream.php:249 actions/login.php:246
+#: actions/register.php:423 lib/userprofile.php:131
 msgid "Nickname"
 msgstr "Nickname"
 
@@ -1544,7 +1559,7 @@ msgstr "Nickname"
 #: 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
+#: actions/register.php:202 actions/register.php:208
 msgid "Nickname already in use. Try another one."
 msgstr "Nickname already in use. Try another one."
 
@@ -1560,7 +1575,7 @@ msgstr "Nickname already in use. Try another one."
 #: 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
+#: actions/register.php:199 actions/register.php:205
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr "Nickname must have only lowercase letters and numbers, and no spaces."
 
@@ -1800,7 +1815,8 @@ msgstr "Not a registered user."
 #: 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
+#: lib/api.php:954 lib/api.php:982 lib/api.php:1092 lib/api.php:963
+#: lib/api.php:991 lib/api.php:1101
 msgid "Not a supported data format."
 msgstr "Not a supported data format."
 
@@ -1821,7 +1837,7 @@ 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
+#: actions/register.php:189 actions/register.php:195 actions/register.php:201
 msgid "Not a valid email address."
 msgstr "Not a valid e-mail address."
 
@@ -1833,7 +1849,7 @@ msgstr "Not a valid e-mail address."
 #: 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
+#: actions/register.php:204 actions/register.php:210
 msgid "Not a valid nickname."
 msgstr "Not a valid nickname."
 
@@ -1872,6 +1888,7 @@ msgstr "Not expecting this response!"
 #: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
 #: actions/twitapistatuses.php:309 actions/twitapistatuses.php:327
 #: actions/twitapistatuses.php:284 actions/apistatusesupdate.php:186
+#: actions/apistatusesupdate.php:193
 msgid "Not found"
 msgstr "Not found"
 
@@ -2018,7 +2035,8 @@ msgstr "Partial upload."
 #: 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
+#: lib/accountsettingsaction.php:114 actions/login.php:249
+#: actions/register.php:428
 msgid "Password"
 msgstr "Password"
 
@@ -2047,6 +2065,7 @@ msgstr "Password recovery requested"
 #: actions/passwordsettings.php:173 actions/recoverpassword.php:200
 #: actions/passwordsettings.php:178 actions/recoverpassword.php:208
 #: actions/passwordsettings.php:184 actions/recoverpassword.php:211
+#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "Password saved."
 
@@ -2055,6 +2074,7 @@ msgstr "Password saved."
 #: actions/passwordsettings.php:145 actions/register.php:183
 #: actions/passwordsettings.php:150 actions/register.php:220
 #: actions/passwordsettings.php:156 actions/register.php:227
+#: actions/register.php:233
 msgid "Passwords don't match."
 msgstr "Passwords don't match."
 
@@ -2218,19 +2238,19 @@ msgstr "Recovery code for unknown user."
 #: 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
+#: lib/logingroupnav.php:85 actions/register.php:114 actions/register.php:502
 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
+#: actions/register.php:129 actions/register.php:135
 msgid "Registration not allowed."
 msgstr "Registration not allowed."
 
 #: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67 actions/register.php:106
+#: actions/register.php:67 actions/register.php:106 actions/register.php:112
 msgid "Registration successful"
 msgstr "Registration successful"
 
@@ -2244,6 +2264,7 @@ msgstr "Reject"
 #: 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
+#: actions/login.php:252 actions/register.php:477
 msgid "Remember me"
 msgstr "Remember me"
 
@@ -2342,6 +2363,7 @@ msgstr "Same as password above"
 
 #: ../actions/register.php:156 actions/register.php:170
 #: actions/register.php:377 actions/register.php:423 actions/register.php:427
+#: actions/register.php:433
 msgid "Same as password above. Required."
 msgstr "Same as password above. Required."
 
@@ -2506,6 +2528,7 @@ msgstr "Stored OpenID not found."
 #: actions/remotesubscribe.php:113 actions/showstream.php:376
 #: lib/subscribeform.php:139 actions/showstream.php:345
 #: actions/remotesubscribe.php:137 actions/showstream.php:439
+#: lib/userprofile.php:321
 msgid "Subscribe"
 msgstr "Subscribe"
 
@@ -2552,6 +2575,7 @@ msgstr "System error uploading file."
 #: actions/profilesettings.php:123 actions/showstream.php:255
 #: lib/subscriptionlist.php:106 lib/subscriptionlist.php:108
 #: actions/profilesettings.php:138 actions/showstream.php:327
+#: lib/userprofile.php:209
 msgid "Tags"
 msgstr "Tags"
 
@@ -2772,6 +2796,7 @@ msgstr "This method requires a POST or DELETE."
 #: actions/apifriendshipsdestroy.php:91 actions/apigroupcreate.php:104
 #: actions/apigroupjoin.php:91 actions/apigroupleave.php:91
 #: actions/apistatusesupdate.php:109
+#: actions/apiaccountupdateprofileimage.php:84
 msgid "This method requires a POST."
 msgstr "This method requires a POST."
 
@@ -2805,7 +2830,7 @@ msgstr ""
 
 #: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
 #: actions/twitapifriendships.php:132 actions/twitapifriendships.php:139
-#: actions/apifriendshipsexists.php:103
+#: actions/apifriendshipsexists.php:103 actions/apifriendshipsexists.php:94
 msgid "Two user ids or screen_names must be supplied."
 msgstr "Two user ids or screen_names must be supplied."
 
@@ -2813,7 +2838,7 @@ msgstr "Two user ids or screen_names must be supplied."
 #: 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
+#: actions/register.php:448 actions/register.php:454
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "URL of your homepage, blog, or profile on another site"
 
@@ -2835,6 +2860,7 @@ msgstr "URL of your profile on another compatible microblogging service"
 #: actions/twittersettings.php:322 lib/designsettings.php:301
 #: actions/emailsettings.php:255 actions/grouplogo.php:319
 #: actions/imsettings.php:220 actions/smssettings.php:248
+#: actions/avatarsettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "Unexpected form submission."
 
@@ -2946,7 +2972,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
+#: actions/register.php:436 actions/register.php:438 actions/register.php:442
 msgid "Used only for updates, announcements, and password recovery"
 msgstr "Used only for updates, announcements, and password recovery"
 
@@ -2974,7 +3000,8 @@ msgstr "User being listened to doesn't exist."
 #: 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
+#: actions/apiusershow.php:108 actions/apiaccountupdateprofileimage.php:124
+#: actions/apiaccountupdateprofileimage.php:130
 msgid "User has no profile."
 msgstr "User has no profile."
 
@@ -3003,7 +3030,7 @@ msgstr "What's up, %s?"
 #: 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
+#: actions/register.php:466 actions/register.php:472
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Where you are, like \"City, State (or Region), Country\""
 
@@ -3106,7 +3133,7 @@ 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/register.php:149
-#: actions/register.php:186 actions/register.php:192
+#: actions/register.php:186 actions/register.php:192 actions/register.php:198
 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."
 
@@ -3181,56 +3208,56 @@ msgstr ""
 "account. Manage your associated OpenIDs from here."
 
 #: ../lib/util.php:943 lib/util.php:992 lib/util.php:945 lib/util.php:756
-#: lib/util.php:770 lib/util.php:816
+#: lib/util.php:770 lib/util.php:816 lib/util.php:844
 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:768
-#: lib/util.php:782 lib/util.php:828
+#: lib/util.php:782 lib/util.php:828 lib/util.php:856
 #, 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:764
-#: lib/util.php:778 lib/util.php:824
+#: lib/util.php:778 lib/util.php:824 lib/util.php:852
 #, 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:760
-#: lib/util.php:774 lib/util.php:820
+#: lib/util.php:774 lib/util.php:820 lib/util.php:848
 #, 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:772
-#: lib/util.php:786 lib/util.php:832
+#: lib/util.php:786 lib/util.php:832 lib/util.php:860
 #, 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:766
-#: lib/util.php:780 lib/util.php:826
+#: lib/util.php:780 lib/util.php:826 lib/util.php:854
 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:758
-#: lib/util.php:772 lib/util.php:818
+#: lib/util.php:772 lib/util.php:818 lib/util.php:846
 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:770
-#: lib/util.php:784 lib/util.php:830
+#: lib/util.php:784 lib/util.php:830 lib/util.php:858
 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:774
-#: lib/util.php:788 lib/util.php:834
+#: lib/util.php:788 lib/util.php:834 lib/util.php:862
 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:762
-#: lib/util.php:776 lib/util.php:822
+#: lib/util.php:776 lib/util.php:822 lib/util.php:850
 msgid "about an hour ago"
 msgstr "about an hour ago"
 
@@ -3299,7 +3326,9 @@ msgstr "← After"
 #: 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
+#: actions/userauthorization.php:52 actions/login.php:131
+#: actions/register.php:165 actions/avatarsettings.php:265
+#: lib/designsettings.php:294
 msgid "There was a problem with your session token. Try again, please."
 msgstr "There was a problem with your session token. Try again, please."
 
@@ -3523,6 +3552,7 @@ 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
+#: actions/register.php:230
 msgid "Password must be 6 or more characters."
 msgstr "Password must be 6 or more characters."
 
@@ -4072,13 +4102,13 @@ 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
+#: actions/avatarsettings.php:308 actions/avatarsettings.php:322
 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
+#: actions/grouplogo.php:377 actions/avatarsettings.php:337
 msgid "Lost our file data."
 msgstr "Lost our file data."
 
@@ -4535,7 +4565,7 @@ msgid "%s left group %s"
 msgstr "%s left group %s"
 
 #: actions/login.php:225 lib/facebookaction.php:304 actions/login.php:208
-#: actions/login.php:216
+#: actions/login.php:216 actions/login.php:243
 msgid "Login to site"
 msgstr "Login to site"
 
@@ -4714,7 +4744,8 @@ msgstr "Tag cloud"
 
 #: 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
+#: actions/register.php:398 actions/register.php:85 actions/register.php:189
+#: actions/register.php:404
 msgid "Sorry, only invited people can register."
 msgstr "Sorry, only invited people can register."
 
@@ -4796,7 +4827,7 @@ msgstr "Group profile"
 #: 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
+#: lib/profilelist.php:230 lib/userprofile.php:177
 msgid "URL"
 msgstr "URL"
 
@@ -4807,7 +4838,7 @@ msgstr "URL"
 #: 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
+#: lib/profilelist.php:245 lib/userprofile.php:194
 msgid "Note"
 msgstr "Note"
 
@@ -4856,6 +4887,7 @@ msgid "Only the sender and recipient "
 msgstr "Only the sender and recipient "
 
 #: actions/showstream.php:73 actions/showstream.php:78
+#: actions/showstream.php:79
 #, php-format
 msgid "%s, page %d"
 msgstr "%s, page %d"
@@ -4866,28 +4898,29 @@ msgstr "'s profile"
 
 #: actions/showstream.php:236 actions/tagother.php:77
 #: actions/showstream.php:220 actions/showstream.php:185
-#: actions/showstream.php:193
+#: actions/showstream.php:193 lib/userprofile.php:75
 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
+#: actions/showstream.php:220 lib/userprofile.php:102
 msgid "Photo"
 msgstr "Photo"
 
 #: actions/showstream.php:317 actions/showstream.php:309
 #: actions/showstream.php:274 actions/showstream.php:354
+#: lib/userprofile.php:236
 msgid "User actions"
 msgstr "User actions"
 
 #: actions/showstream.php:342 actions/showstream.php:307
-#: actions/showstream.php:390
+#: actions/showstream.php:390 lib/userprofile.php:272
 msgid "Send a direct message to this user"
 msgstr "Send a direct message to this user"
 
 #: actions/showstream.php:343 actions/showstream.php:308
-#: actions/showstream.php:391
+#: actions/showstream.php:391 lib/userprofile.php:273
 msgid "Message"
 msgstr "Message"
 
@@ -5590,7 +5623,7 @@ msgstr "%s and friends"
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr "You can upload your personal avatar."
 
-#: actions/avatarsettings.php:373
+#: actions/avatarsettings.php:373 actions/avatarsettings.php:387
 #, fuzzy
 msgid "Avatar deleted."
 msgstr "Avatar updated."
@@ -5727,10 +5760,12 @@ msgid ""
 msgstr ""
 
 #: actions/register.php:432 actions/register.php:479 actions/register.php:489
+#: actions/register.php:495
 msgid "Creative Commons Attribution 3.0"
 msgstr ""
 
 #: actions/register.php:433 actions/register.php:480 actions/register.php:490
+#: actions/register.php:496
 #, fuzzy
 msgid ""
 " except this private data: password, email address, IM address, and phone "
@@ -5767,44 +5802,48 @@ msgid "%s's profile"
 msgstr "'s profile"
 
 #: actions/showstream.php:163 actions/showstream.php:128
+#: actions/showstream.php:129
 #, fuzzy, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "Notice feed for %s"
 
 #: actions/showstream.php:170 actions/showstream.php:135
+#: actions/showstream.php:136
 #, fuzzy, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "Notice feed for %s"
 
 #: actions/showstream.php:177 actions/showstream.php:142
+#: actions/showstream.php:143
 #, fuzzy, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "Notice feed for %s"
 
 #: actions/showstream.php:182 actions/showstream.php:147
+#: actions/showstream.php:148
 #, fuzzy, php-format
 msgid "FOAF for %s"
 msgstr "Outbox for %s"
 
 #: actions/showstream.php:237 actions/showstream.php:202
-#: actions/showstream.php:234
+#: actions/showstream.php:234 lib/userprofile.php:116
 #, fuzzy
 msgid "Edit Avatar"
 msgstr "Avatar"
 
 #: actions/showstream.php:316 actions/showstream.php:281
-#: actions/showstream.php:366
+#: actions/showstream.php:366 lib/userprofile.php:248
 #, fuzzy
 msgid "Edit profile settings"
 msgstr "Profile settings"
 
 #: actions/showstream.php:317 actions/showstream.php:282
-#: actions/showstream.php:367
+#: actions/showstream.php:367 lib/userprofile.php:249
 msgid "Edit"
 msgstr ""
 
 #: actions/showstream.php:542 actions/showstream.php:388
-#: actions/showstream.php:487
+#: actions/showstream.php:487 actions/showstream.php:234
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5849,6 +5888,9 @@ msgstr ""
 #: actions/apistatusesupdate.php:125 actions/apisubscriptions.php:87
 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#: actions/apiaccountupdateprofileimage.php:91
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apistatusesupdate.php:139
 #, fuzzy
 msgid "No such user!"
 msgstr "No such user"
@@ -5908,36 +5950,6 @@ msgid ""
 "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 ""
@@ -6106,6 +6118,7 @@ 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
+#: actions/showstream.php:202
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -6287,7 +6300,8 @@ 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
+#: lib/designsettings.php:461 lib/designsettings.php:434
+#: lib/designsettings.php:464
 #, fuzzy
 msgid "Couldn't update your design."
 msgstr "Couldn't update user."
@@ -6383,7 +6397,9 @@ msgid "Message sent"
 msgstr "Message"
 
 #: actions/newnotice.php:93 lib/designsettings.php:281
-#: actions/newnotice.php:94
+#: actions/newnotice.php:94 actions/apiaccountupdateprofileimage.php:97
+#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254
+#: lib/designsettings.php:283
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s bytes) due to its "
@@ -6553,7 +6569,7 @@ msgstr "You've been identified. Enter a  new password below. "
 msgid "Password recover"
 msgstr "Password recovery requested"
 
-#: actions/register.php:86
+#: actions/register.php:86 actions/register.php:92
 #, fuzzy
 msgid "Sorry, invalid invitation code."
 msgstr "Error with confirmation code."
@@ -6655,28 +6671,31 @@ msgstr "Admin"
 msgid "Not a local notice"
 msgstr "Not a local user."
 
-#: actions/showstream.php:72
+#: actions/showstream.php:72 actions/showstream.php:73
 #, fuzzy, php-format
 msgid " tagged %s"
 msgstr "Notices tagged with %s"
 
-#: actions/showstream.php:121
+#: actions/showstream.php:121 actions/showstream.php:122
 #, 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
+#: actions/showstream.php:191
 #, 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
+#: actions/showstream.php:196
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
 msgstr ""
 
 #: actions/showstream.php:357 actions/showstream.php:451
+#: actions/showstream.php:198
 #, php-format
 msgid ""
 "You can try to nudge %s or [post something to his or her attention](%%%%"
@@ -6684,6 +6703,7 @@ msgid ""
 msgstr ""
 
 #: actions/showstream.php:393 actions/showstream.php:492
+#: actions/showstream.php:239
 #, fuzzy, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -6836,6 +6856,7 @@ msgid "Problem saving notice. Too long."
 msgstr "Problem saving notice."
 
 #: classes/User.php:319 classes/User.php:327 classes/User.php:334
+#: classes/User.php:333
 #, fuzzy, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "Message to %1$s on %2$s"
@@ -6946,10 +6967,12 @@ msgid "Save design"
 msgstr ""
 
 #: lib/designsettings.php:378 lib/designsettings.php:369
+#: lib/designsettings.php:372
 msgid "Bad default color settings: "
 msgstr ""
 
 #: lib/designsettings.php:474 lib/designsettings.php:465
+#: lib/designsettings.php:468
 msgid "Design defaults restored."
 msgstr ""
 
@@ -7156,16 +7179,18 @@ msgid "Status deleted."
 msgstr "Avatar updated."
 
 #: actions/apistatusesupdate.php:132
+#: actions/apiaccountupdateprofileimage.php:99
 msgid "Unable to handle that much POST data!"
 msgstr ""
 
 #: actions/apistatusesupdate.php:145 actions/newnotice.php:155
-#: scripts/maildaemon.php:71
+#: scripts/maildaemon.php:71 actions/apistatusesupdate.php:152
 #, 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
+#: actions/apistatusesupdate.php:216
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
@@ -7230,7 +7255,7 @@ msgstr "Updates from %1$s on %2$s!"
 msgid "IM is not available."
 msgstr "This page is not available in a "
 
-#: actions/login.php:259
+#: actions/login.php:259 actions/login.php:286
 #, fuzzy, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -7265,21 +7290,24 @@ msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
 msgstr ""
 
 #: actions/profilesettings.php:122 actions/register.php:454
+#: actions/register.php:460
 #, 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
+#: actions/register.php:463
 #, fuzzy
 msgid "Describe yourself and your interests"
 msgstr "Describe yourself and your "
 
 #: actions/profilesettings.php:221 actions/register.php:217
+#: actions/register.php:223
 #, fuzzy, php-format
 msgid "Bio is too long (max %d chars)."
 msgstr "Bio is too long (max 140 chars)."
 
-#: actions/register.php:336
+#: actions/register.php:336 actions/register.php:342
 msgid ""
 "With this form you can create  a new account. You can then post notices and "
 "link up to friends and colleagues. "
@@ -7312,7 +7340,7 @@ msgid "Replies feed for %s (RSS 2.0)"
 msgstr "Notice feed for %s"
 
 #: actions/replies.php:158
-#, fuzzy, php-format
+#, php-format
 msgid "Replies feed for %s (Atom)"
 msgstr "Notice feed for %s"
 
@@ -7322,17 +7350,17 @@ msgid "Replies to %1$s on %2$s!"
 msgstr "Message to %1$s on %2$s"
 
 #: actions/showfavorites.php:170
-#, fuzzy, php-format
+#, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
 msgstr "Feed for friends of %s"
 
 #: actions/showfavorites.php:177
-#, fuzzy, php-format
+#, php-format
 msgid "Feed for favorites of %s (RSS 2.0)"
 msgstr "Feed for friends of %s"
 
 #: actions/showfavorites.php:184
-#, fuzzy, php-format
+#, php-format
 msgid "Feed for favorites of %s (Atom)"
 msgstr "Feed for friends of %s"
 
@@ -7345,7 +7373,7 @@ msgid ""
 msgstr ""
 
 #: actions/showgroup.php:345
-#, fuzzy, php-format
+#, php-format
 msgid "FOAF for %s group"
 msgstr "Outbox for %s"
 
@@ -7485,41 +7513,6 @@ msgstr "Reply to this notice"
 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. "
@@ -7554,7 +7547,7 @@ 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
+#, php-format
 msgid "notice id: %s"
 msgstr "New notice"
 
@@ -7614,7 +7607,6 @@ 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."
 
@@ -7622,3 +7614,59 @@ msgstr "Could not retrieve public stream."
 #, fuzzy
 msgid "Duplicate notice"
 msgstr "Delete notice"
+
+#: actions/login.php:110 actions/login.php:120
+#, fuzzy
+msgid "Invalid or expired token."
+msgstr "Invalid notice content"
+
+#: lib/command.php:597
+#, fuzzy, php-format
+msgid "Could not create login token for %s"
+msgstr "Could not create OpenID from: %s"
+
+#: lib/command.php:602
+#, php-format
+msgid "This link is useable only once, and is good for only 2 minutes: %s"
+msgstr ""
+
+#: lib/imagefile.php:75
+#, fuzzy, php-format
+msgid "That file is too big. The maximum file size is %s."
+msgstr "You can upload a logo image for your group."
+
+#: lib/command.php:613
+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"
+"login - Get a link to login to the web interface\n"
+"drop <group> - leave group\n"
+"stats - get your stats\n"
+"stop - same as 'off'\n"
+"quit - same as 'off'\n"
+"sub <nickname> - same as 'follow'\n"
+"unsub <nickname> - same as 'leave'\n"
+"last <nickname> - same as 'get'\n"
+"on <nickname> - not yet implemented.\n"
+"off <nickname> - not yet implemented.\n"
+"nudge <nickname> - remind a user to update.\n"
+"invite <phone number> - not yet implemented.\n"
+"track <word> - not yet implemented.\n"
+"untrack <word> - not yet implemented.\n"
+"track off - not yet implemented.\n"
+"untrack all - not yet implemented.\n"
+"tracks - not yet implemented.\n"
+"tracking - not yet implemented.\n"
+msgstr ""
diff --git a/locale/es/LC_MESSAGES/statusnet.mo b/locale/es/LC_MESSAGES/statusnet.mo
index a9e9e6bc7..8185c45d6 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 54a2025f1..c10f37721 100644
--- a/locale/es/LC_MESSAGES/statusnet.po
+++ b/locale/es/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-06 13:16+0000\n"
-"PO-Revision-Date: 2009-11-06 15:43:30+0000\n"
+"POT-Creation-Date: 2009-11-08 11:53+0000\n"
+"PO-Revision-Date: 2009-11-08 11:56:22+0000\n"
 "Language-Team: Spanish\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r58648); Translate extension (2009-08-03)\n"
+"X-Generator: MediaWiki 1.16alpha(r58760); 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"
@@ -206,7 +206,7 @@ msgid "%s updates from everyone!"
 msgstr "¡Actualizaciones de todos en %s!"
 
 #: ../actions/register.php:213 actions/register.php:497
-#: actions/register.php:545 actions/register.php:555
+#: actions/register.php:545 actions/register.php:555 actions/register.php:561
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -245,6 +245,7 @@ msgstr ""
 
 #: ../actions/register.php:152 actions/register.php:166
 #: actions/register.php:368 actions/register.php:414 actions/register.php:418
+#: actions/register.php:424
 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. "
@@ -263,6 +264,7 @@ msgstr "6 o más caracteres, ¡no te olvides!"
 
 #: ../actions/register.php:154 actions/register.php:168
 #: actions/register.php:373 actions/register.php:419 actions/register.php:423
+#: actions/register.php:429
 msgid "6 or more characters. Required."
 msgstr "6 o más caracters. Requerido."
 
@@ -444,7 +446,7 @@ msgstr "Todas las actualizaciones que corresponden a la frase a buscar \"%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
+#: actions/login.php:79 actions/register.php:137
 msgid "Already logged in."
 msgstr "Ya estás conectado."
 
@@ -467,7 +469,7 @@ msgstr "Autorizar la suscripción"
 #: ../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
+#: actions/register.php:473 actions/login.php:253 actions/register.php:479
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Iniciar sesión automáticamente en el futuro. ¡No usar en ordenadores "
@@ -493,6 +495,7 @@ msgstr "Avatar"
 
 #: ../actions/avatar.php:113 actions/profilesettings.php:350
 #: actions/avatarsettings.php:395 actions/avatarsettings.php:346
+#: actions/avatarsettings.php:360
 msgid "Avatar updated."
 msgstr "Avatar actualizado"
 
@@ -530,7 +533,7 @@ msgstr "Antes »"
 #: 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
+#: actions/register.php:459 actions/register.php:465
 msgid "Bio"
 msgstr "Biografía"
 
@@ -559,6 +562,7 @@ msgstr "No se puede leer el URL del avatar '%s'"
 #: actions/passwordsettings.php:169 actions/recoverpassword.php:347
 #: actions/passwordsettings.php:174 actions/recoverpassword.php:365
 #: actions/passwordsettings.php:180 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:185
 msgid "Can't save new password."
 msgstr "No se puede guardar la nueva contraseña."
 
@@ -621,6 +625,7 @@ msgstr "Cambia tus opciones de perfil"
 #: actions/recoverpassword.php:236 actions/register.php:422
 #: actions/passwordsettings.php:111 actions/recoverpassword.php:239
 #: actions/register.php:426 actions/smssettings.php:134
+#: actions/register.php:432
 msgid "Confirm"
 msgstr "Confirmar"
 
@@ -650,7 +655,7 @@ msgid "Confirmation code not found."
 msgstr "Código de confirmación no encontrado."
 
 #: ../actions/register.php:202 actions/register.php:473
-#: actions/register.php:521 actions/register.php:531
+#: actions/register.php:521 actions/register.php:531 actions/register.php:537
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -890,6 +895,7 @@ 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
+#: classes/Notice.php:1120
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Error de BD al insertar respuesta: %s"
@@ -912,7 +918,8 @@ msgstr "Cuéntanos algo sobre ti y tus intereses en 140 caracteres"
 #: 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
+#: lib/accountsettingsaction.php:117 actions/register.php:437
+#: actions/register.php:441
 msgid "Email"
 msgstr "Correo electrónico"
 
@@ -927,7 +934,7 @@ 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
+#: actions/register.php:200 actions/register.php:206 actions/register.php:212
 msgid "Email address already exists."
 msgstr "La dirección de correo electrónico ya existe."
 
@@ -1013,7 +1020,7 @@ msgstr "Error al guardar el usuario."
 
 #: ../actions/password.php:80 actions/profilesettings.php:399
 #: actions/passwordsettings.php:164 actions/passwordsettings.php:169
-#: actions/passwordsettings.php:175
+#: actions/passwordsettings.php:175 actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "Error al guardar el usuario; inválido."
 
@@ -1025,6 +1032,7 @@ msgstr "Error al guardar el usuario; inválido."
 #: actions/login.php:120 actions/recoverpassword.php:372
 #: actions/register.php:235 actions/login.php:122
 #: actions/recoverpassword.php:375 actions/register.php:242
+#: actions/login.php:149 actions/register.php:248
 msgid "Error setting user."
 msgstr "Error al configurar el usuario."
 
@@ -1056,6 +1064,7 @@ msgstr "Preguntas Frecuentes"
 
 #: ../actions/avatar.php:115 actions/profilesettings.php:352
 #: actions/avatarsettings.php:397 actions/avatarsettings.php:349
+#: actions/avatarsettings.php:363
 msgid "Failed updating avatar."
 msgstr "Error al actualizar avatar."
 
@@ -1090,6 +1099,7 @@ msgid "Find people on this site"
 msgstr "Encontrar gente en este sitio"
 
 #: ../actions/login.php:122 actions/login.php:247 actions/login.php:255
+#: actions/login.php:282
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -1107,6 +1117,7 @@ msgstr ""
 #: actions/showstream.php:220 lib/groupeditform.php:157
 #: actions/profilesettings.php:111 actions/register.php:441
 #: actions/showgroup.php:247 actions/showstream.php:267
+#: actions/register.php:447 lib/userprofile.php:149
 msgid "Full name"
 msgstr "Nombre completo"
 
@@ -1120,7 +1131,7 @@ msgstr "Nombre completo"
 #: 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
+#: actions/register.php:214 actions/register.php:220
 msgid "Full name is too long (max 255 chars)."
 msgstr "Tu nombre es demasiado largo (max. 255 carac.)"
 
@@ -1141,7 +1152,7 @@ msgstr "Inicio"
 #: 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
+#: actions/register.php:446 actions/register.php:452
 msgid "Homepage"
 msgstr "Página de inicio"
 
@@ -1153,7 +1164,7 @@ msgstr "Página de inicio"
 #: 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
+#: actions/register.php:211 actions/register.php:217
 msgid "Homepage is not a valid URL."
 msgstr "La página de inicio no es un URL válido."
 
@@ -1225,7 +1236,7 @@ msgstr "Contraseña antigua incorrecta."
 
 #: ../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
+#: actions/facebookhome.php:129 actions/login.php:116 actions/login.php:143
 msgid "Incorrect username or password."
 msgstr "Nombre de usuario o contraseña incorrectos."
 
@@ -1305,6 +1316,7 @@ msgstr "Tamaño inválido."
 #: 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
+#: actions/register.php:243 actions/register.php:264
 msgid "Invalid username or password."
 msgstr "Usuario o contraseña inválidos."
 
@@ -1382,7 +1394,7 @@ msgstr "Idioma es muy largo ( max 50 car.)"
 #: 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
+#: lib/profilelist.php:218 actions/register.php:470 lib/userprofile.php:164
 msgid "Location"
 msgstr "Ubicación"
 
@@ -1396,7 +1408,7 @@ msgstr "Ubicación"
 #: 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
+#: actions/register.php:221 actions/register.php:227
 msgid "Location is too long (max 255 chars)."
 msgstr "La ubicación es demasiado larga (máx. 255 caracteres)."
 
@@ -1410,6 +1422,7 @@ msgstr "La ubicación es demasiado larga (máx. 255 caracteres)."
 #: 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
+#: actions/login.php:204 actions/login.php:257
 #, php-format
 msgid "Login"
 msgstr "Inicio de sesión"
@@ -1438,12 +1451,13 @@ msgstr "Salir"
 
 #: ../actions/register.php:166 actions/register.php:180
 #: actions/register.php:393 actions/register.php:439 actions/register.php:443
+#: actions/register.php:449
 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 actions/login.php:228 lib/facebookaction.php:325
-#: lib/facebookaction.php:327 actions/login.php:236
+#: lib/facebookaction.php:327 actions/login.php:236 actions/login.php:263
 msgid "Lost or forgotten password?"
 msgstr "¿Contraseña olvidada o perdida?"
 
@@ -1486,7 +1500,7 @@ 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:487
+#: actions/register.php:477 actions/register.php:487 actions/register.php:493
 msgid "My text and files are available under "
 msgstr "Mi texto y archivos están disponibles bajo"
 
@@ -1544,7 +1558,8 @@ msgstr "Nueva contraseña guardada correctamente. Has iniciado una sesión."
 #: 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
+#: actions/showgroup.php:236 actions/showstream.php:249 actions/login.php:246
+#: actions/register.php:423 lib/userprofile.php:131
 msgid "Nickname"
 msgstr "Apodo"
 
@@ -1558,7 +1573,7 @@ msgstr "Apodo"
 #: 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
+#: actions/register.php:202 actions/register.php:208
 msgid "Nickname already in use. Try another one."
 msgstr "El apodo ya existe. Prueba otro."
 
@@ -1574,7 +1589,7 @@ msgstr "El apodo ya existe. Prueba otro."
 #: 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
+#: actions/register.php:199 actions/register.php:205
 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 "
@@ -1815,7 +1830,8 @@ msgstr "No es un usuario registrado"
 #: 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
+#: lib/api.php:954 lib/api.php:982 lib/api.php:1092 lib/api.php:963
+#: lib/api.php:991 lib/api.php:1101
 msgid "Not a supported data format."
 msgstr "No es un formato de dato soportado"
 
@@ -1836,7 +1852,7 @@ 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
+#: actions/register.php:189 actions/register.php:195 actions/register.php:201
 msgid "Not a valid email address."
 msgstr "Correo electrónico no válido"
 
@@ -1848,7 +1864,7 @@ msgstr "Correo electrónico no válido"
 #: 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
+#: actions/register.php:204 actions/register.php:210
 msgid "Not a valid nickname."
 msgstr "Apodo no válido"
 
@@ -1887,6 +1903,7 @@ msgstr "¡Respuesta inesperada!"
 #: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
 #: actions/twitapistatuses.php:309 actions/twitapistatuses.php:327
 #: actions/twitapistatuses.php:284 actions/apistatusesupdate.php:186
+#: actions/apistatusesupdate.php:193
 msgid "Not found"
 msgstr "No encontrado"
 
@@ -2033,7 +2050,8 @@ msgstr "Carga parcial."
 #: 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
+#: lib/accountsettingsaction.php:114 actions/login.php:249
+#: actions/register.php:428
 msgid "Password"
 msgstr "Contraseña"
 
@@ -2062,6 +2080,7 @@ msgstr "Recuperación de contraseña solicitada"
 #: actions/passwordsettings.php:173 actions/recoverpassword.php:200
 #: actions/passwordsettings.php:178 actions/recoverpassword.php:208
 #: actions/passwordsettings.php:184 actions/recoverpassword.php:211
+#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "Se guardó Contraseña."
 
@@ -2070,6 +2089,7 @@ msgstr "Se guardó Contraseña."
 #: actions/passwordsettings.php:145 actions/register.php:183
 #: actions/passwordsettings.php:150 actions/register.php:220
 #: actions/passwordsettings.php:156 actions/register.php:227
+#: actions/register.php:233
 msgid "Passwords don't match."
 msgstr "Las contraseñas no coinciden"
 
@@ -2233,19 +2253,19 @@ msgstr "Código de recuperación para usuario desconocido."
 #: 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
+#: lib/logingroupnav.php:85 actions/register.php:114 actions/register.php:502
 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
+#: actions/register.php:129 actions/register.php:135
 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:106
+#: actions/register.php:67 actions/register.php:106 actions/register.php:112
 msgid "Registration successful"
 msgstr "Registro exitoso."
 
@@ -2259,6 +2279,7 @@ msgstr "Rechazar"
 #: 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
+#: actions/login.php:252 actions/register.php:477
 msgid "Remember me"
 msgstr "Recordarme"
 
@@ -2357,6 +2378,7 @@ msgstr "Igual a la contraseña de arriba"
 
 #: ../actions/register.php:156 actions/register.php:170
 #: actions/register.php:377 actions/register.php:423 actions/register.php:427
+#: actions/register.php:433
 msgid "Same as password above. Required."
 msgstr "Igual a la contraseña de arriba. Requerida"
 
@@ -2519,6 +2541,7 @@ msgstr "No se ha encontrado el OpenID almacenado."
 #: actions/remotesubscribe.php:113 actions/showstream.php:376
 #: lib/subscribeform.php:139 actions/showstream.php:345
 #: actions/remotesubscribe.php:137 actions/showstream.php:439
+#: lib/userprofile.php:321
 msgid "Subscribe"
 msgstr "Suscribirse"
 
@@ -2565,6 +2588,7 @@ msgstr "Error del sistema al cargar el archivo."
 #: actions/profilesettings.php:123 actions/showstream.php:255
 #: lib/subscriptionlist.php:106 lib/subscriptionlist.php:108
 #: actions/profilesettings.php:138 actions/showstream.php:327
+#: lib/userprofile.php:209
 msgid "Tags"
 msgstr "Tags"
 
@@ -2786,6 +2810,7 @@ msgstr "Este método requiere un PUBLICAR O ELIMINAR"
 #: actions/apifriendshipsdestroy.php:91 actions/apigroupcreate.php:104
 #: actions/apigroupjoin.php:91 actions/apigroupleave.php:91
 #: actions/apistatusesupdate.php:109
+#: actions/apiaccountupdateprofileimage.php:84
 msgid "This method requires a POST."
 msgstr "Este método requiere PUBLICAR"
 
@@ -2820,7 +2845,7 @@ msgstr ""
 
 #: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
 #: actions/twitapifriendships.php:132 actions/twitapifriendships.php:139
-#: actions/apifriendshipsexists.php:103
+#: actions/apifriendshipsexists.php:103 actions/apifriendshipsexists.php:94
 msgid "Two user ids or screen_names must be supplied."
 msgstr "Deben proveerse dos identificaciones de usuario o nombres en pantalla."
 
@@ -2828,7 +2853,7 @@ msgstr "Deben proveerse dos identificaciones de usuario o nombres en pantalla."
 #: 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
+#: actions/register.php:448 actions/register.php:454
 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"
 
@@ -2850,6 +2875,7 @@ msgstr "El URL de tu perfil en otro servicio de microblogueo compatible"
 #: actions/twittersettings.php:322 lib/designsettings.php:301
 #: actions/emailsettings.php:255 actions/grouplogo.php:319
 #: actions/imsettings.php:220 actions/smssettings.php:248
+#: actions/avatarsettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "Envío de formulario inesperado."
 
@@ -2961,7 +2987,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
+#: actions/register.php:436 actions/register.php:438 actions/register.php:442
 msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
 "Se usa sólo para actualizaciones, anuncios y recuperación de contraseñas"
@@ -2990,7 +3016,8 @@ msgstr "El usuario al que quieres seguir no existe."
 #: 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
+#: actions/apiusershow.php:108 actions/apiaccountupdateprofileimage.php:124
+#: actions/apiaccountupdateprofileimage.php:130
 msgid "User has no profile."
 msgstr "El usuario no tiene un perfil."
 
@@ -3019,7 +3046,7 @@ msgstr "¿Qué tal, %s?"
 #: 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
+#: actions/register.php:466 actions/register.php:472
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Dónde estás, por ejemplo \"Ciudad, Estado (o Región), País\""
 
@@ -3124,7 +3151,7 @@ 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/register.php:149
-#: actions/register.php:186 actions/register.php:192
+#: actions/register.php:186 actions/register.php:192 actions/register.php:198
 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."
 
@@ -3201,56 +3228,56 @@ msgstr ""
 "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:756
-#: lib/util.php:770 lib/util.php:816
+#: lib/util.php:770 lib/util.php:816 lib/util.php:844
 msgid "a few seconds ago"
 msgstr "hace unos segundos"
 
 #: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957 lib/util.php:768
-#: lib/util.php:782 lib/util.php:828
+#: lib/util.php:782 lib/util.php:828 lib/util.php:856
 #, 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:764
-#: lib/util.php:778 lib/util.php:824
+#: lib/util.php:778 lib/util.php:824 lib/util.php:852
 #, 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:760
-#: lib/util.php:774 lib/util.php:820
+#: lib/util.php:774 lib/util.php:820 lib/util.php:848
 #, 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:772
-#: lib/util.php:786 lib/util.php:832
+#: lib/util.php:786 lib/util.php:832 lib/util.php:860
 #, 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:766
-#: lib/util.php:780 lib/util.php:826
+#: lib/util.php:780 lib/util.php:826 lib/util.php:854
 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:758
-#: lib/util.php:772 lib/util.php:818
+#: lib/util.php:772 lib/util.php:818 lib/util.php:846
 msgid "about a minute ago"
 msgstr "hace un minuto"
 
 #: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959 lib/util.php:770
-#: lib/util.php:784 lib/util.php:830
+#: lib/util.php:784 lib/util.php:830 lib/util.php:858
 msgid "about a month ago"
 msgstr "hace un mes"
 
 #: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963 lib/util.php:774
-#: lib/util.php:788 lib/util.php:834
+#: lib/util.php:788 lib/util.php:834 lib/util.php:862
 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:762
-#: lib/util.php:776 lib/util.php:822
+#: lib/util.php:776 lib/util.php:822 lib/util.php:850
 msgid "about an hour ago"
 msgstr "hace una hora"
 
@@ -3320,7 +3347,9 @@ msgstr "« Después"
 #: 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
+#: actions/userauthorization.php:52 actions/login.php:131
+#: actions/register.php:165 actions/avatarsettings.php:265
+#: lib/designsettings.php:294
 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."
@@ -3547,6 +3576,7 @@ 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
+#: actions/register.php:230
 msgid "Password must be 6 or more characters."
 msgstr "Cotrnaseña debe tener 6 o más caracteres."
 
@@ -4097,13 +4127,13 @@ 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
+#: actions/avatarsettings.php:308 actions/avatarsettings.php:322
 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
+#: actions/grouplogo.php:377 actions/avatarsettings.php:337
 msgid "Lost our file data."
 msgstr "Se perdió nuestros datos de archivo."
 
@@ -4593,7 +4623,7 @@ msgid "%s left group %s"
 msgstr "%s dejó grupo %s"
 
 #: actions/login.php:225 lib/facebookaction.php:304 actions/login.php:208
-#: actions/login.php:216
+#: actions/login.php:216 actions/login.php:243
 msgid "Login to site"
 msgstr "Ingresar a sitio"
 
@@ -4788,7 +4818,8 @@ msgstr "Nube de tags"
 
 #: 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
+#: actions/register.php:398 actions/register.php:85 actions/register.php:189
+#: actions/register.php:404
 msgid "Sorry, only invited people can register."
 msgstr "Disculpa, sólo personas invitadas pueden registrarse."
 
@@ -4878,7 +4909,7 @@ msgstr "Perfil de grupo"
 #: 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
+#: lib/profilelist.php:230 lib/userprofile.php:177
 msgid "URL"
 msgstr "URL"
 
@@ -4889,7 +4920,7 @@ msgstr "URL"
 #: 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
+#: lib/profilelist.php:245 lib/userprofile.php:194
 #, fuzzy
 msgid "Note"
 msgstr "Nota"
@@ -4940,6 +4971,7 @@ msgid "Only the sender and recipient "
 msgstr "Sólo el remitente y el receptor"
 
 #: actions/showstream.php:73 actions/showstream.php:78
+#: actions/showstream.php:79
 #, php-format
 msgid "%s, page %d"
 msgstr "%s, página %d"
@@ -4951,30 +4983,31 @@ msgstr "Perfil de"
 
 #: actions/showstream.php:236 actions/tagother.php:77
 #: actions/showstream.php:220 actions/showstream.php:185
-#: actions/showstream.php:193
+#: actions/showstream.php:193 lib/userprofile.php:75
 #, 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
+#: actions/showstream.php:220 lib/userprofile.php:102
 msgid "Photo"
 msgstr "Foto"
 
 #: actions/showstream.php:317 actions/showstream.php:309
 #: actions/showstream.php:274 actions/showstream.php:354
+#: lib/userprofile.php:236
 #, fuzzy
 msgid "User actions"
 msgstr "Acciones de usuario"
 
 #: actions/showstream.php:342 actions/showstream.php:307
-#: actions/showstream.php:390
+#: actions/showstream.php:390 lib/userprofile.php:272
 msgid "Send a direct message to this user"
 msgstr "Enviar un mensaje directo a este usuario"
 
 #: actions/showstream.php:343 actions/showstream.php:308
-#: actions/showstream.php:391
+#: actions/showstream.php:391 lib/userprofile.php:273
 msgid "Message"
 msgstr "Mensaje"
 
@@ -5727,7 +5760,7 @@ msgstr "%s y amigos"
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr "Puedes cargar tu avatar personal."
 
-#: actions/avatarsettings.php:373
+#: actions/avatarsettings.php:373 actions/avatarsettings.php:387
 #, fuzzy
 msgid "Avatar deleted."
 msgstr "Avatar actualizado"
@@ -5866,10 +5899,12 @@ msgid ""
 msgstr ""
 
 #: actions/register.php:432 actions/register.php:479 actions/register.php:489
+#: actions/register.php:495
 msgid "Creative Commons Attribution 3.0"
 msgstr ""
 
 #: actions/register.php:433 actions/register.php:480 actions/register.php:490
+#: actions/register.php:496
 #, fuzzy
 msgid ""
 " except this private data: password, email address, IM address, and phone "
@@ -5906,44 +5941,48 @@ msgid "%s's profile"
 msgstr "Perfil de"
 
 #: actions/showstream.php:163 actions/showstream.php:128
+#: actions/showstream.php:129
 #, 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
+#: actions/showstream.php:136
 #, 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
+#: actions/showstream.php:143
 #, fuzzy, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "Feed de avisos de %s"
 
 #: actions/showstream.php:182 actions/showstream.php:147
+#: actions/showstream.php:148
 #, 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
+#: actions/showstream.php:234 lib/userprofile.php:116
 #, fuzzy
 msgid "Edit Avatar"
 msgstr "Avatar"
 
 #: actions/showstream.php:316 actions/showstream.php:281
-#: actions/showstream.php:366
+#: actions/showstream.php:366 lib/userprofile.php:248
 #, fuzzy
 msgid "Edit profile settings"
 msgstr "Configuración del perfil"
 
 #: actions/showstream.php:317 actions/showstream.php:282
-#: actions/showstream.php:367
+#: actions/showstream.php:367 lib/userprofile.php:249
 msgid "Edit"
 msgstr ""
 
 #: actions/showstream.php:542 actions/showstream.php:388
-#: actions/showstream.php:487
+#: actions/showstream.php:487 actions/showstream.php:234
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5989,6 +6028,9 @@ msgstr ""
 #: actions/apistatusesupdate.php:125 actions/apisubscriptions.php:87
 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#: actions/apiaccountupdateprofileimage.php:91
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apistatusesupdate.php:139
 #, fuzzy
 msgid "No such user!"
 msgstr "No existe el usuario."
@@ -6049,36 +6091,6 @@ msgid ""
 "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 ""
@@ -6247,6 +6259,7 @@ 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
+#: actions/showstream.php:202
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -6428,7 +6441,8 @@ 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
+#: lib/designsettings.php:461 lib/designsettings.php:434
+#: lib/designsettings.php:464
 #, fuzzy
 msgid "Couldn't update your design."
 msgstr "No se pudo actualizar el usuario."
@@ -6524,7 +6538,9 @@ msgid "Message sent"
 msgstr "Mensaje"
 
 #: actions/newnotice.php:93 lib/designsettings.php:281
-#: actions/newnotice.php:94
+#: actions/newnotice.php:94 actions/apiaccountupdateprofileimage.php:97
+#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254
+#: lib/designsettings.php:283
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s bytes) due to its "
@@ -6694,7 +6710,7 @@ msgstr "Te has identificado. Escribe una nueva contraseña a continuación."
 msgid "Password recover"
 msgstr "Recuperación de contraseña solicitada"
 
-#: actions/register.php:86
+#: actions/register.php:86 actions/register.php:92
 #, fuzzy
 msgid "Sorry, invalid invitation code."
 msgstr "Error con el código de confirmación."
@@ -6796,28 +6812,31 @@ msgstr "Admin"
 msgid "Not a local notice"
 msgstr "No es usuario local."
 
-#: actions/showstream.php:72
+#: actions/showstream.php:72 actions/showstream.php:73
 #, fuzzy, php-format
 msgid " tagged %s"
 msgstr "Avisos marcados con %s"
 
-#: actions/showstream.php:121
+#: actions/showstream.php:121 actions/showstream.php:122
 #, 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
+#: actions/showstream.php:191
 #, 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
+#: actions/showstream.php:196
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
 msgstr ""
 
 #: actions/showstream.php:357 actions/showstream.php:451
+#: actions/showstream.php:198
 #, php-format
 msgid ""
 "You can try to nudge %s or [post something to his or her attention](%%%%"
@@ -6825,6 +6844,7 @@ msgid ""
 msgstr ""
 
 #: actions/showstream.php:393 actions/showstream.php:492
+#: actions/showstream.php:239
 #, fuzzy, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -6977,6 +6997,7 @@ 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
+#: classes/User.php:333
 #, fuzzy, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "Mensaje a %1$s en %2$s"
@@ -7087,10 +7108,12 @@ msgid "Save design"
 msgstr ""
 
 #: lib/designsettings.php:378 lib/designsettings.php:369
+#: lib/designsettings.php:372
 msgid "Bad default color settings: "
 msgstr ""
 
 #: lib/designsettings.php:474 lib/designsettings.php:465
+#: lib/designsettings.php:468
 msgid "Design defaults restored."
 msgstr ""
 
@@ -7297,16 +7320,18 @@ msgid "Status deleted."
 msgstr "Avatar actualizado"
 
 #: actions/apistatusesupdate.php:132
+#: actions/apiaccountupdateprofileimage.php:99
 msgid "Unable to handle that much POST data!"
 msgstr ""
 
 #: actions/apistatusesupdate.php:145 actions/newnotice.php:155
-#: scripts/maildaemon.php:71
+#: scripts/maildaemon.php:71 actions/apistatusesupdate.php:152
 #, 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
+#: actions/apistatusesupdate.php:216
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
@@ -7371,7 +7396,7 @@ msgstr "¡Actualizaciones de %1$s en %2$s!"
 msgid "IM is not available."
 msgstr "Esta página no está disponible en un "
 
-#: actions/login.php:259
+#: actions/login.php:259 actions/login.php:286
 #, fuzzy, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -7406,21 +7431,24 @@ msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
 msgstr ""
 
 #: actions/profilesettings.php:122 actions/register.php:454
+#: actions/register.php:460
 #, 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
+#: actions/register.php:463
 #, fuzzy
 msgid "Describe yourself and your interests"
 msgstr "Descríbete y cuenta de tus "
 
 #: actions/profilesettings.php:221 actions/register.php:217
+#: actions/register.php:223
 #, 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
+#: actions/register.php:336 actions/register.php:342
 msgid ""
 "With this form you can create  a new account. You can then post notices and "
 "link up to friends and colleagues. "
@@ -7453,7 +7481,7 @@ msgid "Replies feed for %s (RSS 2.0)"
 msgstr "Feed de avisos de %s"
 
 #: actions/replies.php:158
-#, fuzzy, php-format
+#, php-format
 msgid "Replies feed for %s (Atom)"
 msgstr "Feed de avisos de %s"
 
@@ -7463,17 +7491,17 @@ msgid "Replies to %1$s on %2$s!"
 msgstr "Mensaje a %1$s en %2$s"
 
 #: actions/showfavorites.php:170
-#, fuzzy, php-format
+#, 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
+#, 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
+#, php-format
 msgid "Feed for favorites of %s (Atom)"
 msgstr "Feed de los amigos de %s"
 
@@ -7486,7 +7514,7 @@ msgid ""
 msgstr ""
 
 #: actions/showgroup.php:345
-#, fuzzy, php-format
+#, php-format
 msgid "FOAF for %s group"
 msgstr "Bandeja de salida para %s"
 
@@ -7627,41 +7655,6 @@ msgstr "Responder este aviso."
 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. "
@@ -7696,7 +7689,7 @@ 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
+#, php-format
 msgid "notice id: %s"
 msgstr "Nuevo aviso"
 
@@ -7756,7 +7749,6 @@ 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."
 
@@ -7764,3 +7756,59 @@ msgstr "No se pudo acceder a corriente pública."
 #, fuzzy
 msgid "Duplicate notice"
 msgstr "Borrar aviso"
+
+#: actions/login.php:110 actions/login.php:120
+#, fuzzy
+msgid "Invalid or expired token."
+msgstr "El contenido del aviso es inválido"
+
+#: lib/command.php:597
+#, fuzzy, php-format
+msgid "Could not create login token for %s"
+msgstr "No se pudo crear el formulario OpenID: %s"
+
+#: lib/command.php:602
+#, php-format
+msgid "This link is useable only once, and is good for only 2 minutes: %s"
+msgstr ""
+
+#: lib/imagefile.php:75
+#, fuzzy, php-format
+msgid "That file is too big. The maximum file size is %s."
+msgstr "Puedes cargar una imagen de logo para tu grupo."
+
+#: lib/command.php:613
+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"
+"login - Get a link to login to the web interface\n"
+"drop <group> - leave group\n"
+"stats - get your stats\n"
+"stop - same as 'off'\n"
+"quit - same as 'off'\n"
+"sub <nickname> - same as 'follow'\n"
+"unsub <nickname> - same as 'leave'\n"
+"last <nickname> - same as 'get'\n"
+"on <nickname> - not yet implemented.\n"
+"off <nickname> - not yet implemented.\n"
+"nudge <nickname> - remind a user to update.\n"
+"invite <phone number> - not yet implemented.\n"
+"track <word> - not yet implemented.\n"
+"untrack <word> - not yet implemented.\n"
+"track off - not yet implemented.\n"
+"untrack all - not yet implemented.\n"
+"tracks - not yet implemented.\n"
+"tracking - not yet implemented.\n"
+msgstr ""
diff --git a/locale/fi/LC_MESSAGES/statusnet.mo b/locale/fi/LC_MESSAGES/statusnet.mo
index ee82807b2..cfe1d41b9 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 816b13829..9e2165ac1 100644
--- a/locale/fi/LC_MESSAGES/statusnet.po
+++ b/locale/fi/LC_MESSAGES/statusnet.po
@@ -13,12 +13,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-06 13:16+0000\n"
-"PO-Revision-Date: 2009-11-06 15:43:34+0000\n"
+"POT-Creation-Date: 2009-11-08 11:53+0000\n"
+"PO-Revision-Date: 2009-11-08 11:56:25+0000\n"
 "Language-Team: Finnish\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r58648); Translate extension (2009-08-03)\n"
+"X-Generator: MediaWiki 1.16alpha(r58760); 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"
@@ -209,7 +209,7 @@ msgid "%s updates from everyone!"
 msgstr "%s päivitykset kaikilta!"
 
 #: ../actions/register.php:213 actions/register.php:497
-#: actions/register.php:545 actions/register.php:555
+#: actions/register.php:545 actions/register.php:555 actions/register.php:561
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -251,6 +251,7 @@ msgstr ""
 
 #: ../actions/register.php:152 actions/register.php:166
 #: actions/register.php:368 actions/register.php:414 actions/register.php:418
+#: actions/register.php:424
 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 "
@@ -269,6 +270,7 @@ 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:419 actions/register.php:423
+#: actions/register.php:429
 msgid "6 or more characters. Required."
 msgstr "6 tai useampia merkkejä. Pakollinen."
 
@@ -448,7 +450,7 @@ msgstr "Kaikki päivitykset hakuehdolla \"%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
+#: actions/login.php:79 actions/register.php:137
 msgid "Already logged in."
 msgstr "Olet jo kirjautunut sisään."
 
@@ -471,7 +473,7 @@ msgstr "Valtuuta tilaus"
 #: ../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
+#: actions/register.php:473 actions/login.php:253 actions/register.php:479
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Kirjaudu sisään automaattisesti tulevaisuudessa; ei tietokoneille joilla "
@@ -497,6 +499,7 @@ msgstr "Kuva"
 
 #: ../actions/avatar.php:113 actions/profilesettings.php:350
 #: actions/avatarsettings.php:395 actions/avatarsettings.php:346
+#: actions/avatarsettings.php:360
 msgid "Avatar updated."
 msgstr "Kuva päivitetty."
 
@@ -534,7 +537,7 @@ msgstr "Aiemmin »"
 #: 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
+#: actions/register.php:459 actions/register.php:465
 msgid "Bio"
 msgstr "Tietoja"
 
@@ -563,6 +566,7 @@ msgstr "Kuvan URL-osoitetta '%s' ei voi avata."
 #: actions/passwordsettings.php:169 actions/recoverpassword.php:347
 #: actions/passwordsettings.php:174 actions/recoverpassword.php:365
 #: actions/passwordsettings.php:180 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:185
 msgid "Can't save new password."
 msgstr "Uutta salasanaa ei voida tallentaa."
 
@@ -625,6 +629,7 @@ msgstr "Vaihda profiiliasetuksesi"
 #: actions/recoverpassword.php:236 actions/register.php:422
 #: actions/passwordsettings.php:111 actions/recoverpassword.php:239
 #: actions/register.php:426 actions/smssettings.php:134
+#: actions/register.php:432
 msgid "Confirm"
 msgstr "Vahvista"
 
@@ -654,7 +659,7 @@ msgid "Confirmation code not found."
 msgstr "Vahvistuskoodia ei löytynyt."
 
 #: ../actions/register.php:202 actions/register.php:473
-#: actions/register.php:521 actions/register.php:531
+#: actions/register.php:521 actions/register.php:531 actions/register.php:537
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -894,6 +899,7 @@ 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
+#: classes/Notice.php:1120
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Tietokantavirhe tallennettaessa vastausta: %s"
@@ -916,7 +922,8 @@ msgstr "Kuvaile itseäsi ja kiinnostuksiasi 140 merkillä"
 #: 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
+#: lib/accountsettingsaction.php:117 actions/register.php:437
+#: actions/register.php:441
 msgid "Email"
 msgstr "Sähköposti"
 
@@ -931,7 +938,7 @@ 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
+#: actions/register.php:200 actions/register.php:206 actions/register.php:212
 msgid "Email address already exists."
 msgstr "Sähköpostiosoite on jo käytössä."
 
@@ -1017,7 +1024,7 @@ msgstr "Virhe tapahtui käyttäjän tallentamisessa."
 
 #: ../actions/password.php:80 actions/profilesettings.php:399
 #: actions/passwordsettings.php:164 actions/passwordsettings.php:169
-#: actions/passwordsettings.php:175
+#: actions/passwordsettings.php:175 actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "Virhe tapahtui käyttäjän tallentamisessa; epäkelpo."
 
@@ -1029,6 +1036,7 @@ msgstr "Virhe tapahtui käyttäjän tallentamisessa; epäkelpo."
 #: actions/login.php:120 actions/recoverpassword.php:372
 #: actions/register.php:235 actions/login.php:122
 #: actions/recoverpassword.php:375 actions/register.php:242
+#: actions/login.php:149 actions/register.php:248
 msgid "Error setting user."
 msgstr "Virhe tapahtui käyttäjän asettamisessa."
 
@@ -1060,6 +1068,7 @@ msgstr "UKK"
 
 #: ../actions/avatar.php:115 actions/profilesettings.php:352
 #: actions/avatarsettings.php:397 actions/avatarsettings.php:349
+#: actions/avatarsettings.php:363
 msgid "Failed updating avatar."
 msgstr "Profiilikuvan päivittäminen epäonnistui."
 
@@ -1094,6 +1103,7 @@ msgid "Find people on this site"
 msgstr "Hae ihmisiä tältä sivustolta"
 
 #: ../actions/login.php:122 actions/login.php:247 actions/login.php:255
+#: actions/login.php:282
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -1111,6 +1121,7 @@ msgstr ""
 #: actions/showstream.php:220 lib/groupeditform.php:157
 #: actions/profilesettings.php:111 actions/register.php:441
 #: actions/showgroup.php:247 actions/showstream.php:267
+#: actions/register.php:447 lib/userprofile.php:149
 msgid "Full name"
 msgstr "Koko nimi"
 
@@ -1124,7 +1135,7 @@ msgstr "Koko nimi"
 #: 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
+#: actions/register.php:214 actions/register.php:220
 msgid "Full name is too long (max 255 chars)."
 msgstr "Koko nimi on liian pitkä (max 255 merkkiä)."
 
@@ -1145,7 +1156,7 @@ msgstr "Koti"
 #: 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
+#: actions/register.php:446 actions/register.php:452
 msgid "Homepage"
 msgstr "Kotisivu"
 
@@ -1157,7 +1168,7 @@ msgstr "Kotisivu"
 #: 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
+#: actions/register.php:211 actions/register.php:217
 msgid "Homepage is not a valid URL."
 msgstr "Kotisivun verkko-osoite ei ole toimiva."
 
@@ -1229,7 +1240,7 @@ msgstr "Väärä vanha salasana"
 
 #: ../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
+#: actions/facebookhome.php:129 actions/login.php:116 actions/login.php:143
 msgid "Incorrect username or password."
 msgstr "Väärä käyttäjätunnus tai salasana"
 
@@ -1309,6 +1320,7 @@ msgstr "Koko ei kelpaa."
 #: 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
+#: actions/register.php:243 actions/register.php:264
 msgid "Invalid username or password."
 msgstr "Käyttäjätunnus tai salasana ei kelpaa."
 
@@ -1386,7 +1398,7 @@ msgstr "Kieli on liian pitkä (max 50 merkkiä)."
 #: 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
+#: lib/profilelist.php:218 actions/register.php:470 lib/userprofile.php:164
 msgid "Location"
 msgstr "Kotipaikka"
 
@@ -1400,7 +1412,7 @@ msgstr "Kotipaikka"
 #: 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
+#: actions/register.php:221 actions/register.php:227
 msgid "Location is too long (max 255 chars)."
 msgstr "Kotipaikka on liian pitkä (max 255 merkkiä)."
 
@@ -1414,6 +1426,7 @@ msgstr "Kotipaikka on liian pitkä (max 255 merkkiä)."
 #: 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
+#: actions/login.php:204 actions/login.php:257
 #, php-format
 msgid "Login"
 msgstr "Kirjaudu sisään"
@@ -1442,12 +1455,13 @@ msgstr "Kirjaudu ulos"
 
 #: ../actions/register.php:166 actions/register.php:180
 #: actions/register.php:393 actions/register.php:439 actions/register.php:443
+#: actions/register.php:449
 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 actions/login.php:228 lib/facebookaction.php:325
-#: lib/facebookaction.php:327 actions/login.php:236
+#: lib/facebookaction.php:327 actions/login.php:236 actions/login.php:263
 msgid "Lost or forgotten password?"
 msgstr "Oletko hukannut tai unohtanut salasanasi?"
 
@@ -1492,7 +1506,7 @@ 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:487
+#: actions/register.php:477 actions/register.php:487 actions/register.php:493
 msgid "My text and files are available under "
 msgstr ""
 "Minun tekstini ja tiedostoni ovat käytettävissä seuraavan lisenssin "
@@ -1553,7 +1567,8 @@ msgstr ""
 #: 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
+#: actions/showgroup.php:236 actions/showstream.php:249 actions/login.php:246
+#: actions/register.php:423 lib/userprofile.php:131
 msgid "Nickname"
 msgstr "Tunnus"
 
@@ -1567,7 +1582,7 @@ msgstr "Tunnus"
 #: 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
+#: actions/register.php:202 actions/register.php:208
 msgid "Nickname already in use. Try another one."
 msgstr "Tunnus on jo käytössä. Yritä toista tunnusta."
 
@@ -1583,7 +1598,7 @@ msgstr "Tunnus on jo käytössä. Yritä toista tunnusta."
 #: 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
+#: actions/register.php:199 actions/register.php:205
 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 "
@@ -1824,7 +1839,8 @@ msgstr "Tuo ei ole rekisteröitynyt käyttäjä."
 #: 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
+#: lib/api.php:954 lib/api.php:982 lib/api.php:1092 lib/api.php:963
+#: lib/api.php:991 lib/api.php:1101
 msgid "Not a supported data format."
 msgstr "Tuo ei ole tuettu tietomuoto."
 
@@ -1845,7 +1861,7 @@ 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
+#: actions/register.php:189 actions/register.php:195 actions/register.php:201
 msgid "Not a valid email address."
 msgstr "Tuo ei ole kelvollinen sähköpostiosoite."
 
@@ -1857,7 +1873,7 @@ msgstr "Tuo ei ole kelvollinen sähköpostiosoite."
 #: 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
+#: actions/register.php:204 actions/register.php:210
 msgid "Not a valid nickname."
 msgstr "Tuo ei ole kelvollinen tunnus."
 
@@ -1899,6 +1915,7 @@ msgstr "Odottamaton vastaus saatu!"
 #: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
 #: actions/twitapistatuses.php:309 actions/twitapistatuses.php:327
 #: actions/twitapistatuses.php:284 actions/apistatusesupdate.php:186
+#: actions/apistatusesupdate.php:193
 msgid "Not found"
 msgstr "Ei löytynyt"
 
@@ -2045,7 +2062,8 @@ msgstr "Osittain ladattu palvelimelle."
 #: 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
+#: lib/accountsettingsaction.php:114 actions/login.php:249
+#: actions/register.php:428
 msgid "Password"
 msgstr "Salasana"
 
@@ -2074,6 +2092,7 @@ msgstr "Salasanan palautuspyyntö lähetetty."
 #: actions/passwordsettings.php:173 actions/recoverpassword.php:200
 #: actions/passwordsettings.php:178 actions/recoverpassword.php:208
 #: actions/passwordsettings.php:184 actions/recoverpassword.php:211
+#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "Salasana tallennettu."
 
@@ -2082,6 +2101,7 @@ msgstr "Salasana tallennettu."
 #: actions/passwordsettings.php:145 actions/register.php:183
 #: actions/passwordsettings.php:150 actions/register.php:220
 #: actions/passwordsettings.php:156 actions/register.php:227
+#: actions/register.php:233
 msgid "Passwords don't match."
 msgstr "Salasanat eivät täsmää."
 
@@ -2245,19 +2265,19 @@ msgstr "Tuntemattoman käyttäjän palautuskoodi"
 #: 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
+#: lib/logingroupnav.php:85 actions/register.php:114 actions/register.php:502
 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
+#: actions/register.php:129 actions/register.php:135
 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:106
+#: actions/register.php:67 actions/register.php:106 actions/register.php:112
 msgid "Registration successful"
 msgstr "Rekisteröityminen onnistui"
 
@@ -2271,6 +2291,7 @@ msgstr "Hylkää"
 #: 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
+#: actions/login.php:252 actions/register.php:477
 msgid "Remember me"
 msgstr "Muista minut"
 
@@ -2369,6 +2390,7 @@ msgstr "Sama kuin ylläoleva salasana"
 
 #: ../actions/register.php:156 actions/register.php:170
 #: actions/register.php:377 actions/register.php:423 actions/register.php:427
+#: actions/register.php:433
 msgid "Same as password above. Required."
 msgstr "Sama kuin ylläoleva salasana. Pakollinen."
 
@@ -2533,6 +2555,7 @@ msgstr "Tallennettua OpenID-tunnusta ei löytynyt."
 #: actions/remotesubscribe.php:113 actions/showstream.php:376
 #: lib/subscribeform.php:139 actions/showstream.php:345
 #: actions/remotesubscribe.php:137 actions/showstream.php:439
+#: lib/userprofile.php:321
 msgid "Subscribe"
 msgstr "Tilaa"
 
@@ -2579,6 +2602,7 @@ msgstr "Tiedoston lähetyksessä tapahtui järjestelmävirhe."
 #: actions/profilesettings.php:123 actions/showstream.php:255
 #: lib/subscriptionlist.php:106 lib/subscriptionlist.php:108
 #: actions/profilesettings.php:138 actions/showstream.php:327
+#: lib/userprofile.php:209
 msgid "Tags"
 msgstr "Tagit"
 
@@ -2800,6 +2824,7 @@ msgstr "Tämä metodi edellyttää joko POST tai DELETE sanoman."
 #: actions/apifriendshipsdestroy.php:91 actions/apigroupcreate.php:104
 #: actions/apigroupjoin.php:91 actions/apigroupleave.php:91
 #: actions/apistatusesupdate.php:109
+#: actions/apiaccountupdateprofileimage.php:84
 msgid "This method requires a POST."
 msgstr "Tämä metodi edellyttää POST sanoman."
 
@@ -2834,7 +2859,7 @@ msgstr ""
 
 #: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
 #: actions/twitapifriendships.php:132 actions/twitapifriendships.php:139
-#: actions/apifriendshipsexists.php:103
+#: actions/apifriendshipsexists.php:103 actions/apifriendshipsexists.php:94
 msgid "Two user ids or screen_names must be supplied."
 msgstr "Kaksi käyttäjätunnusta tai nimeä täytyy antaa."
 
@@ -2842,7 +2867,7 @@ msgstr "Kaksi käyttäjätunnusta tai nimeä täytyy antaa."
 #: 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
+#: actions/register.php:448 actions/register.php:454
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "Kotisivusi, blogisi tai toisella sivustolla olevan profiilisi osoite."
 
@@ -2864,6 +2889,7 @@ msgstr "Profiilisi URL-osoite toisessa yhteensopivassa mikroblogauspalvelussa"
 #: actions/twittersettings.php:322 lib/designsettings.php:301
 #: actions/emailsettings.php:255 actions/grouplogo.php:319
 #: actions/imsettings.php:220 actions/smssettings.php:248
+#: actions/avatarsettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "Odottamaton lomakkeen lähetys."
 
@@ -2977,7 +3003,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
+#: actions/register.php:436 actions/register.php:438 actions/register.php:442
 msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
 "Käytetään ainoastaan päivityksien lähettämiseen, ilmoitusasioihin ja "
@@ -3007,7 +3033,8 @@ msgstr "Käyttäjää jota seurataan ei ole olemassa."
 #: 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
+#: actions/apiusershow.php:108 actions/apiaccountupdateprofileimage.php:124
+#: actions/apiaccountupdateprofileimage.php:130
 msgid "User has no profile."
 msgstr "Käyttäjällä ei ole profiilia."
 
@@ -3036,7 +3063,7 @@ msgstr "Mitä teet juuri nyt, %s?"
 #: 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
+#: actions/register.php:466 actions/register.php:472
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Olinpaikka kuten \"Kaupunki, Maakunta (tai Lääni), Maa\""
 
@@ -3139,7 +3166,7 @@ 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/register.php:149
-#: actions/register.php:186 actions/register.php:192
+#: actions/register.php:186 actions/register.php:192 actions/register.php:198
 msgid "You can't register if you don't agree to the license."
 msgstr "Et voi rekisteröityä, jos et hyväksy lisenssiehtoja."
 
@@ -3217,56 +3244,56 @@ msgstr ""
 "yhdellä tunnuksella. Voit hallinnoida OpenID-tunnuksiasi täällä."
 
 #: ../lib/util.php:943 lib/util.php:992 lib/util.php:945 lib/util.php:756
-#: lib/util.php:770 lib/util.php:816
+#: lib/util.php:770 lib/util.php:816 lib/util.php:844
 msgid "a few seconds ago"
 msgstr "muutama sekunti sitten"
 
 #: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957 lib/util.php:768
-#: lib/util.php:782 lib/util.php:828
+#: lib/util.php:782 lib/util.php:828 lib/util.php:856
 #, 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:764
-#: lib/util.php:778 lib/util.php:824
+#: lib/util.php:778 lib/util.php:824 lib/util.php:852
 #, 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:760
-#: lib/util.php:774 lib/util.php:820
+#: lib/util.php:774 lib/util.php:820 lib/util.php:848
 #, 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:772
-#: lib/util.php:786 lib/util.php:832
+#: lib/util.php:786 lib/util.php:832 lib/util.php:860
 #, 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:766
-#: lib/util.php:780 lib/util.php:826
+#: lib/util.php:780 lib/util.php:826 lib/util.php:854
 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:758
-#: lib/util.php:772 lib/util.php:818
+#: lib/util.php:772 lib/util.php:818 lib/util.php:846
 msgid "about a minute ago"
 msgstr "noin minuutti sitten"
 
 #: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959 lib/util.php:770
-#: lib/util.php:784 lib/util.php:830
+#: lib/util.php:784 lib/util.php:830 lib/util.php:858
 msgid "about a month ago"
 msgstr "noin kuukausi sitten"
 
 #: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963 lib/util.php:774
-#: lib/util.php:788 lib/util.php:834
+#: lib/util.php:788 lib/util.php:834 lib/util.php:862
 msgid "about a year ago"
 msgstr "noin vuosi sitten"
 
 #: ../lib/util.php:949 lib/util.php:998 lib/util.php:951 lib/util.php:762
-#: lib/util.php:776 lib/util.php:822
+#: lib/util.php:776 lib/util.php:822 lib/util.php:850
 msgid "about an hour ago"
 msgstr "noin tunti sitten"
 
@@ -3335,7 +3362,9 @@ msgstr "« Myöhemmin"
 #: 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
+#: actions/userauthorization.php:52 actions/login.php:131
+#: actions/register.php:165 actions/avatarsettings.php:265
+#: lib/designsettings.php:294
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 "Istuntosi avaimen kanssa oli ongelmia. Olisitko ystävällinen ja kokeilisit "
@@ -3563,6 +3592,7 @@ 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
+#: actions/register.php:230
 msgid "Password must be 6 or more characters."
 msgstr "Salasanassa pitää olla 6 tai useampia merkkejä."
 
@@ -4114,13 +4144,13 @@ 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
+#: actions/avatarsettings.php:308 actions/avatarsettings.php:322
 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
+#: actions/grouplogo.php:377 actions/avatarsettings.php:337
 msgid "Lost our file data."
 msgstr "Tiedoston data hävisi."
 
@@ -4578,7 +4608,7 @@ msgid "%s left group %s"
 msgstr "%s erosi ryhmästä %s"
 
 #: actions/login.php:225 lib/facebookaction.php:304 actions/login.php:208
-#: actions/login.php:216
+#: actions/login.php:216 actions/login.php:243
 msgid "Login to site"
 msgstr "Kirjaudu sisään"
 
@@ -4759,7 +4789,8 @@ msgstr "Tagipilvi"
 
 #: 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
+#: actions/register.php:398 actions/register.php:85 actions/register.php:189
+#: actions/register.php:404
 msgid "Sorry, only invited people can register."
 msgstr "Valitettavasti vain kutsutut ihmiset voivat rekisteröityä."
 
@@ -4842,7 +4873,7 @@ msgstr "Ryhmän profiili"
 #: 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
+#: lib/profilelist.php:230 lib/userprofile.php:177
 msgid "URL"
 msgstr "URL"
 
@@ -4853,7 +4884,7 @@ msgstr "URL"
 #: 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
+#: lib/profilelist.php:245 lib/userprofile.php:194
 msgid "Note"
 msgstr "Huomaa"
 
@@ -4902,6 +4933,7 @@ msgid "Only the sender and recipient "
 msgstr "Vain lähettäjä ja vastaanottaja "
 
 #: actions/showstream.php:73 actions/showstream.php:78
+#: actions/showstream.php:79
 #, php-format
 msgid "%s, page %d"
 msgstr "%s, sivu %d"
@@ -4912,28 +4944,29 @@ 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
+#: actions/showstream.php:193 lib/userprofile.php:75
 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
+#: actions/showstream.php:220 lib/userprofile.php:102
 msgid "Photo"
 msgstr "Kuva"
 
 #: actions/showstream.php:317 actions/showstream.php:309
 #: actions/showstream.php:274 actions/showstream.php:354
+#: lib/userprofile.php:236
 msgid "User actions"
 msgstr "Käyttäjän toiminnot"
 
 #: actions/showstream.php:342 actions/showstream.php:307
-#: actions/showstream.php:390
+#: actions/showstream.php:390 lib/userprofile.php:272
 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:308
-#: actions/showstream.php:391
+#: actions/showstream.php:391 lib/userprofile.php:273
 msgid "Message"
 msgstr "Viesti"
 
@@ -5639,7 +5672,7 @@ msgstr "Sinä ja kaverit"
 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
+#: actions/avatarsettings.php:373 actions/avatarsettings.php:387
 msgid "Avatar deleted."
 msgstr "Kuva poistettu."
 
@@ -5778,10 +5811,12 @@ msgid ""
 msgstr ""
 
 #: actions/register.php:432 actions/register.php:479 actions/register.php:489
+#: actions/register.php:495
 msgid "Creative Commons Attribution 3.0"
 msgstr ""
 
 #: actions/register.php:433 actions/register.php:480 actions/register.php:490
+#: actions/register.php:496
 #, fuzzy
 msgid ""
 " except this private data: password, email address, IM address, and phone "
@@ -5818,44 +5853,48 @@ msgid "%s's profile"
 msgstr "nimisen käyttäjän profiili"
 
 #: actions/showstream.php:163 actions/showstream.php:128
+#: actions/showstream.php:129
 #, 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
+#: actions/showstream.php:136
 #, 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
+#: actions/showstream.php:143
 #, 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
+#: actions/showstream.php:148
 #, 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
+#: actions/showstream.php:234 lib/userprofile.php:116
 #, fuzzy
 msgid "Edit Avatar"
 msgstr "Kuva"
 
 #: actions/showstream.php:316 actions/showstream.php:281
-#: actions/showstream.php:366
+#: actions/showstream.php:366 lib/userprofile.php:248
 #, fuzzy
 msgid "Edit profile settings"
 msgstr "Profiiliasetukset"
 
 #: actions/showstream.php:317 actions/showstream.php:282
-#: actions/showstream.php:367
+#: actions/showstream.php:367 lib/userprofile.php:249
 msgid "Edit"
 msgstr ""
 
 #: actions/showstream.php:542 actions/showstream.php:388
-#: actions/showstream.php:487
+#: actions/showstream.php:487 actions/showstream.php:234
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5900,6 +5939,9 @@ msgstr ""
 #: actions/apistatusesupdate.php:125 actions/apisubscriptions.php:87
 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#: actions/apiaccountupdateprofileimage.php:91
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apistatusesupdate.php:139
 #, fuzzy
 msgid "No such user!"
 msgstr "Tuota käyttäjää ei ole."
@@ -5961,36 +6003,6 @@ msgid ""
 "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 ""
@@ -6159,6 +6171,7 @@ 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
+#: actions/showstream.php:202
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -6340,7 +6353,8 @@ 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
+#: lib/designsettings.php:461 lib/designsettings.php:434
+#: lib/designsettings.php:464
 #, fuzzy
 msgid "Couldn't update your design."
 msgstr "Ei voitu päivittää käyttäjää."
@@ -6436,7 +6450,9 @@ msgid "Message sent"
 msgstr "Viesti"
 
 #: actions/newnotice.php:93 lib/designsettings.php:281
-#: actions/newnotice.php:94
+#: actions/newnotice.php:94 actions/apiaccountupdateprofileimage.php:97
+#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254
+#: lib/designsettings.php:283
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s bytes) due to its "
@@ -6606,7 +6622,7 @@ msgstr "Sinut on tunnistettu. Syötä  uusi salasana alle. "
 msgid "Password recover"
 msgstr "Salasanan palautuspyyntö lähetetty."
 
-#: actions/register.php:86
+#: actions/register.php:86 actions/register.php:92
 #, fuzzy
 msgid "Sorry, invalid invitation code."
 msgstr "Virhe vahvistuskoodin kanssa."
@@ -6708,28 +6724,31 @@ msgstr "Ylläpito"
 msgid "Not a local notice"
 msgstr "Käyttäjä ei ole rekisteröitynyt tähän palveluun."
 
-#: actions/showstream.php:72
+#: actions/showstream.php:72 actions/showstream.php:73
 #, fuzzy, php-format
 msgid " tagged %s"
 msgstr "Päivitykset joilla on tagi %s"
 
-#: actions/showstream.php:121
+#: actions/showstream.php:121 actions/showstream.php:122
 #, 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
+#: actions/showstream.php:191
 #, 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
+#: actions/showstream.php:196
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
 msgstr ""
 
 #: actions/showstream.php:357 actions/showstream.php:451
+#: actions/showstream.php:198
 #, php-format
 msgid ""
 "You can try to nudge %s or [post something to his or her attention](%%%%"
@@ -6737,6 +6756,7 @@ msgid ""
 msgstr ""
 
 #: actions/showstream.php:393 actions/showstream.php:492
+#: actions/showstream.php:239
 #, fuzzy, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -6889,6 +6909,7 @@ msgid "Problem saving notice. Too long."
 msgstr "Ongelma päivityksen tallentamisessa."
 
 #: classes/User.php:319 classes/User.php:327 classes/User.php:334
+#: classes/User.php:333
 #, fuzzy, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "Viesti käyttäjälle %1$s, %2$s"
@@ -6999,10 +7020,12 @@ msgid "Save design"
 msgstr ""
 
 #: lib/designsettings.php:378 lib/designsettings.php:369
+#: lib/designsettings.php:372
 msgid "Bad default color settings: "
 msgstr ""
 
 #: lib/designsettings.php:474 lib/designsettings.php:465
+#: lib/designsettings.php:468
 msgid "Design defaults restored."
 msgstr ""
 
@@ -7209,16 +7232,18 @@ msgid "Status deleted."
 msgstr "Kuva poistettu."
 
 #: actions/apistatusesupdate.php:132
+#: actions/apiaccountupdateprofileimage.php:99
 msgid "Unable to handle that much POST data!"
 msgstr ""
 
 #: actions/apistatusesupdate.php:145 actions/newnotice.php:155
-#: scripts/maildaemon.php:71
+#: scripts/maildaemon.php:71 actions/apistatusesupdate.php:152
 #, 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
+#: actions/apistatusesupdate.php:216
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
@@ -7283,7 +7308,7 @@ msgstr "Käyttäjän %1$s päivitykset palvelussa %2$s!"
 msgid "IM is not available."
 msgstr "Tämä sivu ei ole saatavilla "
 
-#: actions/login.php:259
+#: actions/login.php:259 actions/login.php:286
 #, fuzzy, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -7318,21 +7343,24 @@ msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
 msgstr ""
 
 #: actions/profilesettings.php:122 actions/register.php:454
+#: actions/register.php:460
 #, 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
+#: actions/register.php:463
 #, fuzzy
 msgid "Describe yourself and your interests"
 msgstr "Kuvaile itseäsi ja"
 
 #: actions/profilesettings.php:221 actions/register.php:217
+#: actions/register.php:223
 #, fuzzy, php-format
 msgid "Bio is too long (max %d chars)."
 msgstr "\"Tietoja\" on liian pitkä (max 140 merkkiä)."
 
-#: actions/register.php:336
+#: actions/register.php:336 actions/register.php:342
 msgid ""
 "With this form you can create  a new account. You can then post notices and "
 "link up to friends and colleagues. "
@@ -7368,7 +7396,7 @@ 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
+#, php-format
 msgid "Replies feed for %s (Atom)"
 msgstr "Päivityksien syöte käyttäjälle %s"
 
@@ -7378,17 +7406,17 @@ 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
+#, 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
+#, 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
+#, php-format
 msgid "Feed for favorites of %s (Atom)"
 msgstr "Käyttäjän %s kavereiden syöte (Atom)"
 
@@ -7401,7 +7429,7 @@ msgid ""
 msgstr ""
 
 #: actions/showgroup.php:345
-#, fuzzy, php-format
+#, php-format
 msgid "FOAF for %s group"
 msgstr "Käyttäjän %s lähetetyt viestit"
 
@@ -7540,41 +7568,6 @@ msgstr "Vastaa tähän päivitykseen"
 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. "
@@ -7609,7 +7602,7 @@ msgid "Describe the group or topic in %d characters"
 msgstr "Kuvaile ryhmää tai aihetta 140 merkillä"
 
 #: lib/jabber.php:192
-#, fuzzy, php-format
+#, php-format
 msgid "notice id: %s"
 msgstr "Uusi päivitys"
 
@@ -7669,7 +7662,6 @@ 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."
 
@@ -7677,3 +7669,59 @@ msgstr "Julkista päivitysvirtaa ei saatu."
 #, fuzzy
 msgid "Duplicate notice"
 msgstr "Poista päivitys"
+
+#: actions/login.php:110 actions/login.php:120
+#, fuzzy
+msgid "Invalid or expired token."
+msgstr "Päivityksen sisältö ei kelpaa"
+
+#: lib/command.php:597
+#, fuzzy, php-format
+msgid "Could not create login token for %s"
+msgstr "Ei voitu luoda OpenID lomaketta: %s"
+
+#: lib/command.php:602
+#, php-format
+msgid "This link is useable only once, and is good for only 2 minutes: %s"
+msgstr ""
+
+#: lib/imagefile.php:75
+#, fuzzy, php-format
+msgid "That file is too big. The maximum file size is %s."
+msgstr "Voit ladata ryhmälle logon."
+
+#: lib/command.php:613
+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"
+"login - Get a link to login to the web interface\n"
+"drop <group> - leave group\n"
+"stats - get your stats\n"
+"stop - same as 'off'\n"
+"quit - same as 'off'\n"
+"sub <nickname> - same as 'follow'\n"
+"unsub <nickname> - same as 'leave'\n"
+"last <nickname> - same as 'get'\n"
+"on <nickname> - not yet implemented.\n"
+"off <nickname> - not yet implemented.\n"
+"nudge <nickname> - remind a user to update.\n"
+"invite <phone number> - not yet implemented.\n"
+"track <word> - not yet implemented.\n"
+"untrack <word> - not yet implemented.\n"
+"track off - not yet implemented.\n"
+"untrack all - not yet implemented.\n"
+"tracks - not yet implemented.\n"
+"tracking - not yet implemented.\n"
+msgstr ""
diff --git a/locale/fr/LC_MESSAGES/statusnet.mo b/locale/fr/LC_MESSAGES/statusnet.mo
index c85377e96..4ae3f35bb 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 6e10e917c..2d6d29d9b 100644
--- a/locale/fr/LC_MESSAGES/statusnet.po
+++ b/locale/fr/LC_MESSAGES/statusnet.po
@@ -7,12 +7,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-06 13:16+0000\n"
-"PO-Revision-Date: 2009-11-06 15:43:37+0000\n"
+"POT-Creation-Date: 2009-11-08 11:53+0000\n"
+"PO-Revision-Date: 2009-11-08 11:56:28+0000\n"
 "Language-Team: French\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r58648); Translate extension (2009-08-03)\n"
+"X-Generator: MediaWiki 1.16alpha(r58760); 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"
@@ -205,7 +205,7 @@ msgid "%s updates from everyone!"
 msgstr "%s statuts  "
 
 #: ../actions/register.php:213 actions/register.php:497
-#: actions/register.php:545 actions/register.php:555
+#: actions/register.php:545 actions/register.php:555 actions/register.php:561
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -244,6 +244,7 @@ msgstr "1 à 64 lettres minuscules ou chiffres, sans ponctuation ni espaces"
 
 #: ../actions/register.php:152 actions/register.php:166
 #: actions/register.php:368 actions/register.php:414 actions/register.php:418
+#: actions/register.php:424
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr ""
 "1 à 64 lettres minuscules ou chiffres, sans ponctuation ni espaces. Requis."
@@ -261,6 +262,7 @@ 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:419 actions/register.php:423
+#: actions/register.php:429
 msgid "6 or more characters. Required."
 msgstr "6 caractères ou plus. Requis."
 
@@ -439,7 +441,7 @@ msgstr "Statuts correspondant au(x) terme(s) \"%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
+#: actions/login.php:79 actions/register.php:137
 msgid "Already logged in."
 msgstr "Déjà connecté."
 
@@ -462,7 +464,7 @@ msgstr "Autoriser l'abonnement"
 #: ../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
+#: actions/register.php:473 actions/login.php:253 actions/register.php:479
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Ouvrir automatiquement ma session à l'avenir (déconseillé pour les "
@@ -488,6 +490,7 @@ msgstr "Avatar"
 
 #: ../actions/avatar.php:113 actions/profilesettings.php:350
 #: actions/avatarsettings.php:395 actions/avatarsettings.php:346
+#: actions/avatarsettings.php:360
 msgid "Avatar updated."
 msgstr "Avatar mis à jour."
 
@@ -524,7 +527,7 @@ msgstr "Avant »"
 #: 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
+#: actions/register.php:459 actions/register.php:465
 msgid "Bio"
 msgstr "Bio"
 
@@ -553,6 +556,7 @@ msgstr "Impossible de lire l'URL '%s'"
 #: actions/passwordsettings.php:169 actions/recoverpassword.php:347
 #: actions/passwordsettings.php:174 actions/recoverpassword.php:365
 #: actions/passwordsettings.php:180 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:185
 msgid "Can't save new password."
 msgstr "Impossible de sauvegarder le nouveau mot de passe."
 
@@ -615,6 +619,7 @@ msgstr "Modifier vos paramètres de profil"
 #: actions/recoverpassword.php:236 actions/register.php:422
 #: actions/passwordsettings.php:111 actions/recoverpassword.php:239
 #: actions/register.php:426 actions/smssettings.php:134
+#: actions/register.php:432
 msgid "Confirm"
 msgstr "Confirmer"
 
@@ -644,7 +649,7 @@ msgid "Confirmation code not found."
 msgstr "Code de confirmation non trouvé."
 
 #: ../actions/register.php:202 actions/register.php:473
-#: actions/register.php:521 actions/register.php:531
+#: actions/register.php:521 actions/register.php:531 actions/register.php:537
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -884,6 +889,7 @@ 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
 #: classes/Notice.php:757 classes/Notice.php:1042 classes/Notice.php:1117
+#: classes/Notice.php:1120
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Erreur de base de donnée en insérant la réponse :%s"
@@ -906,7 +912,8 @@ msgstr "Décrivez vos intérêts en 140 caractères"
 #: 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
+#: lib/accountsettingsaction.php:117 actions/register.php:437
+#: actions/register.php:441
 msgid "Email"
 msgstr "Courriel"
 
@@ -921,7 +928,7 @@ msgid "Email Settings"
 msgstr "Paramètres du courriel"
 
 #: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
-#: actions/register.php:200 actions/register.php:206
+#: actions/register.php:200 actions/register.php:206 actions/register.php:212
 msgid "Email address already exists."
 msgstr "Cette adresse courriel est déjà utilisée."
 
@@ -1007,7 +1014,7 @@ msgstr "Erreur lors de l'enregistrement de l'utilisateur."
 
 #: ../actions/password.php:80 actions/profilesettings.php:399
 #: actions/passwordsettings.php:164 actions/passwordsettings.php:169
-#: actions/passwordsettings.php:175
+#: actions/passwordsettings.php:175 actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "Erreur lors de l'enregistrement de l'utilisateur ; invalide."
 
@@ -1019,6 +1026,7 @@ msgstr "Erreur lors de l'enregistrement de l'utilisateur ; invalide."
 #: actions/login.php:120 actions/recoverpassword.php:372
 #: actions/register.php:235 actions/login.php:122
 #: actions/recoverpassword.php:375 actions/register.php:242
+#: actions/login.php:149 actions/register.php:248
 msgid "Error setting user."
 msgstr "Erreur lors de la configuration de l'utilisateur."
 
@@ -1050,6 +1058,7 @@ msgstr "FAQ"
 
 #: ../actions/avatar.php:115 actions/profilesettings.php:352
 #: actions/avatarsettings.php:397 actions/avatarsettings.php:349
+#: actions/avatarsettings.php:363
 msgid "Failed updating avatar."
 msgstr "La mise à jour de l'avatar a échoué."
 
@@ -1084,6 +1093,7 @@ msgid "Find people on this site"
 msgstr "Chercher des personnes sur ce site"
 
 #: ../actions/login.php:122 actions/login.php:247 actions/login.php:255
+#: actions/login.php:282
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -1101,6 +1111,7 @@ msgstr ""
 #: actions/showstream.php:220 lib/groupeditform.php:157
 #: actions/profilesettings.php:111 actions/register.php:441
 #: actions/showgroup.php:247 actions/showstream.php:267
+#: actions/register.php:447 lib/userprofile.php:149
 msgid "Full name"
 msgstr "Nom complet"
 
@@ -1114,7 +1125,7 @@ msgstr "Nom complet"
 #: 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
+#: actions/register.php:214 actions/register.php:220
 msgid "Full name is too long (max 255 chars)."
 msgstr "Nom complet trop long (maximum de 255 caractères)."
 
@@ -1135,7 +1146,7 @@ msgstr "Accueil"
 #: 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
+#: actions/register.php:446 actions/register.php:452
 msgid "Homepage"
 msgstr "Site personnel"
 
@@ -1147,7 +1158,7 @@ msgstr "Site personnel"
 #: 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
+#: actions/register.php:211 actions/register.php:217
 msgid "Homepage is not a valid URL."
 msgstr "L'adresse du site personnel n'est pas un URL valide. "
 
@@ -1219,7 +1230,7 @@ msgstr "Ancien mot de passe incorrect"
 
 #: ../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
+#: actions/facebookhome.php:129 actions/login.php:116 actions/login.php:143
 msgid "Incorrect username or password."
 msgstr "Identifiant ou mot de passe incorrect."
 
@@ -1299,6 +1310,7 @@ msgstr "Taille incorrecte."
 #: 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
+#: actions/register.php:243 actions/register.php:264
 msgid "Invalid username or password."
 msgstr "Identifiant ou mot de passe incorrect."
 
@@ -1376,7 +1388,7 @@ msgstr "La langue est trop longue (255 caractères maximum)."
 #: 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
+#: lib/profilelist.php:218 actions/register.php:470 lib/userprofile.php:164
 msgid "Location"
 msgstr "Emplacement"
 
@@ -1390,7 +1402,7 @@ msgstr "Emplacement"
 #: 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
+#: actions/register.php:221 actions/register.php:227
 msgid "Location is too long (max 255 chars)."
 msgstr "Emplacement trop long (maximum de 255 caractères)."
 
@@ -1404,6 +1416,7 @@ msgstr "Emplacement trop long (maximum de 255 caractères)."
 #: 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
+#: actions/login.php:204 actions/login.php:257
 #, php-format
 msgid "Login"
 msgstr "Ouvrir une session"
@@ -1432,12 +1445,13 @@ msgstr "Fermeture de session"
 
 #: ../actions/register.php:166 actions/register.php:180
 #: actions/register.php:393 actions/register.php:439 actions/register.php:443
+#: actions/register.php:449
 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:228 lib/facebookaction.php:325
-#: lib/facebookaction.php:327 actions/login.php:236
+#: lib/facebookaction.php:327 actions/login.php:236 actions/login.php:263
 msgid "Lost or forgotten password?"
 msgstr "Mot de passe perdu ?"
 
@@ -1480,7 +1494,7 @@ 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:487
+#: actions/register.php:477 actions/register.php:487 actions/register.php:493
 msgid "My text and files are available under "
 msgstr "Mes textes et mes fichiers sont disponibles sous"
 
@@ -1539,7 +1553,8 @@ msgstr ""
 #: 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
+#: actions/showgroup.php:236 actions/showstream.php:249 actions/login.php:246
+#: actions/register.php:423 lib/userprofile.php:131
 msgid "Nickname"
 msgstr "Pseudo"
 
@@ -1553,7 +1568,7 @@ msgstr "Pseudo"
 #: 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
+#: actions/register.php:202 actions/register.php:208
 msgid "Nickname already in use. Try another one."
 msgstr "Pseudo déjà utilisé. Essayez-en un autre."
 
@@ -1569,7 +1584,7 @@ msgstr "Pseudo déjà utilisé. Essayez-en un autre."
 #: 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
+#: actions/register.php:199 actions/register.php:205
 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 "
@@ -1810,7 +1825,8 @@ msgstr "Ceci n'est pas un utilisateur inscrit."
 #: 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
+#: lib/api.php:954 lib/api.php:982 lib/api.php:1092 lib/api.php:963
+#: lib/api.php:991 lib/api.php:1101
 msgid "Not a supported data format."
 msgstr "Format de données non supporté."
 
@@ -1831,7 +1847,7 @@ 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:189 actions/register.php:195
+#: actions/register.php:189 actions/register.php:195 actions/register.php:201
 msgid "Not a valid email address."
 msgstr "Adresse courriel invalide."
 
@@ -1843,7 +1859,7 @@ msgstr "Adresse courriel invalide."
 #: 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
+#: actions/register.php:204 actions/register.php:210
 msgid "Not a valid nickname."
 msgstr "Pseudo invalide."
 
@@ -1882,6 +1898,7 @@ msgstr "Réponse inattendue !"
 #: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
 #: actions/twitapistatuses.php:309 actions/twitapistatuses.php:327
 #: actions/twitapistatuses.php:284 actions/apistatusesupdate.php:186
+#: actions/apistatusesupdate.php:193
 msgid "Not found"
 msgstr "Non trouvé"
 
@@ -2028,7 +2045,8 @@ msgstr "Transfert partiel."
 #: 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
+#: lib/accountsettingsaction.php:114 actions/login.php:249
+#: actions/register.php:428
 msgid "Password"
 msgstr "Mot de passe"
 
@@ -2057,6 +2075,7 @@ msgstr "Récupération de mot de passe demandée"
 #: actions/passwordsettings.php:173 actions/recoverpassword.php:200
 #: actions/passwordsettings.php:178 actions/recoverpassword.php:208
 #: actions/passwordsettings.php:184 actions/recoverpassword.php:211
+#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "Mot de passe enregistré."
 
@@ -2065,6 +2084,7 @@ msgstr "Mot de passe enregistré."
 #: actions/passwordsettings.php:145 actions/register.php:183
 #: actions/passwordsettings.php:150 actions/register.php:220
 #: actions/passwordsettings.php:156 actions/register.php:227
+#: actions/register.php:233
 msgid "Passwords don't match."
 msgstr "Les mots de passe ne correspondent pas."
 
@@ -2230,19 +2250,19 @@ msgstr "Code de récupération d'un utilisateur inconnu."
 #: 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
+#: lib/logingroupnav.php:85 actions/register.php:114 actions/register.php:502
 msgid "Register"
 msgstr "Créer un compte"
 
 #: ../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
+#: actions/register.php:129 actions/register.php:135
 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:106
+#: actions/register.php:67 actions/register.php:106 actions/register.php:112
 msgid "Registration successful"
 msgstr "Compte créé avec succès"
 
@@ -2256,6 +2276,7 @@ msgstr "Refuser"
 #: 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
+#: actions/login.php:252 actions/register.php:477
 msgid "Remember me"
 msgstr "Se souvenir de moi"
 
@@ -2354,6 +2375,7 @@ msgstr "Identique au mot de passe ci-dessus"
 
 #: ../actions/register.php:156 actions/register.php:170
 #: actions/register.php:377 actions/register.php:423 actions/register.php:427
+#: actions/register.php:433
 msgid "Same as password above. Required."
 msgstr "Identique au mot de passe ci-dessus. Requis."
 
@@ -2518,6 +2540,7 @@ msgstr "OpenID non trouvé."
 #: actions/remotesubscribe.php:113 actions/showstream.php:376
 #: lib/subscribeform.php:139 actions/showstream.php:345
 #: actions/remotesubscribe.php:137 actions/showstream.php:439
+#: lib/userprofile.php:321
 msgid "Subscribe"
 msgstr "S'abonner"
 
@@ -2564,6 +2587,7 @@ msgstr "Erreur système lors du transfert du fichier."
 #: actions/profilesettings.php:123 actions/showstream.php:255
 #: lib/subscriptionlist.php:106 lib/subscriptionlist.php:108
 #: actions/profilesettings.php:138 actions/showstream.php:327
+#: lib/userprofile.php:209
 msgid "Tags"
 msgstr "Marquages"
 
@@ -2784,6 +2808,7 @@ msgstr "Ce processus requiert un POST ou un DELETE."
 #: actions/apifriendshipsdestroy.php:91 actions/apigroupcreate.php:104
 #: actions/apigroupjoin.php:91 actions/apigroupleave.php:91
 #: actions/apistatusesupdate.php:109
+#: actions/apiaccountupdateprofileimage.php:84
 msgid "This method requires a POST."
 msgstr "Ce processus requiert un POST."
 
@@ -2819,7 +2844,7 @@ msgstr ""
 
 #: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
 #: actions/twitapifriendships.php:132 actions/twitapifriendships.php:139
-#: actions/apifriendshipsexists.php:103
+#: actions/apifriendshipsexists.php:103 actions/apifriendshipsexists.php:94
 msgid "Two user ids or screen_names must be supplied."
 msgstr "Vous devez fournir 2 identifiants ou pseudos."
 
@@ -2827,7 +2852,7 @@ msgstr "Vous devez fournir 2 identifiants ou pseudos."
 #: 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
+#: actions/register.php:448 actions/register.php:454
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "Adresse de votre site Web, blogue, ou profil dans un autre site"
 
@@ -2849,6 +2874,7 @@ msgstr "URL de votre profil sur un autre service de micro-blogging compatible"
 #: actions/twittersettings.php:322 lib/designsettings.php:301
 #: actions/emailsettings.php:255 actions/grouplogo.php:319
 #: actions/imsettings.php:220 actions/smssettings.php:248
+#: actions/avatarsettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "Soumission de formulaire inattendue."
 
@@ -2962,7 +2988,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
+#: actions/register.php:436 actions/register.php:438 actions/register.php:442
 msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
 "Utilisé uniquement pour les mises à jour de statut, les avertissements, et "
@@ -2992,7 +3018,8 @@ msgstr "L'utilisateur suivi n'existe pas."
 #: 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
+#: actions/apiusershow.php:108 actions/apiaccountupdateprofileimage.php:124
+#: actions/apiaccountupdateprofileimage.php:130
 msgid "User has no profile."
 msgstr "Aucun profil ne correspond à cet utilisateur."
 
@@ -3021,7 +3048,7 @@ msgstr "Quoi de neuf, %s ?"
 #: 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
+#: actions/register.php:466 actions/register.php:472
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Indiquez votre emplacement, ex.: \"Ville, État (ou région), Pays\""
 
@@ -3128,7 +3155,7 @@ 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/register.php:149
-#: actions/register.php:186 actions/register.php:192
+#: actions/register.php:186 actions/register.php:192 actions/register.php:198
 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."
 
@@ -3209,56 +3236,56 @@ msgstr ""
 "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:756
-#: lib/util.php:770 lib/util.php:816
+#: lib/util.php:770 lib/util.php:816 lib/util.php:844
 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:768
-#: lib/util.php:782 lib/util.php:828
+#: lib/util.php:782 lib/util.php:828 lib/util.php:856
 #, 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:764
-#: lib/util.php:778 lib/util.php:824
+#: lib/util.php:778 lib/util.php:824 lib/util.php:852
 #, 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:760
-#: lib/util.php:774 lib/util.php:820
+#: lib/util.php:774 lib/util.php:820 lib/util.php:848
 #, 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:772
-#: lib/util.php:786 lib/util.php:832
+#: lib/util.php:786 lib/util.php:832 lib/util.php:860
 #, 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:766
-#: lib/util.php:780 lib/util.php:826
+#: lib/util.php:780 lib/util.php:826 lib/util.php:854
 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:758
-#: lib/util.php:772 lib/util.php:818
+#: lib/util.php:772 lib/util.php:818 lib/util.php:846
 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:770
-#: lib/util.php:784 lib/util.php:830
+#: lib/util.php:784 lib/util.php:830 lib/util.php:858
 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:774
-#: lib/util.php:788 lib/util.php:834
+#: lib/util.php:788 lib/util.php:834 lib/util.php:862
 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:762
-#: lib/util.php:776 lib/util.php:822
+#: lib/util.php:776 lib/util.php:822 lib/util.php:850
 msgid "about an hour ago"
 msgstr "il y a 1 heure"
 
@@ -3327,7 +3354,9 @@ msgstr "« Après"
 #: 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
+#: actions/userauthorization.php:52 actions/login.php:131
+#: actions/register.php:165 actions/avatarsettings.php:265
+#: lib/designsettings.php:294
 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 à "
@@ -3562,6 +3591,7 @@ msgstr "Votre nouveau mot de passe a été enregistré avec succès."
 #: actions/register.php:95 actions/register.php:180
 #: actions/passwordsettings.php:147 actions/register.php:217
 #: actions/passwordsettings.php:153 actions/register.php:224
+#: actions/register.php:230
 msgid "Password must be 6 or more characters."
 msgstr "Votre mot de passe doit contenir au moins 6 caractères."
 
@@ -4121,13 +4151,13 @@ 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:308
+#: actions/avatarsettings.php:308 actions/avatarsettings.php:322
 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:323 actions/grouplogo.php:382
-#: actions/grouplogo.php:377
+#: actions/grouplogo.php:377 actions/avatarsettings.php:337
 msgid "Lost our file data."
 msgstr "Données perdues."
 
@@ -4594,7 +4624,7 @@ msgid "%s left group %s"
 msgstr "%s a quitté le groupe %s"
 
 #: actions/login.php:225 lib/facebookaction.php:304 actions/login.php:208
-#: actions/login.php:216
+#: actions/login.php:216 actions/login.php:243
 msgid "Login to site"
 msgstr "Ouverture de session"
 
@@ -4776,7 +4806,8 @@ msgstr "Marquages "
 
 #: 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
+#: actions/register.php:398 actions/register.php:85 actions/register.php:189
+#: actions/register.php:404
 msgid "Sorry, only invited people can register."
 msgstr "Désolé ! Seules les personnes invitées peuvent s'inscrire."
 
@@ -4866,7 +4897,7 @@ msgstr "Profil du groupe"
 #: 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
+#: lib/profilelist.php:230 lib/userprofile.php:177
 msgid "URL"
 msgstr "URL"
 
@@ -4877,7 +4908,7 @@ msgstr "URL"
 #: 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
+#: lib/profilelist.php:245 lib/userprofile.php:194
 msgid "Note"
 msgstr "Note"
 
@@ -4926,6 +4957,7 @@ msgid "Only the sender and recipient "
 msgstr "Expéditeur et destinataire seulement "
 
 #: actions/showstream.php:73 actions/showstream.php:78
+#: actions/showstream.php:79
 #, php-format
 msgid "%s, page %d"
 msgstr "%s - page %d"
@@ -4937,28 +4969,29 @@ msgstr " - Profil"
 
 #: actions/showstream.php:236 actions/tagother.php:77
 #: actions/showstream.php:220 actions/showstream.php:185
-#: actions/showstream.php:193
+#: actions/showstream.php:193 lib/userprofile.php:75
 msgid "User profile"
 msgstr "Profil de l'utilisateur"
 
 #: actions/showstream.php:240 actions/tagother.php:81
 #: actions/showstream.php:224 actions/showstream.php:189
-#: actions/showstream.php:220
+#: actions/showstream.php:220 lib/userprofile.php:102
 msgid "Photo"
 msgstr "Photo"
 
 #: actions/showstream.php:317 actions/showstream.php:309
 #: actions/showstream.php:274 actions/showstream.php:354
+#: lib/userprofile.php:236
 msgid "User actions"
 msgstr "Actions de l'utilisateur"
 
 #: actions/showstream.php:342 actions/showstream.php:307
-#: actions/showstream.php:390
+#: actions/showstream.php:390 lib/userprofile.php:272
 msgid "Send a direct message to this user"
 msgstr "Envoyer un message à cet utilisateur"
 
 #: actions/showstream.php:343 actions/showstream.php:308
-#: actions/showstream.php:391
+#: actions/showstream.php:391 lib/userprofile.php:273
 msgid "Message"
 msgstr "Message "
 
@@ -5666,7 +5699,7 @@ msgstr "Vous et vos amis"
 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
+#: actions/avatarsettings.php:373 actions/avatarsettings.php:387
 msgid "Avatar deleted."
 msgstr "Avatar supprimé."
 
@@ -5816,10 +5849,12 @@ msgid ""
 msgstr ""
 
 #: actions/register.php:432 actions/register.php:479 actions/register.php:489
+#: actions/register.php:495
 msgid "Creative Commons Attribution 3.0"
 msgstr "Creative Commons Paternité 3.0"
 
 #: actions/register.php:433 actions/register.php:480 actions/register.php:490
+#: actions/register.php:496
 #, fuzzy
 msgid ""
 " except this private data: password, email address, IM address, and phone "
@@ -5854,42 +5889,46 @@ msgid "%s's profile"
 msgstr "Profil de %s"
 
 #: actions/showstream.php:163 actions/showstream.php:128
+#: actions/showstream.php:129
 #, 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
+#: actions/showstream.php:136
 #, 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
+#: actions/showstream.php:143
 #, fuzzy, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "Flux des statuts de %s"
 
 #: actions/showstream.php:182 actions/showstream.php:147
+#: actions/showstream.php:148
 #, 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
+#: actions/showstream.php:234 lib/userprofile.php:116
 msgid "Edit Avatar"
 msgstr "Modifier l'avatar"
 
 #: actions/showstream.php:316 actions/showstream.php:281
-#: actions/showstream.php:366
+#: actions/showstream.php:366 lib/userprofile.php:248
 msgid "Edit profile settings"
 msgstr "Modifier les paramètres du profil"
 
 #: actions/showstream.php:317 actions/showstream.php:282
-#: actions/showstream.php:367
+#: actions/showstream.php:367 lib/userprofile.php:249
 msgid "Edit"
 msgstr "Modifier"
 
 #: actions/showstream.php:542 actions/showstream.php:388
-#: actions/showstream.php:487
+#: actions/showstream.php:487 actions/showstream.php:234
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5947,6 +5986,9 @@ msgstr ""
 #: actions/apistatusesupdate.php:125 actions/apisubscriptions.php:87
 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#: actions/apiaccountupdateprofileimage.php:91
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apistatusesupdate.php:139
 msgid "No such user!"
 msgstr "Aucun utilisateur n'a été trouvé !"
 
@@ -6011,36 +6053,6 @@ msgstr ""
 "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"
@@ -6221,6 +6233,7 @@ 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
+#: actions/showstream.php:202
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -6394,7 +6407,8 @@ 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
+#: lib/designsettings.php:461 lib/designsettings.php:434
+#: lib/designsettings.php:464
 #, fuzzy
 msgid "Couldn't update your design."
 msgstr "Impossible de mettre à jour l'utilisateur."
@@ -6487,7 +6501,9 @@ msgid "Message sent"
 msgstr "Message envoyé"
 
 #: actions/newnotice.php:93 lib/designsettings.php:281
-#: actions/newnotice.php:94
+#: actions/newnotice.php:94 actions/apiaccountupdateprofileimage.php:97
+#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254
+#: lib/designsettings.php:283
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s bytes) due to its "
@@ -6657,7 +6673,7 @@ msgstr ""
 msgid "Password recover"
 msgstr "Récupération de mot de passe"
 
-#: actions/register.php:86
+#: actions/register.php:86 actions/register.php:92
 #, fuzzy
 msgid "Sorry, invalid invitation code."
 msgstr "Erreur dans le code de confirmation."
@@ -6758,28 +6774,31 @@ msgstr "Administrateurs"
 msgid "Not a local notice"
 msgstr "Ceci n'est pas un utilisateur local."
 
-#: actions/showstream.php:72
+#: actions/showstream.php:72 actions/showstream.php:73
 #, fuzzy, php-format
 msgid " tagged %s"
 msgstr "Statuts marqués avec %s"
 
-#: actions/showstream.php:121
+#: actions/showstream.php:121 actions/showstream.php:122
 #, 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
+#: actions/showstream.php:191
 #, 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
+#: actions/showstream.php:196
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
 msgstr ""
 
 #: actions/showstream.php:357 actions/showstream.php:451
+#: actions/showstream.php:198
 #, php-format
 msgid ""
 "You can try to nudge %s or [post something to his or her attention](%%%%"
@@ -6787,6 +6806,7 @@ msgid ""
 msgstr ""
 
 #: actions/showstream.php:393 actions/showstream.php:492
+#: actions/showstream.php:239
 #, fuzzy, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -6933,6 +6953,7 @@ 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
+#: classes/User.php:333
 #, fuzzy, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "Message adressé à %1$s le %2$s"
@@ -7037,10 +7058,12 @@ msgid "Save design"
 msgstr ""
 
 #: lib/designsettings.php:378 lib/designsettings.php:369
+#: lib/designsettings.php:372
 msgid "Bad default color settings: "
 msgstr ""
 
 #: lib/designsettings.php:474 lib/designsettings.php:465
+#: lib/designsettings.php:468
 msgid "Design defaults restored."
 msgstr ""
 
@@ -7243,16 +7266,18 @@ msgid "Status deleted."
 msgstr "Avatar supprimé."
 
 #: actions/apistatusesupdate.php:132
+#: actions/apiaccountupdateprofileimage.php:99
 msgid "Unable to handle that much POST data!"
 msgstr ""
 
 #: actions/apistatusesupdate.php:145 actions/newnotice.php:155
-#: scripts/maildaemon.php:71
+#: scripts/maildaemon.php:71 actions/apistatusesupdate.php:152
 #, 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
+#: actions/apistatusesupdate.php:216
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
@@ -7303,9 +7328,8 @@ msgid "No such file."
 msgstr "Statut non trouvé. "
 
 #: actions/getfile.php:79
-#, fuzzy
 msgid "Cannot read file."
-msgstr "Fichier perdu."
+msgstr "Impossible de lire le fichier"
 
 #: actions/grouprss.php:133
 #, fuzzy, php-format
@@ -7317,7 +7341,7 @@ msgstr "Statuts de %1$s dans %2$s!"
 msgid "IM is not available."
 msgstr "Cette page n'est pas disponible dans "
 
-#: actions/login.php:259
+#: actions/login.php:259 actions/login.php:286
 #, fuzzy, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -7352,21 +7376,24 @@ msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
 msgstr ""
 
 #: actions/profilesettings.php:122 actions/register.php:454
+#: actions/register.php:460
 #, 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
+#: actions/register.php:463
 #, fuzzy
 msgid "Describe yourself and your interests"
 msgstr "Décrivez qui vous êtes et vos "
 
 #: actions/profilesettings.php:221 actions/register.php:217
+#: actions/register.php:223
 #, 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
+#: actions/register.php:336 actions/register.php:342
 msgid ""
 "With this form you can create  a new account. You can then post notices and "
 "link up to friends and colleagues. "
@@ -7399,7 +7426,7 @@ msgid "Replies feed for %s (RSS 2.0)"
 msgstr "Flux des statuts de %s"
 
 #: actions/replies.php:158
-#, fuzzy, php-format
+#, php-format
 msgid "Replies feed for %s (Atom)"
 msgstr "Flux des statuts de %s"
 
@@ -7409,17 +7436,17 @@ msgid "Replies to %1$s on %2$s!"
 msgstr "Message adressé à %1$s le %2$s"
 
 #: actions/showfavorites.php:170
-#, fuzzy, php-format
+#, 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
+#, 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
+#, php-format
 msgid "Feed for favorites of %s (Atom)"
 msgstr "Flux pour les amis de %s (Atom)"
 
@@ -7432,7 +7459,7 @@ msgid ""
 msgstr ""
 
 #: actions/showgroup.php:345
-#, fuzzy, php-format
+#, php-format
 msgid "FOAF for %s group"
 msgstr "Boîte d'envoi de %s"
 
@@ -7577,41 +7604,6 @@ msgstr "Répondre à ce statut"
 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. "
@@ -7646,7 +7638,7 @@ 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
+#, php-format
 msgid "notice id: %s"
 msgstr "Nouveau statut"
 
@@ -7710,7 +7702,6 @@ msgid ""
 msgstr ""
 
 #: lib/mailbox.php:227 lib/noticelist.php:424
-#, fuzzy
 msgid "from"
 msgstr "de"
 
@@ -7719,7 +7710,6 @@ 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."
 
@@ -7727,3 +7717,59 @@ msgstr "Impossible de récupérer le flux public."
 #, fuzzy
 msgid "Duplicate notice"
 msgstr "Supprimer ce statut"
+
+#: actions/login.php:110 actions/login.php:120
+#, fuzzy
+msgid "Invalid or expired token."
+msgstr "Contenu invalide"
+
+#: lib/command.php:597
+#, fuzzy, php-format
+msgid "Could not create login token for %s"
+msgstr "Impossible de créer le formulaire OpenID : %s"
+
+#: lib/command.php:602
+#, php-format
+msgid "This link is useable only once, and is good for only 2 minutes: %s"
+msgstr ""
+
+#: lib/imagefile.php:75
+#, fuzzy, php-format
+msgid "That file is too big. The maximum file size is %s."
+msgstr "Ce fichier est trop lourd. La taille maximale est %d."
+
+#: lib/command.php:613
+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"
+"login - Get a link to login to the web interface\n"
+"drop <group> - leave group\n"
+"stats - get your stats\n"
+"stop - same as 'off'\n"
+"quit - same as 'off'\n"
+"sub <nickname> - same as 'follow'\n"
+"unsub <nickname> - same as 'leave'\n"
+"last <nickname> - same as 'get'\n"
+"on <nickname> - not yet implemented.\n"
+"off <nickname> - not yet implemented.\n"
+"nudge <nickname> - remind a user to update.\n"
+"invite <phone number> - not yet implemented.\n"
+"track <word> - not yet implemented.\n"
+"untrack <word> - not yet implemented.\n"
+"track off - not yet implemented.\n"
+"untrack all - not yet implemented.\n"
+"tracks - not yet implemented.\n"
+"tracking - not yet implemented.\n"
+msgstr ""
diff --git a/locale/ga/LC_MESSAGES/statusnet.mo b/locale/ga/LC_MESSAGES/statusnet.mo
index 479e91256..3b59ecb0d 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 39404b3df..cc008d93c 100644
--- a/locale/ga/LC_MESSAGES/statusnet.po
+++ b/locale/ga/LC_MESSAGES/statusnet.po
@@ -5,12 +5,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-06 13:16+0000\n"
-"PO-Revision-Date: 2009-11-06 15:43:41+0000\n"
+"POT-Creation-Date: 2009-11-08 11:53+0000\n"
+"PO-Revision-Date: 2009-11-08 11:56:31+0000\n"
 "Language-Team: Irish\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r58648); Translate extension (2009-08-03)\n"
+"X-Generator: MediaWiki 1.16alpha(r58760); 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"
@@ -199,7 +199,7 @@ msgid "%s updates from everyone!"
 msgstr "%s chíos de calquera!"
 
 #: ../actions/register.php:213 actions/register.php:497
-#: actions/register.php:545 actions/register.php:555
+#: actions/register.php:545 actions/register.php:555 actions/register.php:561
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -238,6 +238,7 @@ msgstr ""
 
 #: ../actions/register.php:152 actions/register.php:166
 #: actions/register.php:368 actions/register.php:414 actions/register.php:418
+#: actions/register.php:424
 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 "
@@ -256,6 +257,7 @@ msgstr "6 ou máis caracteres, non o esquenzas!"
 
 #: ../actions/register.php:154 actions/register.php:168
 #: actions/register.php:373 actions/register.php:419 actions/register.php:423
+#: actions/register.php:429
 msgid "6 or more characters. Required."
 msgstr "6 ou máis caracteres. Requerido."
 
@@ -436,7 +438,7 @@ msgstr "Tódalas actualizacións que coinciden co termo de procura \"%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
+#: actions/login.php:79 actions/register.php:137
 msgid "Already logged in."
 msgstr "Sesión xa iniciada"
 
@@ -459,7 +461,7 @@ msgstr "Subscrición de autorización."
 #: ../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
+#: actions/register.php:473 actions/login.php:253 actions/register.php:479
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Endiante acceder automáticamente, coidado en equipos compartidos!"
 
@@ -483,6 +485,7 @@ msgstr "Avatar"
 
 #: ../actions/avatar.php:113 actions/profilesettings.php:350
 #: actions/avatarsettings.php:395 actions/avatarsettings.php:346
+#: actions/avatarsettings.php:360
 msgid "Avatar updated."
 msgstr "Avatar actualizado."
 
@@ -519,7 +522,7 @@ msgstr "Antes »"
 #: 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
+#: actions/register.php:459 actions/register.php:465
 msgid "Bio"
 msgstr "Bio"
 
@@ -548,6 +551,7 @@ msgstr "Non se pode ler a URL do avatar de '%s'"
 #: actions/passwordsettings.php:169 actions/recoverpassword.php:347
 #: actions/passwordsettings.php:174 actions/recoverpassword.php:365
 #: actions/passwordsettings.php:180 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:185
 msgid "Can't save new password."
 msgstr "Non se pode gardar a contrasinal."
 
@@ -610,6 +614,7 @@ msgstr "Configuración de perfil"
 #: actions/recoverpassword.php:236 actions/register.php:422
 #: actions/passwordsettings.php:111 actions/recoverpassword.php:239
 #: actions/register.php:426 actions/smssettings.php:134
+#: actions/register.php:432
 msgid "Confirm"
 msgstr "Confirmar"
 
@@ -639,7 +644,7 @@ msgid "Confirmation code not found."
 msgstr "Confirmation code not found."
 
 #: ../actions/register.php:202 actions/register.php:473
-#: actions/register.php:521 actions/register.php:531
+#: actions/register.php:521 actions/register.php:531 actions/register.php:537
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -876,6 +881,7 @@ msgstr "Erro ó inserir o hashtag na BD: %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
+#: classes/Notice.php:1120
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Erro ó inserir a contestación na BD: %s"
@@ -898,7 +904,8 @@ msgstr "Contanos un pouco de ti e dos teus intereses en 140 caractéres."
 #: 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
+#: lib/accountsettingsaction.php:117 actions/register.php:437
+#: actions/register.php:441
 msgid "Email"
 msgstr "Correo Electrónico"
 
@@ -913,7 +920,7 @@ msgid "Email Settings"
 msgstr "Configuración de Correo"
 
 #: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
-#: actions/register.php:200 actions/register.php:206
+#: actions/register.php:200 actions/register.php:206 actions/register.php:212
 msgid "Email address already exists."
 msgstr "O enderezo de correo xa existe."
 
@@ -999,7 +1006,7 @@ msgstr "Acounteceu un erro gardando o usuario."
 
 #: ../actions/password.php:80 actions/profilesettings.php:399
 #: actions/passwordsettings.php:164 actions/passwordsettings.php:169
-#: actions/passwordsettings.php:175
+#: actions/passwordsettings.php:175 actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "Acounteceu un erro gardando o usuario: é inválido."
 
@@ -1011,6 +1018,7 @@ msgstr "Acounteceu un erro gardando o usuario: é inválido."
 #: actions/login.php:120 actions/recoverpassword.php:372
 #: actions/register.php:235 actions/login.php:122
 #: actions/recoverpassword.php:375 actions/register.php:242
+#: actions/login.php:149 actions/register.php:248
 msgid "Error setting user."
 msgstr "Acounteceu un erro configurando o usuario."
 
@@ -1042,6 +1050,7 @@ msgstr "Preguntas frecuentes"
 
 #: ../actions/avatar.php:115 actions/profilesettings.php:352
 #: actions/avatarsettings.php:397 actions/avatarsettings.php:349
+#: actions/avatarsettings.php:363
 msgid "Failed updating avatar."
 msgstr "Acounteceu un fallo ó actualizar o avatar."
 
@@ -1076,6 +1085,7 @@ msgid "Find people on this site"
 msgstr "Atopar xente neste sitio"
 
 #: ../actions/login.php:122 actions/login.php:247 actions/login.php:255
+#: actions/login.php:282
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -1093,6 +1103,7 @@ msgstr ""
 #: actions/showstream.php:220 lib/groupeditform.php:157
 #: actions/profilesettings.php:111 actions/register.php:441
 #: actions/showgroup.php:247 actions/showstream.php:267
+#: actions/register.php:447 lib/userprofile.php:149
 msgid "Full name"
 msgstr "Nome completo"
 
@@ -1106,7 +1117,7 @@ msgstr "Nome completo"
 #: 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
+#: actions/register.php:214 actions/register.php:220
 msgid "Full name is too long (max 255 chars)."
 msgstr "O nome completo é demasiado longo (max 255 car)."
 
@@ -1127,7 +1138,7 @@ msgstr "Persoal"
 #: 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
+#: actions/register.php:446 actions/register.php:452
 msgid "Homepage"
 msgstr "Páxina persoal"
 
@@ -1139,7 +1150,7 @@ msgstr "Páxina persoal"
 #: 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
+#: actions/register.php:211 actions/register.php:217
 msgid "Homepage is not a valid URL."
 msgstr "A páxina persoal semella que non é unha URL válida."
 
@@ -1211,7 +1222,7 @@ msgstr "Contrasinal actual incorrecta"
 
 #: ../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
+#: actions/facebookhome.php:129 actions/login.php:116 actions/login.php:143
 msgid "Incorrect username or password."
 msgstr "Usuario ou contrasinal incorrectos."
 
@@ -1291,6 +1302,7 @@ msgstr "Tamaño inválido."
 #: 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
+#: actions/register.php:243 actions/register.php:264
 msgid "Invalid username or password."
 msgstr "Usuario ou contrasinal inválidos."
 
@@ -1368,7 +1380,7 @@ msgstr "A Linguaxe é demasiado longa (max 50 car.)."
 #: 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
+#: lib/profilelist.php:218 actions/register.php:470 lib/userprofile.php:164
 msgid "Location"
 msgstr "Localización"
 
@@ -1382,7 +1394,7 @@ msgstr "Localización"
 #: 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
+#: actions/register.php:221 actions/register.php:227
 msgid "Location is too long (max 255 chars)."
 msgstr "A localización é demasiado longa (max 255 car.)."
 
@@ -1396,6 +1408,7 @@ msgstr "A localización é demasiado longa (max 255 car.)."
 #: 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
+#: actions/login.php:204 actions/login.php:257
 #, php-format
 msgid "Login"
 msgstr "Inicio de sesión"
@@ -1424,12 +1437,13 @@ msgstr "Sair"
 
 #: ../actions/register.php:166 actions/register.php:180
 #: actions/register.php:393 actions/register.php:439 actions/register.php:443
+#: actions/register.php:449
 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:245
 #: lib/facebookaction.php:320 actions/login.php:228 lib/facebookaction.php:325
-#: lib/facebookaction.php:327 actions/login.php:236
+#: lib/facebookaction.php:327 actions/login.php:236 actions/login.php:263
 msgid "Lost or forgotten password?"
 msgstr "¿Perdeches a contrasinal?"
 
@@ -1471,7 +1485,7 @@ 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:487
+#: actions/register.php:477 actions/register.php:487 actions/register.php:493
 msgid "My text and files are available under "
 msgstr "O meu texto e arquivos están dispoñibles baixo licenza "
 
@@ -1529,7 +1543,8 @@ msgstr "A nova contrasinal gardouse correctamente. Xa estas logueado."
 #: 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
+#: actions/showgroup.php:236 actions/showstream.php:249 actions/login.php:246
+#: actions/register.php:423 lib/userprofile.php:131
 msgid "Nickname"
 msgstr "Alcume"
 
@@ -1543,7 +1558,7 @@ msgstr "Alcume"
 #: 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
+#: actions/register.php:202 actions/register.php:208
 msgid "Nickname already in use. Try another one."
 msgstr "O alcume xa está sendo empregado por outro usuario. Tenta con outro."
 
@@ -1559,7 +1574,7 @@ msgstr "O alcume xa está sendo empregado por outro usuario. Tenta con outro."
 #: 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
+#: actions/register.php:199 actions/register.php:205
 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."
 
@@ -1798,7 +1813,8 @@ msgstr "Non é un usuario rexistrado."
 #: 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
+#: lib/api.php:954 lib/api.php:982 lib/api.php:1092 lib/api.php:963
+#: lib/api.php:991 lib/api.php:1101
 msgid "Not a supported data format."
 msgstr "Non é un formato de datos soportado."
 
@@ -1819,7 +1835,7 @@ 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:152
-#: actions/register.php:189 actions/register.php:195
+#: actions/register.php:189 actions/register.php:195 actions/register.php:201
 msgid "Not a valid email address."
 msgstr "Non é un enderezo de correo válido."
 
@@ -1831,7 +1847,7 @@ msgstr "Non é un enderezo de correo válido."
 #: 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
+#: actions/register.php:204 actions/register.php:210
 msgid "Not a valid nickname."
 msgstr "Non é un alcume válido."
 
@@ -1870,6 +1886,7 @@ msgstr "¡Non esperaba esa resposta!"
 #: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
 #: actions/twitapistatuses.php:309 actions/twitapistatuses.php:327
 #: actions/twitapistatuses.php:284 actions/apistatusesupdate.php:186
+#: actions/apistatusesupdate.php:193
 msgid "Not found"
 msgstr "Non atopado"
 
@@ -2016,7 +2033,8 @@ msgstr "Carga parcial."
 #: 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
+#: lib/accountsettingsaction.php:114 actions/login.php:249
+#: actions/register.php:428
 msgid "Password"
 msgstr "Contrasinal"
 
@@ -2045,6 +2063,7 @@ msgstr "Petición de recuperación de contrasinal"
 #: actions/passwordsettings.php:173 actions/recoverpassword.php:200
 #: actions/passwordsettings.php:178 actions/recoverpassword.php:208
 #: actions/passwordsettings.php:184 actions/recoverpassword.php:211
+#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "Contrasinal gardada."
 
@@ -2053,6 +2072,7 @@ msgstr "Contrasinal gardada."
 #: actions/passwordsettings.php:145 actions/register.php:183
 #: actions/passwordsettings.php:150 actions/register.php:220
 #: actions/passwordsettings.php:156 actions/register.php:227
+#: actions/register.php:233
 msgid "Passwords don't match."
 msgstr "As contrasinais non coinciden"
 
@@ -2216,19 +2236,19 @@ msgstr "Código de recuperación para usuario descoñecido."
 #: 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
+#: lib/logingroupnav.php:85 actions/register.php:114 actions/register.php:502
 msgid "Register"
 msgstr "Rexistrar"
 
 #: ../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
+#: actions/register.php:129 actions/register.php:135
 msgid "Registration not allowed."
 msgstr "Non se permite o rexistro neste intre."
 
 #: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67 actions/register.php:106
+#: actions/register.php:67 actions/register.php:106 actions/register.php:112
 msgid "Registration successful"
 msgstr "Xa estas rexistrado!!"
 
@@ -2242,6 +2262,7 @@ msgstr "Rexeitar"
 #: 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
+#: actions/login.php:252 actions/register.php:477
 msgid "Remember me"
 msgstr "Lembrarme"
 
@@ -2340,6 +2361,7 @@ msgstr "Igual que a contrasinal de enriba"
 
 #: ../actions/register.php:156 actions/register.php:170
 #: actions/register.php:377 actions/register.php:423 actions/register.php:427
+#: actions/register.php:433
 msgid "Same as password above. Required."
 msgstr "A mesma contrasinal que arriba. Requerido."
 
@@ -2502,6 +2524,7 @@ msgstr "OpenID almacenado non atopado"
 #: actions/remotesubscribe.php:113 actions/showstream.php:376
 #: lib/subscribeform.php:139 actions/showstream.php:345
 #: actions/remotesubscribe.php:137 actions/showstream.php:439
+#: lib/userprofile.php:321
 msgid "Subscribe"
 msgstr "Subscribir"
 
@@ -2548,6 +2571,7 @@ msgstr "Aconteceu un erro no sistema namentras se estaba cargando o ficheiro."
 #: actions/profilesettings.php:123 actions/showstream.php:255
 #: lib/subscriptionlist.php:106 lib/subscriptionlist.php:108
 #: actions/profilesettings.php:138 actions/showstream.php:327
+#: lib/userprofile.php:209
 msgid "Tags"
 msgstr "Tags"
 
@@ -2769,6 +2793,7 @@ msgstr "Este método require un POST ou DELETE."
 #: actions/apifriendshipsdestroy.php:91 actions/apigroupcreate.php:104
 #: actions/apigroupjoin.php:91 actions/apigroupleave.php:91
 #: actions/apistatusesupdate.php:109
+#: actions/apiaccountupdateprofileimage.php:84
 msgid "This method requires a POST."
 msgstr "Este método require un POST."
 
@@ -2803,7 +2828,7 @@ msgstr ""
 
 #: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
 #: actions/twitapifriendships.php:132 actions/twitapifriendships.php:139
-#: actions/apifriendshipsexists.php:103
+#: actions/apifriendshipsexists.php:103 actions/apifriendshipsexists.php:94
 msgid "Two user ids or screen_names must be supplied."
 msgstr ""
 "Dous identificadores de usuario ou nomes_en_pantalla deben ser "
@@ -2813,7 +2838,7 @@ msgstr ""
 #: 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
+#: actions/register.php:448 actions/register.php:454
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "Enderezo da túa páxina persoal, blogue, ou perfil noutro sitio"
 
@@ -2835,6 +2860,7 @@ msgstr "Enderezo do teu perfil en outro servizo de microblogaxe compatíbel"
 #: actions/twittersettings.php:322 lib/designsettings.php:301
 #: actions/emailsettings.php:255 actions/grouplogo.php:319
 #: actions/imsettings.php:220 actions/smssettings.php:248
+#: actions/avatarsettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "Envio de formulario non esperada."
 
@@ -2947,7 +2973,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
+#: actions/register.php:436 actions/register.php:438 actions/register.php:442
 msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
 "Empregado só para actualizacións, novidades, e recuperación de contrasinais"
@@ -2976,7 +3002,8 @@ msgstr "O usuario  que está sendo escoitado non existe."
 #: 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
+#: actions/apiusershow.php:108 actions/apiaccountupdateprofileimage.php:124
+#: actions/apiaccountupdateprofileimage.php:130
 msgid "User has no profile."
 msgstr "O usuario non ten perfil."
 
@@ -3005,7 +3032,7 @@ msgstr "¿Que pasa, %s?"
 #: 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
+#: actions/register.php:466 actions/register.php:472
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "¿Onde estas, coma \"Cidade, Provincia, País\""
 
@@ -3109,7 +3136,7 @@ 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/finishopenidlogin.php:43 actions/register.php:149
-#: actions/register.php:186 actions/register.php:192
+#: actions/register.php:186 actions/register.php:192 actions/register.php:198
 msgid "You can't register if you don't agree to the license."
 msgstr "Non podes rexistrarte se non estas de acordo coa licenza."
 
@@ -3184,56 +3211,56 @@ msgstr ""
 "conta. Xestina os teus OpenIDs asociados dende aquí."
 
 #: ../lib/util.php:943 lib/util.php:992 lib/util.php:945 lib/util.php:756
-#: lib/util.php:770 lib/util.php:816
+#: lib/util.php:770 lib/util.php:816 lib/util.php:844
 msgid "a few seconds ago"
 msgstr "fai uns segundos"
 
 #: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957 lib/util.php:768
-#: lib/util.php:782 lib/util.php:828
+#: lib/util.php:782 lib/util.php:828 lib/util.php:856
 #, php-format
 msgid "about %d days ago"
 msgstr "fai %d días"
 
 #: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953 lib/util.php:764
-#: lib/util.php:778 lib/util.php:824
+#: lib/util.php:778 lib/util.php:824 lib/util.php:852
 #, php-format
 msgid "about %d hours ago"
 msgstr "fai %d horas"
 
 #: ../lib/util.php:947 lib/util.php:996 lib/util.php:949 lib/util.php:760
-#: lib/util.php:774 lib/util.php:820
+#: lib/util.php:774 lib/util.php:820 lib/util.php:848
 #, php-format
 msgid "about %d minutes ago"
 msgstr "fai %d minutos"
 
 #: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961 lib/util.php:772
-#: lib/util.php:786 lib/util.php:832
+#: lib/util.php:786 lib/util.php:832 lib/util.php:860
 #, php-format
 msgid "about %d months ago"
 msgstr "fai %d meses"
 
 #: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955 lib/util.php:766
-#: lib/util.php:780 lib/util.php:826
+#: lib/util.php:780 lib/util.php:826 lib/util.php:854
 msgid "about a day ago"
 msgstr "fai un día"
 
 #: ../lib/util.php:945 lib/util.php:994 lib/util.php:947 lib/util.php:758
-#: lib/util.php:772 lib/util.php:818
+#: lib/util.php:772 lib/util.php:818 lib/util.php:846
 msgid "about a minute ago"
 msgstr "fai un minuto"
 
 #: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959 lib/util.php:770
-#: lib/util.php:784 lib/util.php:830
+#: lib/util.php:784 lib/util.php:830 lib/util.php:858
 msgid "about a month ago"
 msgstr "fai un mes"
 
 #: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963 lib/util.php:774
-#: lib/util.php:788 lib/util.php:834
+#: lib/util.php:788 lib/util.php:834 lib/util.php:862
 msgid "about a year ago"
 msgstr "fai un ano"
 
 #: ../lib/util.php:949 lib/util.php:998 lib/util.php:951 lib/util.php:762
-#: lib/util.php:776 lib/util.php:822
+#: lib/util.php:776 lib/util.php:822 lib/util.php:850
 msgid "about an hour ago"
 msgstr "fai unha hora"
 
@@ -3302,7 +3329,9 @@ msgstr "« Despois"
 #: 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
+#: actions/userauthorization.php:52 actions/login.php:131
+#: actions/register.php:165 actions/avatarsettings.php:265
+#: lib/designsettings.php:294
 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..."
 
@@ -3528,6 +3557,7 @@ msgstr "A nova contrasinal foi gardada correctamente."
 #: actions/register.php:95 actions/register.php:180
 #: actions/passwordsettings.php:147 actions/register.php:217
 #: actions/passwordsettings.php:153 actions/register.php:224
+#: actions/register.php:230
 msgid "Password must be 6 or more characters."
 msgstr "A contrasinal debe ter 6 caracteres ou máis."
 
@@ -4081,13 +4111,13 @@ 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
+#: actions/avatarsettings.php:308 actions/avatarsettings.php:322
 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
+#: actions/grouplogo.php:377 actions/avatarsettings.php:337
 msgid "Lost our file data."
 msgstr ""
 
@@ -4588,7 +4618,7 @@ msgid "%s left group %s"
 msgstr ""
 
 #: actions/login.php:225 lib/facebookaction.php:304 actions/login.php:208
-#: actions/login.php:216
+#: actions/login.php:216 actions/login.php:243
 msgid "Login to site"
 msgstr ""
 
@@ -4782,7 +4812,8 @@ 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
+#: actions/register.php:398 actions/register.php:85 actions/register.php:189
+#: actions/register.php:404
 msgid "Sorry, only invited people can register."
 msgstr "Desculpa, só se pode rexistrar a xente con invitación."
 
@@ -4878,7 +4909,7 @@ msgstr "Non existe o perfil."
 #: 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
+#: lib/profilelist.php:230 lib/userprofile.php:177
 msgid "URL"
 msgstr ""
 
@@ -4889,7 +4920,7 @@ msgstr ""
 #: 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
+#: lib/profilelist.php:245 lib/userprofile.php:194
 #, fuzzy
 msgid "Note"
 msgstr "Chíos"
@@ -4941,6 +4972,7 @@ msgid "Only the sender and recipient "
 msgstr "Só o emisor e destinatario poden ler esta mensaxe."
 
 #: actions/showstream.php:73 actions/showstream.php:78
+#: actions/showstream.php:79
 #, fuzzy, php-format
 msgid "%s, page %d"
 msgstr "Band. Entrada para %s - páxina %d"
@@ -4952,31 +4984,32 @@ msgstr "Perfil"
 
 #: actions/showstream.php:236 actions/tagother.php:77
 #: actions/showstream.php:220 actions/showstream.php:185
-#: actions/showstream.php:193
+#: actions/showstream.php:193 lib/userprofile.php:75
 #, fuzzy
 msgid "User profile"
 msgstr "O usuario non ten perfil."
 
 #: actions/showstream.php:240 actions/tagother.php:81
 #: actions/showstream.php:224 actions/showstream.php:189
-#: actions/showstream.php:220
+#: actions/showstream.php:220 lib/userprofile.php:102
 msgid "Photo"
 msgstr ""
 
 #: actions/showstream.php:317 actions/showstream.php:309
 #: actions/showstream.php:274 actions/showstream.php:354
+#: lib/userprofile.php:236
 #, fuzzy
 msgid "User actions"
 msgstr "Outras opcions"
 
 #: actions/showstream.php:342 actions/showstream.php:307
-#: actions/showstream.php:390
+#: actions/showstream.php:390 lib/userprofile.php:272
 #, fuzzy
 msgid "Send a direct message to this user"
 msgstr "Non podes enviar mensaxes a este usurio."
 
 #: actions/showstream.php:343 actions/showstream.php:308
-#: actions/showstream.php:391
+#: actions/showstream.php:391 lib/userprofile.php:273
 #, fuzzy
 msgid "Message"
 msgstr "Nova mensaxe"
@@ -5739,7 +5772,7 @@ msgstr "%s e amigos"
 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
+#: actions/avatarsettings.php:373 actions/avatarsettings.php:387
 #, fuzzy
 msgid "Avatar deleted."
 msgstr "Avatar actualizado."
@@ -5885,10 +5918,12 @@ msgstr ""
 "Proba o noso [Rexistro OpenID](%%action.openidlogin%%)!)"
 
 #: actions/register.php:432 actions/register.php:479 actions/register.php:489
+#: actions/register.php:495
 msgid "Creative Commons Attribution 3.0"
 msgstr ""
 
 #: actions/register.php:433 actions/register.php:480 actions/register.php:490
+#: actions/register.php:496
 #, fuzzy
 msgid ""
 " except this private data: password, email address, IM address, and phone "
@@ -5929,44 +5964,48 @@ msgid "%s's profile"
 msgstr "Non existe o perfil."
 
 #: actions/showstream.php:163 actions/showstream.php:128
+#: actions/showstream.php:129
 #, 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
+#: actions/showstream.php:136
 #, 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
+#: actions/showstream.php:143
 #, fuzzy, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "Fonte de chíos para %s"
 
 #: actions/showstream.php:182 actions/showstream.php:147
+#: actions/showstream.php:148
 #, 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
+#: actions/showstream.php:234 lib/userprofile.php:116
 #, fuzzy
 msgid "Edit Avatar"
 msgstr "Avatar"
 
 #: actions/showstream.php:316 actions/showstream.php:281
-#: actions/showstream.php:366
+#: actions/showstream.php:366 lib/userprofile.php:248
 #, fuzzy
 msgid "Edit profile settings"
 msgstr "Configuración de perfil"
 
 #: actions/showstream.php:317 actions/showstream.php:282
-#: actions/showstream.php:367
+#: actions/showstream.php:367 lib/userprofile.php:249
 msgid "Edit"
 msgstr ""
 
 #: actions/showstream.php:542 actions/showstream.php:388
-#: actions/showstream.php:487
+#: actions/showstream.php:487 actions/showstream.php:234
 #, fuzzy, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -6028,6 +6067,9 @@ msgstr ""
 #: actions/apistatusesupdate.php:125 actions/apisubscriptions.php:87
 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#: actions/apiaccountupdateprofileimage.php:91
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apistatusesupdate.php:139
 #, fuzzy
 msgid "No such user!"
 msgstr "Non é o usuario"
@@ -6089,62 +6131,6 @@ msgstr ""
 "Suscriptores: %2$s\n"
 "Chíos: %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 ""
-"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/dberroraction.php:60
 msgid "Database error"
 msgstr ""
@@ -6351,6 +6337,7 @@ 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
+#: actions/showstream.php:202
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -6531,7 +6518,8 @@ 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
+#: lib/designsettings.php:461 lib/designsettings.php:434
+#: lib/designsettings.php:464
 #, fuzzy
 msgid "Couldn't update your design."
 msgstr "Non se puido actualizar o usuario."
@@ -6625,7 +6613,9 @@ msgid "Message sent"
 msgstr "Non hai mensaxes de texto!"
 
 #: actions/newnotice.php:93 lib/designsettings.php:281
-#: actions/newnotice.php:94
+#: actions/newnotice.php:94 actions/apiaccountupdateprofileimage.php:97
+#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254
+#: lib/designsettings.php:283
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s bytes) due to its "
@@ -6797,7 +6787,7 @@ msgstr "Foiches identificado. Insire unha nova contrasinal abaixo."
 msgid "Password recover"
 msgstr "Petición de recuperación de contrasinal"
 
-#: actions/register.php:86
+#: actions/register.php:86 actions/register.php:92
 #, fuzzy
 msgid "Sorry, invalid invitation code."
 msgstr "Acounteceu un erro co código de confirmación."
@@ -6900,28 +6890,31 @@ msgstr ""
 msgid "Not a local notice"
 msgstr "Non é usuario local."
 
-#: actions/showstream.php:72
+#: actions/showstream.php:72 actions/showstream.php:73
 #, fuzzy, php-format
 msgid " tagged %s"
 msgstr "Chíos tagueados con %s"
 
-#: actions/showstream.php:121
+#: actions/showstream.php:121 actions/showstream.php:122
 #, 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
+#: actions/showstream.php:191
 #, 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
+#: actions/showstream.php:196
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
 msgstr ""
 
 #: actions/showstream.php:357 actions/showstream.php:451
+#: actions/showstream.php:198
 #, php-format
 msgid ""
 "You can try to nudge %s or [post something to his or her attention](%%%%"
@@ -6929,6 +6922,7 @@ msgid ""
 msgstr ""
 
 #: actions/showstream.php:393 actions/showstream.php:492
+#: actions/showstream.php:239
 #, fuzzy, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -7082,6 +7076,7 @@ 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
+#: classes/User.php:333
 #, fuzzy, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "Mensaxe de %1$s en %2$s"
@@ -7192,10 +7187,12 @@ msgid "Save design"
 msgstr ""
 
 #: lib/designsettings.php:378 lib/designsettings.php:369
+#: lib/designsettings.php:372
 msgid "Bad default color settings: "
 msgstr ""
 
 #: lib/designsettings.php:474 lib/designsettings.php:465
+#: lib/designsettings.php:468
 msgid "Design defaults restored."
 msgstr ""
 
@@ -7370,12 +7367,11 @@ msgid "You cannot unfollow yourself!"
 msgstr ""
 
 #: actions/apigroupcreate.php:261
-#, fuzzy, php-format
+#, 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:"
 
@@ -7385,7 +7381,6 @@ 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"
 
@@ -7415,17 +7410,19 @@ msgid "Status deleted."
 msgstr "Avatar actualizado."
 
 #: actions/apistatusesupdate.php:132
+#: actions/apiaccountupdateprofileimage.php:99
 msgid "Unable to handle that much POST data!"
 msgstr ""
 
 #: actions/apistatusesupdate.php:145 actions/newnotice.php:155
-#: scripts/maildaemon.php:71
+#: scripts/maildaemon.php:71 actions/apistatusesupdate.php:152
 #, 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
+#: actions/apistatusesupdate.php:216
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
@@ -7436,11 +7433,12 @@ msgid "Unsupported format."
 msgstr "Formato de ficheiro de imaxe non soportado."
 
 #: actions/bookmarklet.php:50
+#, fuzzy
 msgid "Post to "
-msgstr ""
+msgstr "Chíos dende SMS"
 
 #: actions/editgroup.php:201 actions/newgroup.php:145
-#, fuzzy, php-format
+#, php-format
 msgid "description is too long (max %d chars)."
 msgstr "O teu Bio é demasiado longo (max 140 car.)."
 
@@ -7470,12 +7468,10 @@ 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."
 
@@ -7485,11 +7481,10 @@ 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
+#: actions/login.php:259 actions/login.php:286
 #, fuzzy, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -7524,21 +7519,24 @@ msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
 msgstr ""
 
 #: actions/profilesettings.php:122 actions/register.php:454
+#: actions/register.php:460
 #, 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
+#: actions/register.php:463
 #, 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
+#: actions/register.php:223
 #, fuzzy, php-format
 msgid "Bio is too long (max %d chars)."
 msgstr "O teu Bio é demasiado longo (max 140 car.)."
 
-#: actions/register.php:336
+#: actions/register.php:336 actions/register.php:342
 #, fuzzy
 msgid ""
 "With this form you can create  a new account. You can then post notices and "
@@ -7585,17 +7583,17 @@ msgid "Replies to %1$s on %2$s!"
 msgstr "Mensaxe de %1$s en %2$s"
 
 #: actions/showfavorites.php:170
-#, fuzzy, php-format
+#, 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
+#, 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
+#, php-format
 msgid "Feed for favorites of %s (Atom)"
 msgstr "Fonte para os amigos de %s"
 
@@ -7618,7 +7616,6 @@ 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"
 
@@ -7739,7 +7736,7 @@ 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
+#, php-format
 msgid "Reply to %s sent"
 msgstr "Non se pode eliminar este chíos."
 
@@ -7748,68 +7745,6 @@ msgstr "Non se pode eliminar este chíos."
 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. "
@@ -7843,7 +7778,7 @@ 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
+#, php-format
 msgid "notice id: %s"
 msgstr "Novo chío"
 
@@ -7915,7 +7850,6 @@ 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."
 
@@ -7923,3 +7857,202 @@ msgstr "Non se pudo recuperar a liña de tempo publica."
 #, fuzzy
 msgid "Duplicate notice"
 msgstr "Eliminar chío"
+
+#: actions/login.php:110 actions/login.php:120
+#, fuzzy
+msgid "Invalid or expired token."
+msgstr "Contido do chío inválido"
+
+#: lib/command.php:597
+#, fuzzy, php-format
+msgid "Could not create login token for %s"
+msgstr "Non se pode crear o formulario OpenID: %s"
+
+#: lib/command.php:602
+#, php-format
+msgid "This link is useable only once, and is good for only 2 minutes: %s"
+msgstr ""
+
+#: lib/imagefile.php:75
+#, fuzzy, php-format
+msgid "That file is too big. The maximum file size is %s."
+msgstr "Podes actualizar a túa información do perfil persoal aquí"
+
+#: lib/command.php:613
+#, 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"
+"login - Get a link to login to the web interface\n"
+"drop <group> - leave group\n"
+"stats - get your stats\n"
+"stop - same as 'off'\n"
+"quit - same as 'off'\n"
+"sub <nickname> - same as 'follow'\n"
+"unsub <nickname> - same as 'leave'\n"
+"last <nickname> - same as 'get'\n"
+"on <nickname> - not yet implemented.\n"
+"off <nickname> - not yet implemented.\n"
+"nudge <nickname> - remind a user to update.\n"
+"invite <phone number> - not yet implemented.\n"
+"track <word> - not yet implemented.\n"
+"untrack <word> - not yet implemented.\n"
+"track off - not yet implemented.\n"
+"untrack all - not yet implemented.\n"
+"tracks - not yet implemented.\n"
+"tracking - not yet implemented.\n"
+msgstr ""
+"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"
+
+#~ 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 ""
+#~ "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"
+
+#, 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"
diff --git a/locale/he/LC_MESSAGES/statusnet.mo b/locale/he/LC_MESSAGES/statusnet.mo
index 082968542..e109d6513 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 12251a909..67dbdedba 100644
--- a/locale/he/LC_MESSAGES/statusnet.po
+++ b/locale/he/LC_MESSAGES/statusnet.po
@@ -5,12 +5,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-06 13:16+0000\n"
-"PO-Revision-Date: 2009-11-06 15:43:45+0000\n"
+"POT-Creation-Date: 2009-11-08 11:53+0000\n"
+"PO-Revision-Date: 2009-11-08 11:56:34+0000\n"
 "Language-Team: Hebrew\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r58648); Translate extension (2009-08-03)\n"
+"X-Generator: MediaWiki 1.16alpha(r58760); 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"
@@ -172,7 +172,7 @@ msgid "%s updates from everyone!"
 msgstr ""
 
 #: ../actions/register.php:213 actions/register.php:497
-#: actions/register.php:545 actions/register.php:555
+#: actions/register.php:545 actions/register.php:555 actions/register.php:561
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -208,6 +208,7 @@ msgstr "1 עד 64 אותיות אנגליות קטנות או מספרים, לל
 
 #: ../actions/register.php:152 actions/register.php:166
 #: actions/register.php:368 actions/register.php:414 actions/register.php:418
+#: actions/register.php:424
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr ""
 
@@ -224,6 +225,7 @@ msgstr "לפחות 6 אותיות, אל תשכח!"
 
 #: ../actions/register.php:154 actions/register.php:168
 #: actions/register.php:373 actions/register.php:419 actions/register.php:423
+#: actions/register.php:429
 msgid "6 or more characters. Required."
 msgstr " לפחות 6 אותיות. שדה חובה."
 
@@ -398,7 +400,7 @@ msgstr "כל העידכונים התואמים את החיפוש אחרי \"%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
+#: actions/login.php:79 actions/register.php:137
 msgid "Already logged in."
 msgstr "כבר מחובר."
 
@@ -421,7 +423,7 @@ 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/login.php:226
-#: actions/register.php:473
+#: actions/register.php:473 actions/login.php:253 actions/register.php:479
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "בעתיד התחבר אוטומטית; לא לשימוש במחשבים ציבוריים!"
 
@@ -443,6 +445,7 @@ msgstr "תמונה"
 
 #: ../actions/avatar.php:113 actions/profilesettings.php:350
 #: actions/avatarsettings.php:395 actions/avatarsettings.php:346
+#: actions/avatarsettings.php:360
 msgid "Avatar updated."
 msgstr "התמונה עודכנה."
 
@@ -477,7 +480,7 @@ msgstr "לפני >>"
 #: 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
+#: actions/register.php:459 actions/register.php:465
 msgid "Bio"
 msgstr "ביוגרפיה"
 
@@ -506,6 +509,7 @@ msgstr "לא ניתן לקרוא את ה-URL '%s' של התמונה"
 #: actions/passwordsettings.php:169 actions/recoverpassword.php:347
 #: actions/passwordsettings.php:174 actions/recoverpassword.php:365
 #: actions/passwordsettings.php:180 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:185
 msgid "Can't save new password."
 msgstr "לא ניתן לשמור את הסיסמה"
 
@@ -568,6 +572,7 @@ msgstr ""
 #: actions/recoverpassword.php:236 actions/register.php:422
 #: actions/passwordsettings.php:111 actions/recoverpassword.php:239
 #: actions/register.php:426 actions/smssettings.php:134
+#: actions/register.php:432
 msgid "Confirm"
 msgstr "אשר"
 
@@ -597,7 +602,7 @@ msgid "Confirmation code not found."
 msgstr "קוד האישור לא נמצא."
 
 #: ../actions/register.php:202 actions/register.php:473
-#: actions/register.php:521 actions/register.php:531
+#: actions/register.php:521 actions/register.php:531 actions/register.php:537
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -821,6 +826,7 @@ 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
+#: classes/Notice.php:1120
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "שגיאת מסד נתונים בהכנסת התגובה: %s"
@@ -843,7 +849,8 @@ msgstr "תאר את עצמך ואת נושאי העניין שלך ב-140 אות
 #: 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
+#: lib/accountsettingsaction.php:117 actions/register.php:437
+#: actions/register.php:441
 msgid "Email"
 msgstr ""
 
@@ -858,7 +865,7 @@ msgid "Email Settings"
 msgstr ""
 
 #: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
-#: actions/register.php:200 actions/register.php:206
+#: actions/register.php:200 actions/register.php:206 actions/register.php:212
 msgid "Email address already exists."
 msgstr ""
 
@@ -944,7 +951,7 @@ msgstr "שגיאה בשמירת המשתמש."
 
 #: ../actions/password.php:80 actions/profilesettings.php:399
 #: actions/passwordsettings.php:164 actions/passwordsettings.php:169
-#: actions/passwordsettings.php:175
+#: actions/passwordsettings.php:175 actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "שגיאה בשמירת שם המשתמש, לא עומד בכללים."
 
@@ -956,6 +963,7 @@ msgstr "שגיאה בשמירת שם המשתמש, לא עומד בכללים."
 #: actions/login.php:120 actions/recoverpassword.php:372
 #: actions/register.php:235 actions/login.php:122
 #: actions/recoverpassword.php:375 actions/register.php:242
+#: actions/login.php:149 actions/register.php:248
 msgid "Error setting user."
 msgstr "שגיאה ביצירת שם המשתמש."
 
@@ -987,6 +995,7 @@ msgstr "רשימת שאלות נפוצות"
 
 #: ../actions/avatar.php:115 actions/profilesettings.php:352
 #: actions/avatarsettings.php:397 actions/avatarsettings.php:349
+#: actions/avatarsettings.php:363
 msgid "Failed updating avatar."
 msgstr "עדכון התמונה נכשל."
 
@@ -1021,6 +1030,7 @@ msgid "Find people on this site"
 msgstr ""
 
 #: ../actions/login.php:122 actions/login.php:247 actions/login.php:255
+#: actions/login.php:282
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -1036,6 +1046,7 @@ msgstr "לצרכי אבטחה, הכנס מחדש את שם המשתמש והסי
 #: actions/showstream.php:220 lib/groupeditform.php:157
 #: actions/profilesettings.php:111 actions/register.php:441
 #: actions/showgroup.php:247 actions/showstream.php:267
+#: actions/register.php:447 lib/userprofile.php:149
 msgid "Full name"
 msgstr "שם מלא"
 
@@ -1049,7 +1060,7 @@ msgstr "שם מלא"
 #: 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
+#: actions/register.php:214 actions/register.php:220
 msgid "Full name is too long (max 255 chars)."
 msgstr "השם המלא ארוך מידי (מותרות 255 אותיות בלבד)"
 
@@ -1070,7 +1081,7 @@ msgstr "בית"
 #: 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
+#: actions/register.php:446 actions/register.php:452
 msgid "Homepage"
 msgstr "אתר בית"
 
@@ -1082,7 +1093,7 @@ msgstr "אתר בית"
 #: 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
+#: actions/register.php:211 actions/register.php:217
 msgid "Homepage is not a valid URL."
 msgstr "לאתר הבית יש כתובת לא חוקית."
 
@@ -1150,7 +1161,7 @@ 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/login.php:116
+#: actions/facebookhome.php:129 actions/login.php:116 actions/login.php:143
 msgid "Incorrect username or password."
 msgstr "שם משתמש או סיסמה לא נכונים."
 
@@ -1228,6 +1239,7 @@ msgstr "גודל לא חוקי."
 #: 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
+#: actions/register.php:243 actions/register.php:264
 msgid "Invalid username or password."
 msgstr "שם המשתמש או הסיסמה לא חוקיים"
 
@@ -1304,7 +1316,7 @@ msgstr ""
 #: 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
+#: lib/profilelist.php:218 actions/register.php:470 lib/userprofile.php:164
 msgid "Location"
 msgstr "מיקום"
 
@@ -1318,7 +1330,7 @@ msgstr "מיקום"
 #: 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
+#: actions/register.php:221 actions/register.php:227
 msgid "Location is too long (max 255 chars)."
 msgstr "שם המיקום ארוך מידי (מותר עד 255 אותיות)."
 
@@ -1332,6 +1344,7 @@ msgstr "שם המיקום ארוך מידי (מותר עד 255 אותיות)."
 #: 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
+#: actions/login.php:204 actions/login.php:257
 #, php-format
 msgid "Login"
 msgstr "היכנס"
@@ -1359,12 +1372,13 @@ msgstr "צא"
 
 #: ../actions/register.php:166 actions/register.php:180
 #: actions/register.php:393 actions/register.php:439 actions/register.php:443
+#: actions/register.php:449
 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 actions/login.php:236
+#: lib/facebookaction.php:327 actions/login.php:236 actions/login.php:263
 msgid "Lost or forgotten password?"
 msgstr "שכחת או איבדת את הסיסמה?"
 
@@ -1404,7 +1418,7 @@ 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:487
+#: actions/register.php:477 actions/register.php:487 actions/register.php:493
 msgid "My text and files are available under "
 msgstr "הטקסטים והקבצים שלי מופצים תחת רשיון"
 
@@ -1462,7 +1476,8 @@ msgstr "הסיסמה החדשה נשמרה בהצלחה. אתה מחובר למ�
 #: 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
+#: actions/showgroup.php:236 actions/showstream.php:249 actions/login.php:246
+#: actions/register.php:423 lib/userprofile.php:131
 msgid "Nickname"
 msgstr "כינוי"
 
@@ -1476,7 +1491,7 @@ msgstr "כינוי"
 #: 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
+#: actions/register.php:202 actions/register.php:208
 msgid "Nickname already in use. Try another one."
 msgstr "כינוי זה כבר תפוס. נסה כינוי אחר."
 
@@ -1492,7 +1507,7 @@ msgstr "כינוי זה כבר תפוס. נסה כינוי אחר."
 #: 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
+#: actions/register.php:199 actions/register.php:205
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr "כינוי יכול להכיל רק אותיות אנגליות קטנות ומספרים, וללא רווחים."
 
@@ -1731,7 +1746,8 @@ msgstr ""
 #: 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
+#: lib/api.php:954 lib/api.php:982 lib/api.php:1092 lib/api.php:963
+#: lib/api.php:991 lib/api.php:1101
 msgid "Not a supported data format."
 msgstr ""
 
@@ -1752,7 +1768,7 @@ 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
+#: actions/register.php:189 actions/register.php:195 actions/register.php:201
 msgid "Not a valid email address."
 msgstr ""
 
@@ -1764,7 +1780,7 @@ msgstr ""
 #: 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
+#: actions/register.php:204 actions/register.php:210
 msgid "Not a valid nickname."
 msgstr "שם משתמש לא חוקי."
 
@@ -1803,6 +1819,7 @@ msgstr "זו תגובה לא צפויה!"
 #: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
 #: actions/twitapistatuses.php:309 actions/twitapistatuses.php:327
 #: actions/twitapistatuses.php:284 actions/apistatusesupdate.php:186
+#: actions/apistatusesupdate.php:193
 msgid "Not found"
 msgstr "לא נמצא"
 
@@ -1949,7 +1966,8 @@ msgstr "העלאה חלקית."
 #: 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
+#: lib/accountsettingsaction.php:114 actions/login.php:249
+#: actions/register.php:428
 msgid "Password"
 msgstr "סיסמה"
 
@@ -1978,6 +1996,7 @@ msgstr "התבקש שיחזור סיסמה"
 #: actions/passwordsettings.php:173 actions/recoverpassword.php:200
 #: actions/passwordsettings.php:178 actions/recoverpassword.php:208
 #: actions/passwordsettings.php:184 actions/recoverpassword.php:211
+#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "הסיסמה נשמרה."
 
@@ -1986,6 +2005,7 @@ msgstr "הסיסמה נשמרה."
 #: actions/passwordsettings.php:145 actions/register.php:183
 #: actions/passwordsettings.php:150 actions/register.php:220
 #: actions/passwordsettings.php:156 actions/register.php:227
+#: actions/register.php:233
 msgid "Passwords don't match."
 msgstr "הסיסמאות לא תואמות."
 
@@ -2148,19 +2168,19 @@ msgstr "קוד שיחזור למשתמש לא ידוע."
 #: 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
+#: lib/logingroupnav.php:85 actions/register.php:114 actions/register.php:502
 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
+#: actions/register.php:129 actions/register.php:135
 msgid "Registration not allowed."
 msgstr ""
 
 #: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67 actions/register.php:106
+#: actions/register.php:67 actions/register.php:106 actions/register.php:112
 msgid "Registration successful"
 msgstr ""
 
@@ -2174,6 +2194,7 @@ msgstr "דחה"
 #: 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
+#: actions/login.php:252 actions/register.php:477
 msgid "Remember me"
 msgstr "זכור אותי"
 
@@ -2272,6 +2293,7 @@ msgstr "זהה לסיסמה למעלה"
 
 #: ../actions/register.php:156 actions/register.php:170
 #: actions/register.php:377 actions/register.php:423 actions/register.php:427
+#: actions/register.php:433
 msgid "Same as password above. Required."
 msgstr ""
 
@@ -2431,6 +2453,7 @@ msgstr "OpenID מאוכסן לא נמצא."
 #: actions/remotesubscribe.php:113 actions/showstream.php:376
 #: lib/subscribeform.php:139 actions/showstream.php:345
 #: actions/remotesubscribe.php:137 actions/showstream.php:439
+#: lib/userprofile.php:321
 msgid "Subscribe"
 msgstr "הירשם כמנוי"
 
@@ -2477,6 +2500,7 @@ msgstr "שגיאת מערכת בהעלאת הקובץ."
 #: actions/profilesettings.php:123 actions/showstream.php:255
 #: lib/subscriptionlist.php:106 lib/subscriptionlist.php:108
 #: actions/profilesettings.php:138 actions/showstream.php:327
+#: lib/userprofile.php:209
 msgid "Tags"
 msgstr ""
 
@@ -2691,6 +2715,7 @@ msgstr ""
 #: actions/apifriendshipsdestroy.php:91 actions/apigroupcreate.php:104
 #: actions/apigroupjoin.php:91 actions/apigroupleave.php:91
 #: actions/apistatusesupdate.php:109
+#: actions/apiaccountupdateprofileimage.php:84
 msgid "This method requires a POST."
 msgstr ""
 
@@ -2724,7 +2749,7 @@ msgstr ""
 
 #: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
 #: actions/twitapifriendships.php:132 actions/twitapifriendships.php:139
-#: actions/apifriendshipsexists.php:103
+#: actions/apifriendshipsexists.php:103 actions/apifriendshipsexists.php:94
 msgid "Two user ids or screen_names must be supplied."
 msgstr ""
 
@@ -2732,7 +2757,7 @@ msgstr ""
 #: 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
+#: actions/register.php:448 actions/register.php:454
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "הכתובת של אתר הבית שלך, בלוג, או פרופיל באתר אחר "
 
@@ -2754,6 +2779,7 @@ msgstr "כתובת הפרופיל שלך בשרות ביקרובלוג תואם
 #: actions/twittersettings.php:322 lib/designsettings.php:301
 #: actions/emailsettings.php:255 actions/grouplogo.php:319
 #: actions/imsettings.php:220 actions/smssettings.php:248
+#: actions/avatarsettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "הגשת טופס לא צפויה."
 
@@ -2861,7 +2887,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
+#: actions/register.php:436 actions/register.php:438 actions/register.php:442
 msgid "Used only for updates, announcements, and password recovery"
 msgstr "לשימוש רק במקרים של עידכונים, הודעות מערכת, ושיחזורי סיסמאות"
 
@@ -2889,7 +2915,8 @@ 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
+#: actions/apiusershow.php:108 actions/apiaccountupdateprofileimage.php:124
+#: actions/apiaccountupdateprofileimage.php:130
 msgid "User has no profile."
 msgstr "למשתמש אין פרופיל."
 
@@ -2918,7 +2945,7 @@ msgstr "מה המצב %s?"
 #: 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
+#: actions/register.php:466 actions/register.php:472
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "מיקומך, למשל \"עיר, מדינה או מחוז, ארץ\""
 
@@ -3016,7 +3043,7 @@ 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:192
+#: actions/register.php:186 actions/register.php:192 actions/register.php:198
 msgid "You can't register if you don't agree to the license."
 msgstr "לא ניתן להירשם ללא הסכמה לרשיון"
 
@@ -3081,56 +3108,56 @@ msgstr ""
 "מכאן. [OpenID](%%doc.openid%%)"
 
 #: ../lib/util.php:943 lib/util.php:992 lib/util.php:945 lib/util.php:756
-#: lib/util.php:770 lib/util.php:816
+#: lib/util.php:770 lib/util.php:816 lib/util.php:844
 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:828
+#: lib/util.php:782 lib/util.php:828 lib/util.php:856
 #, php-format
 msgid "about %d days ago"
 msgstr "לפני כ-%d ימים"
 
 #: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953 lib/util.php:764
-#: lib/util.php:778 lib/util.php:824
+#: lib/util.php:778 lib/util.php:824 lib/util.php:852
 #, php-format
 msgid "about %d hours ago"
 msgstr "לפני כ-%d שעות"
 
 #: ../lib/util.php:947 lib/util.php:996 lib/util.php:949 lib/util.php:760
-#: lib/util.php:774 lib/util.php:820
+#: lib/util.php:774 lib/util.php:820 lib/util.php:848
 #, php-format
 msgid "about %d minutes ago"
 msgstr "לפני כ-%d דקות"
 
 #: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961 lib/util.php:772
-#: lib/util.php:786 lib/util.php:832
+#: lib/util.php:786 lib/util.php:832 lib/util.php:860
 #, php-format
 msgid "about %d months ago"
 msgstr "לפני כ-%d חודשים"
 
 #: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955 lib/util.php:766
-#: lib/util.php:780 lib/util.php:826
+#: lib/util.php:780 lib/util.php:826 lib/util.php:854
 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:818
+#: lib/util.php:772 lib/util.php:818 lib/util.php:846
 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:830
+#: lib/util.php:784 lib/util.php:830 lib/util.php:858
 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:834
+#: lib/util.php:788 lib/util.php:834 lib/util.php:862
 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:822
+#: lib/util.php:776 lib/util.php:822 lib/util.php:850
 msgid "about an hour ago"
 msgstr "לפני כשעה"
 
@@ -3200,7 +3227,9 @@ msgstr "<< אחרי"
 #: 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
+#: actions/userauthorization.php:52 actions/login.php:131
+#: actions/register.php:165 actions/avatarsettings.php:265
+#: lib/designsettings.php:294
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
@@ -3420,6 +3449,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
+#: actions/register.php:230
 msgid "Password must be 6 or more characters."
 msgstr ""
 
@@ -3959,13 +3989,13 @@ msgid "There was a problem with your session token. "
 msgstr ""
 
 #: actions/avatarsettings.php:303 actions/grouplogo.php:360
-#: actions/avatarsettings.php:308
+#: actions/avatarsettings.php:308 actions/avatarsettings.php:322
 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
+#: actions/grouplogo.php:377 actions/avatarsettings.php:337
 msgid "Lost our file data."
 msgstr ""
 
@@ -4453,7 +4483,7 @@ msgid "%s left group %s"
 msgstr ""
 
 #: actions/login.php:225 lib/facebookaction.php:304 actions/login.php:208
-#: actions/login.php:216
+#: actions/login.php:216 actions/login.php:243
 msgid "Login to site"
 msgstr ""
 
@@ -4642,7 +4672,8 @@ 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
+#: actions/register.php:398 actions/register.php:85 actions/register.php:189
+#: actions/register.php:404
 msgid "Sorry, only invited people can register."
 msgstr ""
 
@@ -4731,7 +4762,7 @@ msgstr "אין הודעה כזו."
 #: 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
+#: lib/profilelist.php:230 lib/userprofile.php:177
 msgid "URL"
 msgstr ""
 
@@ -4742,7 +4773,7 @@ msgstr ""
 #: 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
+#: lib/profilelist.php:245 lib/userprofile.php:194
 #, fuzzy
 msgid "Note"
 msgstr "הודעות"
@@ -4791,6 +4822,7 @@ msgid "Only the sender and recipient "
 msgstr ""
 
 #: actions/showstream.php:73 actions/showstream.php:78
+#: actions/showstream.php:79
 #, php-format
 msgid "%s, page %d"
 msgstr ""
@@ -4802,29 +4834,30 @@ msgstr "פרופיל"
 
 #: actions/showstream.php:236 actions/tagother.php:77
 #: actions/showstream.php:220 actions/showstream.php:185
-#: actions/showstream.php:193
+#: actions/showstream.php:193 lib/userprofile.php:75
 #, 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
+#: actions/showstream.php:220 lib/userprofile.php:102
 msgid "Photo"
 msgstr ""
 
 #: actions/showstream.php:317 actions/showstream.php:309
 #: actions/showstream.php:274 actions/showstream.php:354
+#: lib/userprofile.php:236
 msgid "User actions"
 msgstr ""
 
 #: actions/showstream.php:342 actions/showstream.php:307
-#: actions/showstream.php:390
+#: actions/showstream.php:390 lib/userprofile.php:272
 msgid "Send a direct message to this user"
 msgstr ""
 
 #: actions/showstream.php:343 actions/showstream.php:308
-#: actions/showstream.php:391
+#: actions/showstream.php:391 lib/userprofile.php:273
 #, fuzzy
 msgid "Message"
 msgstr "הודעה חדשה"
@@ -5571,7 +5604,7 @@ msgstr "%s וחברים"
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr ""
 
-#: actions/avatarsettings.php:373
+#: actions/avatarsettings.php:373 actions/avatarsettings.php:387
 #, fuzzy
 msgid "Avatar deleted."
 msgstr "התמונה עודכנה."
@@ -5699,10 +5732,12 @@ msgid ""
 msgstr ""
 
 #: actions/register.php:432 actions/register.php:479 actions/register.php:489
+#: actions/register.php:495
 msgid "Creative Commons Attribution 3.0"
 msgstr ""
 
 #: actions/register.php:433 actions/register.php:480 actions/register.php:490
+#: actions/register.php:496
 msgid ""
 " except this private data: password, email address, IM address, and phone "
 "number."
@@ -5736,44 +5771,48 @@ msgid "%s's profile"
 msgstr "פרופיל"
 
 #: actions/showstream.php:163 actions/showstream.php:128
+#: actions/showstream.php:129
 #, fuzzy, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "הזנת הודעות של %s"
 
 #: actions/showstream.php:170 actions/showstream.php:135
+#: actions/showstream.php:136
 #, fuzzy, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "הזנת הודעות של %s"
 
 #: actions/showstream.php:177 actions/showstream.php:142
+#: actions/showstream.php:143
 #, fuzzy, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "הזנת הודעות של %s"
 
 #: actions/showstream.php:182 actions/showstream.php:147
+#: actions/showstream.php:148
 #, php-format
 msgid "FOAF for %s"
 msgstr ""
 
 #: actions/showstream.php:237 actions/showstream.php:202
-#: actions/showstream.php:234
+#: actions/showstream.php:234 lib/userprofile.php:116
 #, fuzzy
 msgid "Edit Avatar"
 msgstr "תמונה"
 
 #: actions/showstream.php:316 actions/showstream.php:281
-#: actions/showstream.php:366
+#: actions/showstream.php:366 lib/userprofile.php:248
 #, fuzzy
 msgid "Edit profile settings"
 msgstr "הגדרות הפרופיל"
 
 #: actions/showstream.php:317 actions/showstream.php:282
-#: actions/showstream.php:367
+#: actions/showstream.php:367 lib/userprofile.php:249
 msgid "Edit"
 msgstr ""
 
 #: actions/showstream.php:542 actions/showstream.php:388
-#: actions/showstream.php:487
+#: actions/showstream.php:487 actions/showstream.php:234
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5816,6 +5855,9 @@ msgstr ""
 #: actions/apistatusesupdate.php:125 actions/apisubscriptions.php:87
 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#: actions/apiaccountupdateprofileimage.php:91
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apistatusesupdate.php:139
 #, fuzzy
 msgid "No such user!"
 msgstr "אין משתמש כזה."
@@ -5867,36 +5909,6 @@ msgid ""
 "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 ""
@@ -6065,6 +6077,7 @@ 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
+#: actions/showstream.php:202
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -6243,7 +6256,8 @@ 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
+#: lib/designsettings.php:461 lib/designsettings.php:434
+#: lib/designsettings.php:464
 #, fuzzy
 msgid "Couldn't update your design."
 msgstr "עידכון המשתמש נכשל."
@@ -6336,7 +6350,9 @@ msgid "Message sent"
 msgstr "הודעה חדשה"
 
 #: actions/newnotice.php:93 lib/designsettings.php:281
-#: actions/newnotice.php:94
+#: actions/newnotice.php:94 actions/apiaccountupdateprofileimage.php:97
+#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254
+#: lib/designsettings.php:283
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s bytes) due to its "
@@ -6501,7 +6517,7 @@ msgstr "זוהית. הכנס סיסמה חדשה למטה."
 msgid "Password recover"
 msgstr "התבקש שיחזור סיסמה"
 
-#: actions/register.php:86
+#: actions/register.php:86 actions/register.php:92
 #, fuzzy
 msgid "Sorry, invalid invitation code."
 msgstr "שגיאה באישור הקוד."
@@ -6600,28 +6616,31 @@ msgstr ""
 msgid "Not a local notice"
 msgstr "אין משתמש כזה."
 
-#: actions/showstream.php:72
+#: actions/showstream.php:72 actions/showstream.php:73
 #, php-format
 msgid " tagged %s"
 msgstr ""
 
-#: actions/showstream.php:121
+#: actions/showstream.php:121 actions/showstream.php:122
 #, fuzzy, php-format
 msgid "Notice feed for %s tagged %s (RSS 1.0)"
 msgstr "הזנת הודעות של %s"
 
 #: actions/showstream.php:350 actions/showstream.php:444
+#: actions/showstream.php:191
 #, 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
+#: actions/showstream.php:196
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
 msgstr ""
 
 #: actions/showstream.php:357 actions/showstream.php:451
+#: actions/showstream.php:198
 #, php-format
 msgid ""
 "You can try to nudge %s or [post something to his or her attention](%%%%"
@@ -6629,6 +6648,7 @@ msgid ""
 msgstr ""
 
 #: actions/showstream.php:393 actions/showstream.php:492
+#: actions/showstream.php:239
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -6775,6 +6795,7 @@ msgid "Problem saving notice. Too long."
 msgstr "בעיה בשמירת ההודעה."
 
 #: classes/User.php:319 classes/User.php:327 classes/User.php:334
+#: classes/User.php:333
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr ""
@@ -6885,10 +6906,12 @@ msgid "Save design"
 msgstr ""
 
 #: lib/designsettings.php:378 lib/designsettings.php:369
+#: lib/designsettings.php:372
 msgid "Bad default color settings: "
 msgstr ""
 
 #: lib/designsettings.php:474 lib/designsettings.php:465
+#: lib/designsettings.php:468
 msgid "Design defaults restored."
 msgstr ""
 
@@ -7095,16 +7118,18 @@ msgid "Status deleted."
 msgstr "התמונה עודכנה."
 
 #: actions/apistatusesupdate.php:132
+#: actions/apiaccountupdateprofileimage.php:99
 msgid "Unable to handle that much POST data!"
 msgstr ""
 
 #: actions/apistatusesupdate.php:145 actions/newnotice.php:155
-#: scripts/maildaemon.php:71
+#: scripts/maildaemon.php:71 actions/apistatusesupdate.php:152
 #, fuzzy, php-format
 msgid "That's too long. Max notice size is %d chars."
 msgstr "זה ארוך מידי. אורך מירבי להודעה הוא 140 אותיות."
 
 #: actions/apistatusesupdate.php:209 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:216
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
@@ -7168,7 +7193,7 @@ msgstr "מיקרובלוג מאת %s"
 msgid "IM is not available."
 msgstr "עמוד זה אינו זמין בסוג מדיה שאתה יכול לקבל"
 
-#: actions/login.php:259
+#: actions/login.php:259 actions/login.php:286
 #, fuzzy, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -7202,21 +7227,24 @@ msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
 msgstr ""
 
 #: actions/profilesettings.php:122 actions/register.php:454
+#: actions/register.php:460
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d chars"
 msgstr "תאר את עצמך ואת נושאי העניין שלך ב-140 אותיות"
 
 #: actions/profilesettings.php:125 actions/register.php:457
+#: actions/register.php:463
 #, fuzzy
 msgid "Describe yourself and your interests"
 msgstr "תאר את עצמך ואת נושאי העניין שלך ב-140 אותיות"
 
 #: actions/profilesettings.php:221 actions/register.php:217
+#: actions/register.php:223
 #, fuzzy, php-format
 msgid "Bio is too long (max %d chars)."
 msgstr "הביוגרפיה ארוכה מידי (לכל היותר 140 אותיות)"
 
-#: actions/register.php:336
+#: actions/register.php:336 actions/register.php:342
 msgid ""
 "With this form you can create  a new account. You can then post notices and "
 "link up to friends and colleagues. "
@@ -7381,7 +7409,7 @@ msgid "Site content license"
 msgstr "הודעה חדשה"
 
 #: lib/command.php:88
-#, fuzzy, php-format
+#, php-format
 msgid "Could not find a user with nickname %s"
 msgstr "עידכון המשתמש נכשל."
 
@@ -7418,41 +7446,6 @@ msgstr "תגובת עבור %s"
 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. "
@@ -7485,7 +7478,7 @@ msgid "Describe the group or topic in %d characters"
 msgstr "תאר את עצמך ואת נושאי העניין שלך ב-140 אותיות"
 
 #: lib/jabber.php:192
-#, fuzzy, php-format
+#, php-format
 msgid "notice id: %s"
 msgstr "הודעה חדשה"
 
@@ -7552,3 +7545,59 @@ msgstr "עידכון המשתמש נכשל."
 #, fuzzy
 msgid "Duplicate notice"
 msgstr "הודעה חדשה"
+
+#: actions/login.php:110 actions/login.php:120
+#, fuzzy
+msgid "Invalid or expired token."
+msgstr "תוכן ההודעה לא חוקי"
+
+#: lib/command.php:597
+#, fuzzy, php-format
+msgid "Could not create login token for %s"
+msgstr "נכשלה יצירת OpenID מתוך: %s"
+
+#: lib/command.php:602
+#, php-format
+msgid "This link is useable only once, and is good for only 2 minutes: %s"
+msgstr ""
+
+#: lib/imagefile.php:75
+#, fuzzy, php-format
+msgid "That file is too big. The maximum file size is %s."
+msgstr "זה ארוך מידי. אורך מירבי להודעה הוא 140 אותיות."
+
+#: lib/command.php:613
+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"
+"login - Get a link to login to the web interface\n"
+"drop <group> - leave group\n"
+"stats - get your stats\n"
+"stop - same as 'off'\n"
+"quit - same as 'off'\n"
+"sub <nickname> - same as 'follow'\n"
+"unsub <nickname> - same as 'leave'\n"
+"last <nickname> - same as 'get'\n"
+"on <nickname> - not yet implemented.\n"
+"off <nickname> - not yet implemented.\n"
+"nudge <nickname> - remind a user to update.\n"
+"invite <phone number> - not yet implemented.\n"
+"track <word> - not yet implemented.\n"
+"untrack <word> - not yet implemented.\n"
+"track off - not yet implemented.\n"
+"untrack all - not yet implemented.\n"
+"tracks - not yet implemented.\n"
+"tracking - not yet implemented.\n"
+msgstr ""
diff --git a/locale/is/LC_MESSAGES/statusnet.mo b/locale/is/LC_MESSAGES/statusnet.mo
index d300d88c4..29242098c 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 636d829fa..6f8c4816f 100644
--- a/locale/is/LC_MESSAGES/statusnet.po
+++ b/locale/is/LC_MESSAGES/statusnet.po
@@ -5,12 +5,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-06 13:16+0000\n"
-"PO-Revision-Date: 2009-11-06 15:43:48+0000\n"
+"POT-Creation-Date: 2009-11-08 11:53+0000\n"
+"PO-Revision-Date: 2009-11-08 11:56:36+0000\n"
 "Language-Team: Icelandic\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r58648); Translate extension (2009-08-03)\n"
+"X-Generator: MediaWiki 1.16alpha(r58760); 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"
@@ -201,7 +201,7 @@ msgid "%s updates from everyone!"
 msgstr "%s færslur frá öllum!"
 
 #: ../actions/register.php:213 actions/register.php:497
-#: actions/register.php:545 actions/register.php:555
+#: actions/register.php:545 actions/register.php:555 actions/register.php:561
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -239,6 +239,7 @@ 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
+#: actions/register.php:424
 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."
@@ -256,6 +257,7 @@ 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:419 actions/register.php:423
+#: actions/register.php:429
 msgid "6 or more characters. Required."
 msgstr "6 eða fleiri tákn. Nauðsynlegt"
 
@@ -436,7 +438,7 @@ msgstr "Allar færslur sem passa við \"%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
+#: actions/login.php:79 actions/register.php:137
 msgid "Already logged in."
 msgstr "Þú hefur nú þegar skráð þig inn."
 
@@ -459,7 +461,7 @@ msgstr "Heimila áskriftir"
 #: ../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
+#: actions/register.php:473 actions/login.php:253 actions/register.php:479
 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 "
@@ -485,6 +487,7 @@ msgstr "Mynd"
 
 #: ../actions/avatar.php:113 actions/profilesettings.php:350
 #: actions/avatarsettings.php:395 actions/avatarsettings.php:346
+#: actions/avatarsettings.php:360
 msgid "Avatar updated."
 msgstr "Mynd hefur verið uppfærð."
 
@@ -521,7 +524,7 @@ msgstr "Eldri »"
 #: 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
+#: actions/register.php:459 actions/register.php:465
 msgid "Bio"
 msgstr "Lýsing"
 
@@ -550,6 +553,7 @@ msgstr "Get ekki lesið slóðina fyrir myndina '%s'"
 #: actions/passwordsettings.php:169 actions/recoverpassword.php:347
 #: actions/passwordsettings.php:174 actions/recoverpassword.php:365
 #: actions/passwordsettings.php:180 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:185
 msgid "Can't save new password."
 msgstr "Get ekki vistað nýja lykilorðið."
 
@@ -612,6 +616,7 @@ msgstr "Breyta persónulegu stillingunum þínum"
 #: actions/recoverpassword.php:236 actions/register.php:422
 #: actions/passwordsettings.php:111 actions/recoverpassword.php:239
 #: actions/register.php:426 actions/smssettings.php:134
+#: actions/register.php:432
 msgid "Confirm"
 msgstr "Staðfesta"
 
@@ -641,7 +646,7 @@ msgid "Confirmation code not found."
 msgstr "Staðfestingarlykill fannst ekki."
 
 #: ../actions/register.php:202 actions/register.php:473
-#: actions/register.php:521 actions/register.php:531
+#: actions/register.php:521 actions/register.php:531 actions/register.php:537
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -880,6 +885,7 @@ 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
+#: classes/Notice.php:1120
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Gagnagrunnsvilla við innsetningu svars: %s"
@@ -902,7 +908,8 @@ msgstr "Lýstu þér og áhugamálum þínum í 140 táknum"
 #: 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
+#: lib/accountsettingsaction.php:117 actions/register.php:437
+#: actions/register.php:441
 msgid "Email"
 msgstr "Tölvupóstur"
 
@@ -917,7 +924,7 @@ 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
+#: actions/register.php:200 actions/register.php:206 actions/register.php:212
 msgid "Email address already exists."
 msgstr "Tölvupóstfang er nú þegar skráð."
 
@@ -1003,7 +1010,7 @@ msgstr "Villa kom upp í vistun notandans."
 
 #: ../actions/password.php:80 actions/profilesettings.php:399
 #: actions/passwordsettings.php:164 actions/passwordsettings.php:169
-#: actions/passwordsettings.php:175
+#: actions/passwordsettings.php:175 actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "Villa kom upp í vistun notanda: ótækt."
 
@@ -1015,6 +1022,7 @@ msgstr "Villa kom upp í vistun notanda: ótækt."
 #: actions/login.php:120 actions/recoverpassword.php:372
 #: actions/register.php:235 actions/login.php:122
 #: actions/recoverpassword.php:375 actions/register.php:242
+#: actions/login.php:149 actions/register.php:248
 msgid "Error setting user."
 msgstr "Villa kom upp í stillingu notanda."
 
@@ -1046,6 +1054,7 @@ msgstr "Spurt og svarað"
 
 #: ../actions/avatar.php:115 actions/profilesettings.php:352
 #: actions/avatarsettings.php:397 actions/avatarsettings.php:349
+#: actions/avatarsettings.php:363
 msgid "Failed updating avatar."
 msgstr "Mistókst að uppfæra mynd"
 
@@ -1080,6 +1089,7 @@ msgid "Find people on this site"
 msgstr "Finna persónur á þessu vefsvæði"
 
 #: ../actions/login.php:122 actions/login.php:247 actions/login.php:255
+#: actions/login.php:282
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -1097,6 +1107,7 @@ msgstr ""
 #: actions/showstream.php:220 lib/groupeditform.php:157
 #: actions/profilesettings.php:111 actions/register.php:441
 #: actions/showgroup.php:247 actions/showstream.php:267
+#: actions/register.php:447 lib/userprofile.php:149
 msgid "Full name"
 msgstr "Fullt nafn"
 
@@ -1110,7 +1121,7 @@ msgstr "Fullt nafn"
 #: 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
+#: actions/register.php:214 actions/register.php:220
 msgid "Full name is too long (max 255 chars)."
 msgstr "Fullt nafn er of langt (í mesta lagi 255 stafir)."
 
@@ -1131,7 +1142,7 @@ msgstr "Heim"
 #: 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
+#: actions/register.php:446 actions/register.php:452
 msgid "Homepage"
 msgstr "Heimasíða"
 
@@ -1143,7 +1154,7 @@ msgstr "Heimasíða"
 #: 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
+#: actions/register.php:211 actions/register.php:217
 msgid "Homepage is not a valid URL."
 msgstr "Heimasíða er ekki gild vefslóð."
 
@@ -1215,7 +1226,7 @@ msgstr "Rangt eldra lykilorð"
 
 #: ../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
+#: actions/facebookhome.php:129 actions/login.php:116 actions/login.php:143
 msgid "Incorrect username or password."
 msgstr "Rangt notendanafn eða lykilorð."
 
@@ -1295,6 +1306,7 @@ msgstr "Ótæk stærð."
 #: 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
+#: actions/register.php:243 actions/register.php:264
 msgid "Invalid username or password."
 msgstr "Ótækt notendanafn eða lykilorð."
 
@@ -1372,7 +1384,7 @@ msgstr "Tungumál er of langt (í mesta lagi 50 stafir)."
 #: 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
+#: lib/profilelist.php:218 actions/register.php:470 lib/userprofile.php:164
 msgid "Location"
 msgstr "Staðsetning"
 
@@ -1386,7 +1398,7 @@ msgstr "Staðsetning"
 #: 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
+#: actions/register.php:221 actions/register.php:227
 msgid "Location is too long (max 255 chars)."
 msgstr "Staðsetning er of löng (í mesta lagi 255 stafir)."
 
@@ -1400,6 +1412,7 @@ msgstr "Staðsetning er of löng (í mesta lagi 255 stafir)."
 #: 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
+#: actions/login.php:204 actions/login.php:257
 #, php-format
 msgid "Login"
 msgstr "Innskráning"
@@ -1428,12 +1441,13 @@ msgstr "Útskráning"
 
 #: ../actions/register.php:166 actions/register.php:180
 #: actions/register.php:393 actions/register.php:439 actions/register.php:443
+#: actions/register.php:449
 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 actions/login.php:228 lib/facebookaction.php:325
-#: lib/facebookaction.php:327 actions/login.php:236
+#: lib/facebookaction.php:327 actions/login.php:236 actions/login.php:263
 msgid "Lost or forgotten password?"
 msgstr "Tapað eða gleymt lykilorð?"
 
@@ -1476,7 +1490,7 @@ 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:487
+#: actions/register.php:477 actions/register.php:487 actions/register.php:493
 msgid "My text and files are available under "
 msgstr "Textinn og skrárnar mínar eru aðgengilegar undir "
 
@@ -1534,7 +1548,8 @@ msgstr "Tókst að vista nýtt lykilorð. Þú ert núna innskráð(ur)"
 #: 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
+#: actions/showgroup.php:236 actions/showstream.php:249 actions/login.php:246
+#: actions/register.php:423 lib/userprofile.php:131
 msgid "Nickname"
 msgstr "Stuttnefni"
 
@@ -1548,7 +1563,7 @@ msgstr "Stuttnefni"
 #: 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
+#: actions/register.php:202 actions/register.php:208
 msgid "Nickname already in use. Try another one."
 msgstr "Stuttnefni nú þegar í notkun. Prófaðu eitthvað annað."
 
@@ -1564,7 +1579,7 @@ msgstr "Stuttnefni nú þegar í notkun. Prófaðu eitthvað annað."
 #: 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
+#: actions/register.php:199 actions/register.php:205
 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."
 
@@ -1803,7 +1818,8 @@ msgstr "Ekki skráður notandi."
 #: 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
+#: lib/api.php:954 lib/api.php:982 lib/api.php:1092 lib/api.php:963
+#: lib/api.php:991 lib/api.php:1101
 msgid "Not a supported data format."
 msgstr "Enginn stuðningur við gagnasnið."
 
@@ -1824,7 +1840,7 @@ 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
+#: actions/register.php:189 actions/register.php:195 actions/register.php:201
 msgid "Not a valid email address."
 msgstr "Ekki tækt tölvupóstfang."
 
@@ -1836,7 +1852,7 @@ msgstr "Ekki tækt tölvupóstfang."
 #: 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
+#: actions/register.php:204 actions/register.php:210
 msgid "Not a valid nickname."
 msgstr "Ekki tækt stuttnefni."
 
@@ -1875,6 +1891,7 @@ msgstr "Bjóst ekki við þessu svari!"
 #: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
 #: actions/twitapistatuses.php:309 actions/twitapistatuses.php:327
 #: actions/twitapistatuses.php:284 actions/apistatusesupdate.php:186
+#: actions/apistatusesupdate.php:193
 msgid "Not found"
 msgstr "Fannst ekki"
 
@@ -2021,7 +2038,8 @@ msgstr "Upphal að hluta til."
 #: 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
+#: lib/accountsettingsaction.php:114 actions/login.php:249
+#: actions/register.php:428
 msgid "Password"
 msgstr "Lykilorð"
 
@@ -2050,6 +2068,7 @@ msgstr "Beiðni um að endurheimta lykilorð hefur verið send inn"
 #: actions/passwordsettings.php:173 actions/recoverpassword.php:200
 #: actions/passwordsettings.php:178 actions/recoverpassword.php:208
 #: actions/passwordsettings.php:184 actions/recoverpassword.php:211
+#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "Lykilorð vistað."
 
@@ -2058,6 +2077,7 @@ msgstr "Lykilorð vistað."
 #: actions/passwordsettings.php:145 actions/register.php:183
 #: actions/passwordsettings.php:150 actions/register.php:220
 #: actions/passwordsettings.php:156 actions/register.php:227
+#: actions/register.php:233
 msgid "Passwords don't match."
 msgstr "Lykilorðin passa ekki saman."
 
@@ -2221,19 +2241,19 @@ msgstr "Lykill fyrir endurheimtingu óþekkts notanda."
 #: 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
+#: lib/logingroupnav.php:85 actions/register.php:114 actions/register.php:502
 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
+#: actions/register.php:129 actions/register.php:135
 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:106
+#: actions/register.php:67 actions/register.php:106 actions/register.php:112
 msgid "Registration successful"
 msgstr "Nýskráning tókst"
 
@@ -2247,6 +2267,7 @@ msgstr "Hafna"
 #: 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
+#: actions/login.php:252 actions/register.php:477
 msgid "Remember me"
 msgstr "Muna eftir mér"
 
@@ -2345,6 +2366,7 @@ msgstr "Sama og lykilorðið hér fyrir ofan"
 
 #: ../actions/register.php:156 actions/register.php:170
 #: actions/register.php:377 actions/register.php:423 actions/register.php:427
+#: actions/register.php:433
 msgid "Same as password above. Required."
 msgstr "Sama og lykilorðið hér fyrir ofan. Nauðsynlegt."
 
@@ -2507,6 +2529,7 @@ msgstr "Vista OpenID fannst ekki."
 #: actions/remotesubscribe.php:113 actions/showstream.php:376
 #: lib/subscribeform.php:139 actions/showstream.php:345
 #: actions/remotesubscribe.php:137 actions/showstream.php:439
+#: lib/userprofile.php:321
 msgid "Subscribe"
 msgstr "Gerast áskrifandi"
 
@@ -2553,6 +2576,7 @@ msgstr "Kerfisvilla kom upp við upphal skráar."
 #: actions/profilesettings.php:123 actions/showstream.php:255
 #: lib/subscriptionlist.php:106 lib/subscriptionlist.php:108
 #: actions/profilesettings.php:138 actions/showstream.php:327
+#: lib/userprofile.php:209
 msgid "Tags"
 msgstr "Merki"
 
@@ -2775,6 +2799,7 @@ msgstr "Þessi aðferð krefst POST eða DELETE."
 #: actions/apifriendshipsdestroy.php:91 actions/apigroupcreate.php:104
 #: actions/apigroupjoin.php:91 actions/apigroupleave.php:91
 #: actions/apistatusesupdate.php:109
+#: actions/apiaccountupdateprofileimage.php:84
 msgid "This method requires a POST."
 msgstr "Þessi aðferð krefst POST."
 
@@ -2810,7 +2835,7 @@ msgstr ""
 
 #: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
 #: actions/twitapifriendships.php:132 actions/twitapifriendships.php:139
-#: actions/apifriendshipsexists.php:103
+#: actions/apifriendshipsexists.php:103 actions/apifriendshipsexists.php:94
 msgid "Two user ids or screen_names must be supplied."
 msgstr "Tvo notendakenni eða skjáarnöfn verða að vera uppgefin."
 
@@ -2818,7 +2843,7 @@ msgstr "Tvo notendakenni eða skjáarnöfn verða að vera uppgefin."
 #: 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
+#: actions/register.php:448 actions/register.php:454
 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 "
@@ -2842,6 +2867,7 @@ msgstr "Veffang persónulegrar síðu á samvirkandi örbloggsþjónustu"
 #: actions/twittersettings.php:322 lib/designsettings.php:301
 #: actions/emailsettings.php:255 actions/grouplogo.php:319
 #: actions/imsettings.php:220 actions/smssettings.php:248
+#: actions/avatarsettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "Bjóst ekki við innsendingu eyðublaðs."
 
@@ -2954,7 +2980,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
+#: actions/register.php:436 actions/register.php:438 actions/register.php:442
 msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
 "Aðeins notað fyrir uppfærslur, tilkynningar og endurheimtingu lykilorða."
@@ -2983,7 +3009,8 @@ msgstr "Notandi sem verið er að hlusta á er ekki til."
 #: 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
+#: actions/apiusershow.php:108 actions/apiaccountupdateprofileimage.php:124
+#: actions/apiaccountupdateprofileimage.php:130
 msgid "User has no profile."
 msgstr "Notandi hefur enga persónulega síðu."
 
@@ -3012,7 +3039,7 @@ msgstr "Hvað er að frétta %s?"
 #: 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
+#: actions/register.php:466 actions/register.php:472
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Staðsetning þín, eins og \"borg, sýsla, land\""
 
@@ -3117,7 +3144,7 @@ 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/register.php:149
-#: actions/register.php:186 actions/register.php:192
+#: actions/register.php:186 actions/register.php:192 actions/register.php:198
 msgid "You can't register if you don't agree to the license."
 msgstr "Þú getur ekki nýskráð þig nema þú samþykkir leyfið."
 
@@ -3192,56 +3219,56 @@ msgstr ""
 "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:756
-#: lib/util.php:770 lib/util.php:816
+#: lib/util.php:770 lib/util.php:816 lib/util.php:844
 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:768
-#: lib/util.php:782 lib/util.php:828
+#: lib/util.php:782 lib/util.php:828 lib/util.php:856
 #, 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:764
-#: lib/util.php:778 lib/util.php:824
+#: lib/util.php:778 lib/util.php:824 lib/util.php:852
 #, 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:760
-#: lib/util.php:774 lib/util.php:820
+#: lib/util.php:774 lib/util.php:820 lib/util.php:848
 #, 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:772
-#: lib/util.php:786 lib/util.php:832
+#: lib/util.php:786 lib/util.php:832 lib/util.php:860
 #, 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:766
-#: lib/util.php:780 lib/util.php:826
+#: lib/util.php:780 lib/util.php:826 lib/util.php:854
 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:758
-#: lib/util.php:772 lib/util.php:818
+#: lib/util.php:772 lib/util.php:818 lib/util.php:846
 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:770
-#: lib/util.php:784 lib/util.php:830
+#: lib/util.php:784 lib/util.php:830 lib/util.php:858
 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:774
-#: lib/util.php:788 lib/util.php:834
+#: lib/util.php:788 lib/util.php:834 lib/util.php:862
 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:762
-#: lib/util.php:776 lib/util.php:822
+#: lib/util.php:776 lib/util.php:822 lib/util.php:850
 msgid "about an hour ago"
 msgstr "fyrir um einum klukkutíma síðan"
 
@@ -3310,7 +3337,9 @@ msgstr "« Fyrri"
 #: 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
+#: actions/userauthorization.php:52 actions/login.php:131
+#: actions/register.php:165 actions/avatarsettings.php:265
+#: lib/designsettings.php:294
 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."
 
@@ -3540,6 +3569,7 @@ 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
+#: actions/register.php:230
 msgid "Password must be 6 or more characters."
 msgstr "Lykilorð verður að vera að minnsta kosti 6 tákn."
 
@@ -4090,14 +4120,14 @@ 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
+#: actions/avatarsettings.php:308 actions/avatarsettings.php:322
 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
+#: actions/grouplogo.php:377 actions/avatarsettings.php:337
 msgid "Lost our file data."
 msgstr "Týndum skráargögnunum okkar"
 
@@ -4554,7 +4584,7 @@ msgid "%s left group %s"
 msgstr "%s gekk úr hópnum %s"
 
 #: actions/login.php:225 lib/facebookaction.php:304 actions/login.php:208
-#: actions/login.php:216
+#: actions/login.php:216 actions/login.php:243
 msgid "Login to site"
 msgstr "Skrá þig inn á síðuna"
 
@@ -4736,7 +4766,8 @@ msgstr "Merkjaský"
 
 #: 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
+#: actions/register.php:398 actions/register.php:85 actions/register.php:189
+#: actions/register.php:404
 msgid "Sorry, only invited people can register."
 msgstr "Afsakið en aðeins fólki sem er boðið getur nýskráð sig."
 
@@ -4820,7 +4851,7 @@ msgstr "Hópssíðan"
 #: 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
+#: lib/profilelist.php:230 lib/userprofile.php:177
 msgid "URL"
 msgstr "Vefslóð"
 
@@ -4831,7 +4862,7 @@ msgstr "Vefslóð"
 #: 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
+#: lib/profilelist.php:245 lib/userprofile.php:194
 msgid "Note"
 msgstr "Athugasemd"
 
@@ -4880,6 +4911,7 @@ msgid "Only the sender and recipient "
 msgstr "Aðeins sendandinn og móttakandi "
 
 #: actions/showstream.php:73 actions/showstream.php:78
+#: actions/showstream.php:79
 #, php-format
 msgid "%s, page %d"
 msgstr "%s, síða %d"
@@ -4890,28 +4922,29 @@ 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
+#: actions/showstream.php:193 lib/userprofile.php:75
 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
+#: actions/showstream.php:220 lib/userprofile.php:102
 msgid "Photo"
 msgstr "Ljósmynd"
 
 #: actions/showstream.php:317 actions/showstream.php:309
 #: actions/showstream.php:274 actions/showstream.php:354
+#: lib/userprofile.php:236
 msgid "User actions"
 msgstr "Notandaaðgerðir"
 
 #: actions/showstream.php:342 actions/showstream.php:307
-#: actions/showstream.php:390
+#: actions/showstream.php:390 lib/userprofile.php:272
 msgid "Send a direct message to this user"
 msgstr "Senda bein skilaboð til þessa notanda"
 
 #: actions/showstream.php:343 actions/showstream.php:308
-#: actions/showstream.php:391
+#: actions/showstream.php:391 lib/userprofile.php:273
 msgid "Message"
 msgstr "Skilaboð"
 
@@ -5618,7 +5651,7 @@ msgstr ""
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr ""
 
-#: actions/avatarsettings.php:373
+#: actions/avatarsettings.php:373 actions/avatarsettings.php:387
 msgid "Avatar deleted."
 msgstr ""
 
@@ -5740,10 +5773,12 @@ msgid ""
 msgstr ""
 
 #: actions/register.php:432 actions/register.php:479 actions/register.php:489
+#: actions/register.php:495
 msgid "Creative Commons Attribution 3.0"
 msgstr ""
 
 #: actions/register.php:433 actions/register.php:480 actions/register.php:490
+#: actions/register.php:496
 msgid ""
 " except this private data: password, email address, IM address, and phone "
 "number."
@@ -5775,42 +5810,46 @@ msgid "%s's profile"
 msgstr ""
 
 #: actions/showstream.php:163 actions/showstream.php:128
+#: actions/showstream.php:129
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr ""
 
 #: actions/showstream.php:170 actions/showstream.php:135
+#: actions/showstream.php:136
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr ""
 
 #: actions/showstream.php:177 actions/showstream.php:142
+#: actions/showstream.php:143
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr ""
 
 #: actions/showstream.php:182 actions/showstream.php:147
+#: actions/showstream.php:148
 #, php-format
 msgid "FOAF for %s"
 msgstr ""
 
 #: actions/showstream.php:237 actions/showstream.php:202
-#: actions/showstream.php:234
+#: actions/showstream.php:234 lib/userprofile.php:116
 msgid "Edit Avatar"
 msgstr ""
 
 #: actions/showstream.php:316 actions/showstream.php:281
-#: actions/showstream.php:366
+#: actions/showstream.php:366 lib/userprofile.php:248
 msgid "Edit profile settings"
 msgstr ""
 
 #: actions/showstream.php:317 actions/showstream.php:282
-#: actions/showstream.php:367
+#: actions/showstream.php:367 lib/userprofile.php:249
 msgid "Edit"
 msgstr ""
 
 #: actions/showstream.php:542 actions/showstream.php:388
-#: actions/showstream.php:487
+#: actions/showstream.php:487 actions/showstream.php:234
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5852,6 +5891,9 @@ msgstr ""
 #: actions/apistatusesupdate.php:125 actions/apisubscriptions.php:87
 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#: actions/apiaccountupdateprofileimage.php:91
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apistatusesupdate.php:139
 msgid "No such user!"
 msgstr ""
 
@@ -5899,36 +5941,6 @@ msgid ""
 "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 ""
@@ -6090,6 +6102,7 @@ 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
+#: actions/showstream.php:202
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -6254,7 +6267,8 @@ 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
+#: lib/designsettings.php:461 lib/designsettings.php:434
+#: lib/designsettings.php:464
 msgid "Couldn't update your design."
 msgstr ""
 
@@ -6342,7 +6356,9 @@ msgid "Message sent"
 msgstr ""
 
 #: actions/newnotice.php:93 lib/designsettings.php:281
-#: actions/newnotice.php:94
+#: actions/newnotice.php:94 actions/apiaccountupdateprofileimage.php:97
+#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254
+#: lib/designsettings.php:283
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s bytes) due to its "
@@ -6501,7 +6517,7 @@ msgstr ""
 msgid "Password recover"
 msgstr ""
 
-#: actions/register.php:86
+#: actions/register.php:86 actions/register.php:92
 msgid "Sorry, invalid invitation code."
 msgstr ""
 
@@ -6597,28 +6613,31 @@ msgstr ""
 msgid "Not a local notice"
 msgstr ""
 
-#: actions/showstream.php:72
+#: actions/showstream.php:72 actions/showstream.php:73
 #, php-format
 msgid " tagged %s"
 msgstr ""
 
-#: actions/showstream.php:121
+#: actions/showstream.php:121 actions/showstream.php:122
 #, php-format
 msgid "Notice feed for %s tagged %s (RSS 1.0)"
 msgstr ""
 
 #: actions/showstream.php:350 actions/showstream.php:444
+#: actions/showstream.php:191
 #, 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
+#: actions/showstream.php:196
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
 msgstr ""
 
 #: actions/showstream.php:357 actions/showstream.php:451
+#: actions/showstream.php:198
 #, php-format
 msgid ""
 "You can try to nudge %s or [post something to his or her attention](%%%%"
@@ -6626,6 +6645,7 @@ msgid ""
 msgstr ""
 
 #: actions/showstream.php:393 actions/showstream.php:492
+#: actions/showstream.php:239
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -6767,6 +6787,7 @@ msgid "Problem saving notice. Too long."
 msgstr ""
 
 #: classes/User.php:319 classes/User.php:327 classes/User.php:334
+#: classes/User.php:333
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr ""
@@ -6870,10 +6891,12 @@ msgid "Save design"
 msgstr ""
 
 #: lib/designsettings.php:378 lib/designsettings.php:369
+#: lib/designsettings.php:372
 msgid "Bad default color settings: "
 msgstr ""
 
 #: lib/designsettings.php:474 lib/designsettings.php:465
+#: lib/designsettings.php:468
 msgid "Design defaults restored."
 msgstr ""
 
@@ -7075,16 +7098,18 @@ msgid "Status deleted."
 msgstr ""
 
 #: actions/apistatusesupdate.php:132
+#: actions/apiaccountupdateprofileimage.php:99
 msgid "Unable to handle that much POST data!"
 msgstr ""
 
 #: actions/apistatusesupdate.php:145 actions/newnotice.php:155
-#: scripts/maildaemon.php:71
+#: scripts/maildaemon.php:71 actions/apistatusesupdate.php:152
 #, 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
+#: actions/apistatusesupdate.php:216
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
@@ -7149,7 +7174,7 @@ msgstr "Færslur frá %1$s á %2$s!"
 msgid "IM is not available."
 msgstr "Þessi síða er ekki aðgengileg í "
 
-#: actions/login.php:259
+#: actions/login.php:259 actions/login.php:286
 #, fuzzy, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -7183,21 +7208,24 @@ msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
 msgstr ""
 
 #: actions/profilesettings.php:122 actions/register.php:454
+#: actions/register.php:460
 #, 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
+#: actions/register.php:463
 #, fuzzy
 msgid "Describe yourself and your interests"
 msgstr "Lýstu þér og þínum "
 
 #: actions/profilesettings.php:221 actions/register.php:217
+#: actions/register.php:223
 #, 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
+#: actions/register.php:336 actions/register.php:342
 msgid ""
 "With this form you can create  a new account. You can then post notices and "
 "link up to friends and colleagues. "
@@ -7404,41 +7432,6 @@ msgstr "Svara þessu babli"
 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. "
@@ -7541,3 +7534,59 @@ msgstr "Gat ekki eytt uppáhaldi."
 #, fuzzy
 msgid "Duplicate notice"
 msgstr "Eyða babli"
+
+#: actions/login.php:110 actions/login.php:120
+#, fuzzy
+msgid "Invalid or expired token."
+msgstr "Ótækt bablinnihald"
+
+#: lib/command.php:597
+#, fuzzy, php-format
+msgid "Could not create login token for %s"
+msgstr "Gat ekki búið til OpenID eyðublað: %s"
+
+#: lib/command.php:602
+#, php-format
+msgid "This link is useable only once, and is good for only 2 minutes: %s"
+msgstr ""
+
+#: lib/imagefile.php:75
+#, fuzzy, php-format
+msgid "That file is too big. The maximum file size is %s."
+msgstr "Þetta er of langt. Hámarkslengd babls er 140 tákn."
+
+#: lib/command.php:613
+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"
+"login - Get a link to login to the web interface\n"
+"drop <group> - leave group\n"
+"stats - get your stats\n"
+"stop - same as 'off'\n"
+"quit - same as 'off'\n"
+"sub <nickname> - same as 'follow'\n"
+"unsub <nickname> - same as 'leave'\n"
+"last <nickname> - same as 'get'\n"
+"on <nickname> - not yet implemented.\n"
+"off <nickname> - not yet implemented.\n"
+"nudge <nickname> - remind a user to update.\n"
+"invite <phone number> - not yet implemented.\n"
+"track <word> - not yet implemented.\n"
+"untrack <word> - not yet implemented.\n"
+"track off - not yet implemented.\n"
+"untrack all - not yet implemented.\n"
+"tracks - not yet implemented.\n"
+"tracking - not yet implemented.\n"
+msgstr ""
diff --git a/locale/it/LC_MESSAGES/statusnet.mo b/locale/it/LC_MESSAGES/statusnet.mo
index 0591c46a4..b35847828 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 da50319b7..3e0780579 100644
--- a/locale/it/LC_MESSAGES/statusnet.po
+++ b/locale/it/LC_MESSAGES/statusnet.po
@@ -5,12 +5,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-06 13:16+0000\n"
-"PO-Revision-Date: 2009-11-06 15:43:52+0000\n"
+"POT-Creation-Date: 2009-11-08 11:53+0000\n"
+"PO-Revision-Date: 2009-11-08 11:56:39+0000\n"
 "Language-Team: Italian\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r58648); Translate extension (2009-08-03)\n"
+"X-Generator: MediaWiki 1.16alpha(r58760); 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"
@@ -201,7 +201,7 @@ msgid "%s updates from everyone!"
 msgstr "Aggiornamenti di %s da tutti!"
 
 #: ../actions/register.php:213 actions/register.php:497
-#: actions/register.php:545 actions/register.php:555
+#: actions/register.php:545 actions/register.php:555 actions/register.php:561
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -241,6 +241,7 @@ msgstr ""
 
 #: ../actions/register.php:152 actions/register.php:166
 #: actions/register.php:368 actions/register.php:414 actions/register.php:418
+#: actions/register.php:424
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr ""
 "1-64 lettere minuscole o numeri, niente punteggiatura o spazi. Richiesto."
@@ -258,6 +259,7 @@ msgstr "6 o più caratteri, e non dimenticarla!"
 
 #: ../actions/register.php:154 actions/register.php:168
 #: actions/register.php:373 actions/register.php:419 actions/register.php:423
+#: actions/register.php:429
 msgid "6 or more characters. Required."
 msgstr "6 o più caratteri. Richiesta."
 
@@ -438,7 +440,7 @@ msgstr "Tutti gli aggiornamenti corrispondenti al termine di ricerca \"%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
+#: actions/login.php:79 actions/register.php:137
 msgid "Already logged in."
 msgstr "Accesso già effettuato."
 
@@ -461,7 +463,7 @@ msgstr "Autorizza abbonamento"
 #: ../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
+#: actions/register.php:473 actions/login.php:253 actions/register.php:479
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Accedi automaticamente in futuro; non per computer condivisi!"
 
@@ -485,6 +487,7 @@ msgstr "Immagine"
 
 #: ../actions/avatar.php:113 actions/profilesettings.php:350
 #: actions/avatarsettings.php:395 actions/avatarsettings.php:346
+#: actions/avatarsettings.php:360
 msgid "Avatar updated."
 msgstr "Immagine aggiornata."
 
@@ -521,7 +524,7 @@ msgstr "Precedenti »"
 #: 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
+#: actions/register.php:459 actions/register.php:465
 msgid "Bio"
 msgstr "Biografia"
 
@@ -550,6 +553,7 @@ msgstr "Impossibile leggere l'URL \"%s\" dell'immagine"
 #: actions/passwordsettings.php:169 actions/recoverpassword.php:347
 #: actions/passwordsettings.php:174 actions/recoverpassword.php:365
 #: actions/passwordsettings.php:180 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:185
 msgid "Can't save new password."
 msgstr "Impossibile salvare la nuova password."
 
@@ -612,6 +616,7 @@ msgstr "Modifica le impostazioni del tuo profilo"
 #: actions/recoverpassword.php:236 actions/register.php:422
 #: actions/passwordsettings.php:111 actions/recoverpassword.php:239
 #: actions/register.php:426 actions/smssettings.php:134
+#: actions/register.php:432
 msgid "Confirm"
 msgstr "Conferma"
 
@@ -641,7 +646,7 @@ msgid "Confirmation code not found."
 msgstr "Codice di conferma non trovato."
 
 #: ../actions/register.php:202 actions/register.php:473
-#: actions/register.php:521 actions/register.php:531
+#: actions/register.php:521 actions/register.php:531 actions/register.php:537
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -880,6 +885,7 @@ 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
+#: classes/Notice.php:1120
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Errore del DB nell'inserire la risposta: %s"
@@ -902,7 +908,8 @@ msgstr "Descriviti assieme ai tuoi interessi in 140 caratteri"
 #: 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
+#: lib/accountsettingsaction.php:117 actions/register.php:437
+#: actions/register.php:441
 msgid "Email"
 msgstr "Email"
 
@@ -917,7 +924,7 @@ 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
+#: actions/register.php:200 actions/register.php:206 actions/register.php:212
 msgid "Email address already exists."
 msgstr "Indirizzo email già esistente."
 
@@ -1003,7 +1010,7 @@ msgstr "Errore nel salvare l'utente."
 
 #: ../actions/password.php:80 actions/profilesettings.php:399
 #: actions/passwordsettings.php:164 actions/passwordsettings.php:169
-#: actions/passwordsettings.php:175
+#: actions/passwordsettings.php:175 actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "Errore nel salvare l'utente; non valido."
 
@@ -1015,6 +1022,7 @@ msgstr "Errore nel salvare l'utente; non valido."
 #: actions/login.php:120 actions/recoverpassword.php:372
 #: actions/register.php:235 actions/login.php:122
 #: actions/recoverpassword.php:375 actions/register.php:242
+#: actions/login.php:149 actions/register.php:248
 msgid "Error setting user."
 msgstr "Errore nell'impostare l'utente."
 
@@ -1046,6 +1054,7 @@ msgstr "FAQ"
 
 #: ../actions/avatar.php:115 actions/profilesettings.php:352
 #: actions/avatarsettings.php:397 actions/avatarsettings.php:349
+#: actions/avatarsettings.php:363
 msgid "Failed updating avatar."
 msgstr "Errore nell'aggiornare l'immagine."
 
@@ -1080,6 +1089,7 @@ msgid "Find people on this site"
 msgstr "Ricerca persone in questo sito"
 
 #: ../actions/login.php:122 actions/login.php:247 actions/login.php:255
+#: actions/login.php:282
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -1097,6 +1107,7 @@ msgstr ""
 #: actions/showstream.php:220 lib/groupeditform.php:157
 #: actions/profilesettings.php:111 actions/register.php:441
 #: actions/showgroup.php:247 actions/showstream.php:267
+#: actions/register.php:447 lib/userprofile.php:149
 msgid "Full name"
 msgstr "Nome"
 
@@ -1110,7 +1121,7 @@ msgstr "Nome"
 #: 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
+#: actions/register.php:214 actions/register.php:220
 msgid "Full name is too long (max 255 chars)."
 msgstr "Nome troppo lungo (max 255 caratteri)"
 
@@ -1131,7 +1142,7 @@ msgstr "Home"
 #: 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
+#: actions/register.php:446 actions/register.php:452
 msgid "Homepage"
 msgstr "Pagina web"
 
@@ -1143,7 +1154,7 @@ msgstr "Pagina web"
 #: 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
+#: actions/register.php:211 actions/register.php:217
 msgid "Homepage is not a valid URL."
 msgstr "L'URL della pagina web non è valido."
 
@@ -1215,7 +1226,7 @@ msgstr "Vecchia password non corretta"
 
 #: ../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
+#: actions/facebookhome.php:129 actions/login.php:116 actions/login.php:143
 msgid "Incorrect username or password."
 msgstr "Nome utente o password non corretto."
 
@@ -1295,6 +1306,7 @@ msgstr "Dimensione non valida."
 #: 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
+#: actions/register.php:243 actions/register.php:264
 msgid "Invalid username or password."
 msgstr "Nome utente o password non valido."
 
@@ -1372,7 +1384,7 @@ msgstr "La lingua è troppo lunga (max 50 caratteri)."
 #: 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
+#: lib/profilelist.php:218 actions/register.php:470 lib/userprofile.php:164
 msgid "Location"
 msgstr "Ubicazione"
 
@@ -1386,7 +1398,7 @@ msgstr "Ubicazione"
 #: 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
+#: actions/register.php:221 actions/register.php:227
 msgid "Location is too long (max 255 chars)."
 msgstr "Ubicazione troppo lunga (max 255 caratteri)."
 
@@ -1400,6 +1412,7 @@ msgstr "Ubicazione troppo lunga (max 255 caratteri)."
 #: 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
+#: actions/login.php:204 actions/login.php:257
 #, php-format
 msgid "Login"
 msgstr "Accedi"
@@ -1428,12 +1441,13 @@ msgstr "Esci"
 
 #: ../actions/register.php:166 actions/register.php:180
 #: actions/register.php:393 actions/register.php:439 actions/register.php:443
+#: actions/register.php:449
 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 actions/login.php:228 lib/facebookaction.php:325
-#: lib/facebookaction.php:327 actions/login.php:236
+#: lib/facebookaction.php:327 actions/login.php:236 actions/login.php:263
 msgid "Lost or forgotten password?"
 msgstr "Password persa o dimenticata?"
 
@@ -1477,7 +1491,7 @@ 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:487
+#: actions/register.php:477 actions/register.php:487 actions/register.php:493
 msgid "My text and files are available under "
 msgstr "I miei testi e file sono disponibili sotto "
 
@@ -1535,7 +1549,8 @@ msgstr "Nuova password salvata con successo. Hai effettuato l'accesso."
 #: 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
+#: actions/showgroup.php:236 actions/showstream.php:249 actions/login.php:246
+#: actions/register.php:423 lib/userprofile.php:131
 msgid "Nickname"
 msgstr "Soprannome"
 
@@ -1549,7 +1564,7 @@ msgstr "Soprannome"
 #: 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
+#: actions/register.php:202 actions/register.php:208
 msgid "Nickname already in use. Try another one."
 msgstr "Soprannome già in uso. Prova con un altro."
 
@@ -1565,7 +1580,7 @@ msgstr "Soprannome già in uso. Prova con un altro."
 #: 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
+#: actions/register.php:199 actions/register.php:205
 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 "
@@ -1806,7 +1821,8 @@ msgstr "Non è un utente registrato."
 #: 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
+#: lib/api.php:954 lib/api.php:982 lib/api.php:1092 lib/api.php:963
+#: lib/api.php:991 lib/api.php:1101
 msgid "Not a supported data format."
 msgstr "Non è un formato di dati supportato."
 
@@ -1827,7 +1843,7 @@ 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
+#: actions/register.php:189 actions/register.php:195 actions/register.php:201
 msgid "Not a valid email address."
 msgstr "Non è un indirizzo email valido."
 
@@ -1839,7 +1855,7 @@ msgstr "Non è un indirizzo email valido."
 #: 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
+#: actions/register.php:204 actions/register.php:210
 msgid "Not a valid nickname."
 msgstr "Non è un soprannome valido."
 
@@ -1878,6 +1894,7 @@ msgstr "Non aspettavo questa risposta!"
 #: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
 #: actions/twitapistatuses.php:309 actions/twitapistatuses.php:327
 #: actions/twitapistatuses.php:284 actions/apistatusesupdate.php:186
+#: actions/apistatusesupdate.php:193
 msgid "Not found"
 msgstr "Non trovato"
 
@@ -2024,7 +2041,8 @@ msgstr "Caricamento parziale."
 #: 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
+#: lib/accountsettingsaction.php:114 actions/login.php:249
+#: actions/register.php:428
 msgid "Password"
 msgstr "Password"
 
@@ -2053,6 +2071,7 @@ msgstr "Richiesta password di ripristino"
 #: actions/passwordsettings.php:173 actions/recoverpassword.php:200
 #: actions/passwordsettings.php:178 actions/recoverpassword.php:208
 #: actions/passwordsettings.php:184 actions/recoverpassword.php:211
+#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "Password salvata."
 
@@ -2061,6 +2080,7 @@ msgstr "Password salvata."
 #: actions/passwordsettings.php:145 actions/register.php:183
 #: actions/passwordsettings.php:150 actions/register.php:220
 #: actions/passwordsettings.php:156 actions/register.php:227
+#: actions/register.php:233
 msgid "Passwords don't match."
 msgstr "Le password non corrispondono."
 
@@ -2223,19 +2243,19 @@ msgstr "Codice di recupero per utente sconosciuto."
 #: 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
+#: lib/logingroupnav.php:85 actions/register.php:114 actions/register.php:502
 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
+#: actions/register.php:129 actions/register.php:135
 msgid "Registration not allowed."
 msgstr "Registrazione non consentita."
 
 #: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67 actions/register.php:106
+#: actions/register.php:67 actions/register.php:106 actions/register.php:112
 msgid "Registration successful"
 msgstr "Registrazione riuscita"
 
@@ -2249,6 +2269,7 @@ msgstr "Rifiuta"
 #: 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
+#: actions/login.php:252 actions/register.php:477
 msgid "Remember me"
 msgstr "Ricordami"
 
@@ -2347,6 +2368,7 @@ msgstr "Stessa password di sopra"
 
 #: ../actions/register.php:156 actions/register.php:170
 #: actions/register.php:377 actions/register.php:423 actions/register.php:427
+#: actions/register.php:433
 msgid "Same as password above. Required."
 msgstr "Stessa password di sopra. Richiesta."
 
@@ -2508,6 +2530,7 @@ msgstr "OpenID memorizzato non trovato."
 #: actions/remotesubscribe.php:113 actions/showstream.php:376
 #: lib/subscribeform.php:139 actions/showstream.php:345
 #: actions/remotesubscribe.php:137 actions/showstream.php:439
+#: lib/userprofile.php:321
 msgid "Subscribe"
 msgstr "Abbonati"
 
@@ -2554,6 +2577,7 @@ msgstr "Errore di sistema nel caricare il file."
 #: actions/profilesettings.php:123 actions/showstream.php:255
 #: lib/subscriptionlist.php:106 lib/subscriptionlist.php:108
 #: actions/profilesettings.php:138 actions/showstream.php:327
+#: lib/userprofile.php:209
 msgid "Tags"
 msgstr "Etichette"
 
@@ -2774,6 +2798,7 @@ msgstr "Questo metodo richiede POST o DELETE."
 #: actions/apifriendshipsdestroy.php:91 actions/apigroupcreate.php:104
 #: actions/apigroupjoin.php:91 actions/apigroupleave.php:91
 #: actions/apistatusesupdate.php:109
+#: actions/apiaccountupdateprofileimage.php:84
 msgid "This method requires a POST."
 msgstr "Questo metodo richiede POST."
 
@@ -2808,7 +2833,7 @@ msgstr ""
 
 #: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
 #: actions/twitapifriendships.php:132 actions/twitapifriendships.php:139
-#: actions/apifriendshipsexists.php:103
+#: actions/apifriendshipsexists.php:103 actions/apifriendshipsexists.php:94
 msgid "Two user ids or screen_names must be supplied."
 msgstr "Devono essere forniti due ID utente o nominativi."
 
@@ -2816,7 +2841,7 @@ msgstr "Devono essere forniti due ID utente o nominativi."
 #: 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
+#: actions/register.php:448 actions/register.php:454
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "URL della tua pagina web, blog o profilo su un altro sito"
 
@@ -2838,6 +2863,7 @@ msgstr "URL del tuo profilo su un altro servizio di micro-blog compatibile"
 #: actions/twittersettings.php:322 lib/designsettings.php:301
 #: actions/emailsettings.php:255 actions/grouplogo.php:319
 #: actions/imsettings.php:220 actions/smssettings.php:248
+#: actions/avatarsettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "Invio del modulo inaspettato."
 
@@ -2950,7 +2976,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
+#: actions/register.php:436 actions/register.php:438 actions/register.php:442
 msgid "Used only for updates, announcements, and password recovery"
 msgstr "Usata solo per aggiornamenti, annunci e recupero password"
 
@@ -2978,7 +3004,8 @@ msgstr "L'utente che intendi seguire non esiste."
 #: 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
+#: actions/apiusershow.php:108 actions/apiaccountupdateprofileimage.php:124
+#: actions/apiaccountupdateprofileimage.php:130
 msgid "User has no profile."
 msgstr "L'utente non ha un profilo."
 
@@ -3007,7 +3034,7 @@ msgstr "Cosa succede %s?"
 #: 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
+#: actions/register.php:466 actions/register.php:472
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Dove ti trovi, tipo \"città, regione, stato\""
 
@@ -3110,7 +3137,7 @@ 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/register.php:149
-#: actions/register.php:186 actions/register.php:192
+#: actions/register.php:186 actions/register.php:192 actions/register.php:198
 msgid "You can't register if you don't agree to the license."
 msgstr "Non puoi registrarti se non accetti la licenza."
 
@@ -3186,56 +3213,56 @@ msgstr ""
 "account. Gestisci i tuoi OpenID associati da qui."
 
 #: ../lib/util.php:943 lib/util.php:992 lib/util.php:945 lib/util.php:756
-#: lib/util.php:770 lib/util.php:816
+#: lib/util.php:770 lib/util.php:816 lib/util.php:844
 msgid "a few seconds ago"
 msgstr "pochi secondi fa"
 
 #: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957 lib/util.php:768
-#: lib/util.php:782 lib/util.php:828
+#: lib/util.php:782 lib/util.php:828 lib/util.php:856
 #, 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:764
-#: lib/util.php:778 lib/util.php:824
+#: lib/util.php:778 lib/util.php:824 lib/util.php:852
 #, 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:760
-#: lib/util.php:774 lib/util.php:820
+#: lib/util.php:774 lib/util.php:820 lib/util.php:848
 #, 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:772
-#: lib/util.php:786 lib/util.php:832
+#: lib/util.php:786 lib/util.php:832 lib/util.php:860
 #, 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:766
-#: lib/util.php:780 lib/util.php:826
+#: lib/util.php:780 lib/util.php:826 lib/util.php:854
 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:758
-#: lib/util.php:772 lib/util.php:818
+#: lib/util.php:772 lib/util.php:818 lib/util.php:846
 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:770
-#: lib/util.php:784 lib/util.php:830
+#: lib/util.php:784 lib/util.php:830 lib/util.php:858
 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:774
-#: lib/util.php:788 lib/util.php:834
+#: lib/util.php:788 lib/util.php:834 lib/util.php:862
 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:762
-#: lib/util.php:776 lib/util.php:822
+#: lib/util.php:776 lib/util.php:822 lib/util.php:850
 msgid "about an hour ago"
 msgstr "circa un'ora fa"
 
@@ -3304,7 +3331,9 @@ msgstr "« Successivi"
 #: 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
+#: actions/userauthorization.php:52 actions/login.php:131
+#: actions/register.php:165 actions/avatarsettings.php:265
+#: lib/designsettings.php:294
 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."
 
@@ -3531,6 +3560,7 @@ 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
+#: actions/register.php:230
 msgid "Password must be 6 or more characters."
 msgstr "La password deve essere di 6 o più caratteri."
 
@@ -4080,13 +4110,13 @@ 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
+#: actions/avatarsettings.php:308 actions/avatarsettings.php:322
 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
+#: actions/grouplogo.php:377 actions/avatarsettings.php:337
 msgid "Lost our file data."
 msgstr "Perso il nostro file di dati."
 
@@ -4548,7 +4578,7 @@ msgid "%s left group %s"
 msgstr "%s ha lasciato il gruppo %s"
 
 #: actions/login.php:225 lib/facebookaction.php:304 actions/login.php:208
-#: actions/login.php:216
+#: actions/login.php:216 actions/login.php:243
 msgid "Login to site"
 msgstr "Accedi al sito"
 
@@ -4730,7 +4760,8 @@ msgstr "Insieme etichette"
 
 #: 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
+#: actions/register.php:398 actions/register.php:85 actions/register.php:189
+#: actions/register.php:404
 msgid "Sorry, only invited people can register."
 msgstr "Spiacenti, solo le persone invitate possono registrarsi."
 
@@ -4821,7 +4852,7 @@ msgstr "Profilo del gruppo"
 #: 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
+#: lib/profilelist.php:230 lib/userprofile.php:177
 msgid "URL"
 msgstr "URL"
 
@@ -4832,7 +4863,7 @@ msgstr "URL"
 #: 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
+#: lib/profilelist.php:245 lib/userprofile.php:194
 msgid "Note"
 msgstr "Nota"
 
@@ -4882,6 +4913,7 @@ msgid "Only the sender and recipient "
 msgstr "Solo mittente e destinatario "
 
 #: actions/showstream.php:73 actions/showstream.php:78
+#: actions/showstream.php:79
 #, php-format
 msgid "%s, page %d"
 msgstr "%s, pagina %d"
@@ -4893,28 +4925,29 @@ msgstr "Profilo"
 
 #: actions/showstream.php:236 actions/tagother.php:77
 #: actions/showstream.php:220 actions/showstream.php:185
-#: actions/showstream.php:193
+#: actions/showstream.php:193 lib/userprofile.php:75
 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
+#: actions/showstream.php:220 lib/userprofile.php:102
 msgid "Photo"
 msgstr "Fotografia"
 
 #: actions/showstream.php:317 actions/showstream.php:309
 #: actions/showstream.php:274 actions/showstream.php:354
+#: lib/userprofile.php:236
 msgid "User actions"
 msgstr "Azioni utente"
 
 #: actions/showstream.php:342 actions/showstream.php:307
-#: actions/showstream.php:390
+#: actions/showstream.php:390 lib/userprofile.php:272
 msgid "Send a direct message to this user"
 msgstr "Invia un messaggio diretto a questo utente"
 
 #: actions/showstream.php:343 actions/showstream.php:308
-#: actions/showstream.php:391
+#: actions/showstream.php:391 lib/userprofile.php:273
 msgid "Message"
 msgstr "Messaggio"
 
@@ -5627,7 +5660,7 @@ msgstr "%s e amici"
 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
+#: actions/avatarsettings.php:373 actions/avatarsettings.php:387
 #, fuzzy
 msgid "Avatar deleted."
 msgstr "Immagine aggiornata."
@@ -5764,10 +5797,12 @@ msgid ""
 msgstr ""
 
 #: actions/register.php:432 actions/register.php:479 actions/register.php:489
+#: actions/register.php:495
 msgid "Creative Commons Attribution 3.0"
 msgstr ""
 
 #: actions/register.php:433 actions/register.php:480 actions/register.php:490
+#: actions/register.php:496
 #, fuzzy
 msgid ""
 " except this private data: password, email address, IM address, and phone "
@@ -5804,44 +5839,48 @@ msgid "%s's profile"
 msgstr "Profilo"
 
 #: actions/showstream.php:163 actions/showstream.php:128
+#: actions/showstream.php:129
 #, 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
+#: actions/showstream.php:136
 #, 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
+#: actions/showstream.php:143
 #, fuzzy, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "Feed dei messaggi per %s"
 
 #: actions/showstream.php:182 actions/showstream.php:147
+#: actions/showstream.php:148
 #, 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
+#: actions/showstream.php:234 lib/userprofile.php:116
 #, fuzzy
 msgid "Edit Avatar"
 msgstr "Immagine"
 
 #: actions/showstream.php:316 actions/showstream.php:281
-#: actions/showstream.php:366
+#: actions/showstream.php:366 lib/userprofile.php:248
 #, fuzzy
 msgid "Edit profile settings"
 msgstr "Impostazioni del profilo"
 
 #: actions/showstream.php:317 actions/showstream.php:282
-#: actions/showstream.php:367
+#: actions/showstream.php:367 lib/userprofile.php:249
 msgid "Edit"
 msgstr ""
 
 #: actions/showstream.php:542 actions/showstream.php:388
-#: actions/showstream.php:487
+#: actions/showstream.php:487 actions/showstream.php:234
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5887,6 +5926,9 @@ msgstr ""
 #: actions/apistatusesupdate.php:125 actions/apisubscriptions.php:87
 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#: actions/apiaccountupdateprofileimage.php:91
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apistatusesupdate.php:139
 #, fuzzy
 msgid "No such user!"
 msgstr "Nessun tale utente"
@@ -5947,36 +5989,6 @@ msgid ""
 "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 ""
@@ -6146,6 +6158,7 @@ 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
+#: actions/showstream.php:202
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -6327,7 +6340,8 @@ 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
+#: lib/designsettings.php:461 lib/designsettings.php:434
+#: lib/designsettings.php:464
 #, fuzzy
 msgid "Couldn't update your design."
 msgstr "Impossibile aggiornare l'utente."
@@ -6423,7 +6437,9 @@ msgid "Message sent"
 msgstr "Messaggio"
 
 #: actions/newnotice.php:93 lib/designsettings.php:281
-#: actions/newnotice.php:94
+#: actions/newnotice.php:94 actions/apiaccountupdateprofileimage.php:97
+#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254
+#: lib/designsettings.php:283
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s bytes) due to its "
@@ -6593,7 +6609,7 @@ msgstr "Sei ora identificato/a. Inserisci una nuova password qui di seguito. "
 msgid "Password recover"
 msgstr "Richiesta password di ripristino"
 
-#: actions/register.php:86
+#: actions/register.php:86 actions/register.php:92
 #, fuzzy
 msgid "Sorry, invalid invitation code."
 msgstr "Errore con il codice di conferma."
@@ -6695,28 +6711,31 @@ msgstr "Amministra"
 msgid "Not a local notice"
 msgstr "Non un utente locale."
 
-#: actions/showstream.php:72
+#: actions/showstream.php:72 actions/showstream.php:73
 #, fuzzy, php-format
 msgid " tagged %s"
 msgstr "Messaggi etichettati con %s"
 
-#: actions/showstream.php:121
+#: actions/showstream.php:121 actions/showstream.php:122
 #, 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
+#: actions/showstream.php:191
 #, 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
+#: actions/showstream.php:196
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
 msgstr ""
 
 #: actions/showstream.php:357 actions/showstream.php:451
+#: actions/showstream.php:198
 #, php-format
 msgid ""
 "You can try to nudge %s or [post something to his or her attention](%%%%"
@@ -6724,6 +6743,7 @@ msgid ""
 msgstr ""
 
 #: actions/showstream.php:393 actions/showstream.php:492
+#: actions/showstream.php:239
 #, fuzzy, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -6876,6 +6896,7 @@ msgid "Problem saving notice. Too long."
 msgstr "Problema nel salvare il messaggio."
 
 #: classes/User.php:319 classes/User.php:327 classes/User.php:334
+#: classes/User.php:333
 #, fuzzy, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "Messaggio a %1$s su %2$s"
@@ -6986,10 +7007,12 @@ msgid "Save design"
 msgstr ""
 
 #: lib/designsettings.php:378 lib/designsettings.php:369
+#: lib/designsettings.php:372
 msgid "Bad default color settings: "
 msgstr ""
 
 #: lib/designsettings.php:474 lib/designsettings.php:465
+#: lib/designsettings.php:468
 msgid "Design defaults restored."
 msgstr ""
 
@@ -7196,16 +7219,18 @@ msgid "Status deleted."
 msgstr "Immagine aggiornata."
 
 #: actions/apistatusesupdate.php:132
+#: actions/apiaccountupdateprofileimage.php:99
 msgid "Unable to handle that much POST data!"
 msgstr ""
 
 #: actions/apistatusesupdate.php:145 actions/newnotice.php:155
-#: scripts/maildaemon.php:71
+#: scripts/maildaemon.php:71 actions/apistatusesupdate.php:152
 #, 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
+#: actions/apistatusesupdate.php:216
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
@@ -7271,7 +7296,7 @@ msgstr "Aggiornamenti da %1$s su %2$s!"
 msgid "IM is not available."
 msgstr "Questa pagina non è disponibile in un "
 
-#: actions/login.php:259
+#: actions/login.php:259 actions/login.php:286
 #, fuzzy, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -7306,21 +7331,24 @@ msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
 msgstr ""
 
 #: actions/profilesettings.php:122 actions/register.php:454
+#: actions/register.php:460
 #, 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
+#: actions/register.php:463
 #, fuzzy
 msgid "Describe yourself and your interests"
 msgstr "Descrivi te e i tuoi "
 
 #: actions/profilesettings.php:221 actions/register.php:217
+#: actions/register.php:223
 #, fuzzy, php-format
 msgid "Bio is too long (max %d chars)."
 msgstr "La biografia è troppo lunga (max 140 caratteri)."
 
-#: actions/register.php:336
+#: actions/register.php:336 actions/register.php:342
 msgid ""
 "With this form you can create  a new account. You can then post notices and "
 "link up to friends and colleagues. "
@@ -7353,7 +7381,7 @@ msgid "Replies feed for %s (RSS 2.0)"
 msgstr "Feed dei messaggi per %s"
 
 #: actions/replies.php:158
-#, fuzzy, php-format
+#, php-format
 msgid "Replies feed for %s (Atom)"
 msgstr "Feed dei messaggi per %s"
 
@@ -7363,17 +7391,17 @@ msgid "Replies to %1$s on %2$s!"
 msgstr "Messaggio a %1$s su %2$s"
 
 #: actions/showfavorites.php:170
-#, fuzzy, php-format
+#, 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
+#, 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
+#, php-format
 msgid "Feed for favorites of %s (Atom)"
 msgstr "Feed per gli amici di %s"
 
@@ -7386,7 +7414,7 @@ msgid ""
 msgstr ""
 
 #: actions/showgroup.php:345
-#, fuzzy, php-format
+#, php-format
 msgid "FOAF for %s group"
 msgstr "Casella posta inviata di %s"
 
@@ -7525,41 +7553,6 @@ msgstr "Rispondi a questo messaggio"
 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. "
@@ -7594,7 +7587,7 @@ 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
+#, php-format
 msgid "notice id: %s"
 msgstr "Nuovo messaggio"
 
@@ -7654,7 +7647,6 @@ 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."
 
@@ -7662,3 +7654,59 @@ msgstr "Impossibile recuperare l'attività pubblica."
 #, fuzzy
 msgid "Duplicate notice"
 msgstr "Elimina messaggio"
+
+#: actions/login.php:110 actions/login.php:120
+#, fuzzy
+msgid "Invalid or expired token."
+msgstr "Contenuto del messaggio non valido"
+
+#: lib/command.php:597
+#, fuzzy, php-format
+msgid "Could not create login token for %s"
+msgstr "Impossibile creare il modulo OpenID: %s"
+
+#: lib/command.php:602
+#, php-format
+msgid "This link is useable only once, and is good for only 2 minutes: %s"
+msgstr ""
+
+#: lib/imagefile.php:75
+#, fuzzy, php-format
+msgid "That file is too big. The maximum file size is %s."
+msgstr "Puoi caricare un'immagine per il logo del tuo gruppo."
+
+#: lib/command.php:613
+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"
+"login - Get a link to login to the web interface\n"
+"drop <group> - leave group\n"
+"stats - get your stats\n"
+"stop - same as 'off'\n"
+"quit - same as 'off'\n"
+"sub <nickname> - same as 'follow'\n"
+"unsub <nickname> - same as 'leave'\n"
+"last <nickname> - same as 'get'\n"
+"on <nickname> - not yet implemented.\n"
+"off <nickname> - not yet implemented.\n"
+"nudge <nickname> - remind a user to update.\n"
+"invite <phone number> - not yet implemented.\n"
+"track <word> - not yet implemented.\n"
+"untrack <word> - not yet implemented.\n"
+"track off - not yet implemented.\n"
+"untrack all - not yet implemented.\n"
+"tracks - not yet implemented.\n"
+"tracking - not yet implemented.\n"
+msgstr ""
diff --git a/locale/ja/LC_MESSAGES/statusnet.mo b/locale/ja/LC_MESSAGES/statusnet.mo
index 1a0ee8c34..e92c7452a 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 3a30a60c6..39bc7dda2 100644
--- a/locale/ja/LC_MESSAGES/statusnet.po
+++ b/locale/ja/LC_MESSAGES/statusnet.po
@@ -6,12 +6,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-06 13:16+0000\n"
-"PO-Revision-Date: 2009-11-06 15:43:55+0000\n"
+"POT-Creation-Date: 2009-11-08 11:53+0000\n"
+"PO-Revision-Date: 2009-11-08 11:56:42+0000\n"
 "Language-Team: Japanese\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r58648); Translate extension (2009-08-03)\n"
+"X-Generator: MediaWiki 1.16alpha(r58760); 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"
@@ -200,7 +200,7 @@ msgid "%s updates from everyone!"
 msgstr ""
 
 #: ../actions/register.php:213 actions/register.php:497
-#: actions/register.php:545 actions/register.php:555
+#: actions/register.php:545 actions/register.php:555 actions/register.php:561
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -238,6 +238,7 @@ msgstr "1-64文字の、小文字アルファベットか数字で、スペー�
 
 #: ../actions/register.php:152 actions/register.php:166
 #: actions/register.php:368 actions/register.php:414 actions/register.php:418
+#: actions/register.php:424
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr ""
 "1-64文字の、小文字アルファベットか数字で、スペースや句読点は除く。必須です。"
@@ -255,6 +256,7 @@ msgstr "6文字以上。忘れないでください！"
 
 #: ../actions/register.php:154 actions/register.php:168
 #: actions/register.php:373 actions/register.php:419 actions/register.php:423
+#: actions/register.php:429
 msgid "6 or more characters. Required."
 msgstr "6文字以上。必須です。"
 
@@ -434,7 +436,7 @@ msgstr "検索語「%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
+#: actions/login.php:79 actions/register.php:137
 msgid "Already logged in."
 msgstr "既にログインしています。"
 
@@ -457,7 +459,7 @@ 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/login.php:226
-#: actions/register.php:473
+#: actions/register.php:473 actions/login.php:253 actions/register.php:479
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "以降は自動的にログインする。共用コンピューターでは避けましょう！"
 
@@ -479,6 +481,7 @@ msgstr "アバター"
 
 #: ../actions/avatar.php:113 actions/profilesettings.php:350
 #: actions/avatarsettings.php:395 actions/avatarsettings.php:346
+#: actions/avatarsettings.php:360
 msgid "Avatar updated."
 msgstr "アバターが更新されました。"
 
@@ -514,7 +517,7 @@ msgstr "前 »"
 #: 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
+#: actions/register.php:459 actions/register.php:465
 msgid "Bio"
 msgstr "自己紹介"
 
@@ -536,13 +539,14 @@ msgstr "この通知を削除できません。"
 #: 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
+#: actions/passwordsettings.php:185
 msgid "Can't save new password."
 msgstr "新しいパスワードを保存できません。"
 
@@ -553,12 +557,12 @@ msgstr "新しいパスワードを保存できません。"
 #: actions/smssettings.php:114 actions/emailsettings.php:117
 #: actions/imsettings.php:120 actions/smssettings.php:126
 msgid "Cancel"
-msgstr "キャンセル"
+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 を生成できません。"
+msgstr "OpenID コンシューマーオブジェクトをインスタンス化できません。"
 
 #: ../actions/imsettings.php:163 actions/imsettings.php:171
 #: actions/imsettings.php:286 actions/imsettings.php:292
@@ -605,6 +609,7 @@ msgstr "プロファイル設定の変更"
 #: actions/recoverpassword.php:236 actions/register.php:422
 #: actions/passwordsettings.php:111 actions/recoverpassword.php:239
 #: actions/register.php:426 actions/smssettings.php:134
+#: actions/register.php:432
 msgid "Confirm"
 msgstr "確認"
 
@@ -621,7 +626,7 @@ msgstr "アドレスの確認"
 #: actions/emailsettings.php:394 actions/imsettings.php:367
 #: actions/smssettings.php:386
 msgid "Confirmation cancelled."
-msgstr "確認作業がキャンセルされました。"
+msgstr "確認作業が中止されました。"
 
 #: ../actions/smssettings.php:63 actions/smssettings.php:63
 #: actions/smssettings.php:118 actions/smssettings.php:130
@@ -634,7 +639,7 @@ msgid "Confirmation code not found."
 msgstr "確認コードが見つかりません。"
 
 #: ../actions/register.php:202 actions/register.php:473
-#: actions/register.php:521 actions/register.php:531
+#: actions/register.php:521 actions/register.php:531 actions/register.php:537
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -652,6 +657,20 @@ msgid ""
 "\n"
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
+"%s さん、おめでとうございます！%%%%site.name%%%% へようこそ。以下のようにして"
+"始めることができます。\n"
+"\n"
+"* [あなたのプロフィール](%s) を参照して最初のメッセージを投稿する\n"
+"* [Jabber や GTalk のアドレス](%%%%action.imsettings%%%%) を追加して、インス"
+"タントメッセージを通して通知を送れるようにする\n"
+"* あなたが知っている人やあなたと同じ興味をもっている人を[検索](%%%%action."
+"peoplesearch%%%%) する\n"
+"* [プロフィール設定](%%%%action.profilesettings%%%%) を更新して他の利用者にあ"
+"なたのことをより詳しく知らせる\n"
+"* 探している機能について[オンライン文書](%%%%doc.help%%%%) を読む\n"
+"\n"
+"参加してくださりありがとうございます。私たちはあなたがこのサービスを楽しんで"
+"使われることを願っています。"
 
 #: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
 #: actions/finishopenidlogin.php:119 lib/action.php:330 lib/action.php:403
@@ -668,13 +687,13 @@ msgstr "既存のアカウントと接続"
 #: ../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 "コンタクト"
+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"
+msgstr "OpenID フォームを作成できませんでした: %s"
 
 #: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
 #: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
@@ -684,28 +703,29 @@ msgstr "OpenIDを作成できません : %s"
 #, 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:43
 #: actions/apifriendshipscreate.php:109
 msgid "Could not follow user: User not found."
-msgstr ""
+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"
+msgstr "サーバーへリダイレクトできません: %s"
 
 #: ../actions/updateprofile.php:162 actions/updateprofile.php:163
 #: actions/updateprofile.php:166 actions/updateprofile.php:176
 msgid "Could not save avatar info"
-msgstr "アバターを保存できません"
+msgstr "アバターを保存できませんでした"
 
 #: ../actions/updateprofile.php:155 actions/updateprofile.php:156
 #: actions/updateprofile.php:159 actions/updateprofile.php:163
 msgid "Could not save new profile info"
-msgstr "新しいプロファイルを保存できません"
+msgstr "新しいプロフィール情報を保存できませんでした"
 
 #: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72 lib/subs.php:75
 msgid "Could not subscribe other to you."
@@ -858,6 +878,7 @@ 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
+#: classes/Notice.php:1120
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "返信を追加する際にデータベースエラー : %s"
@@ -880,7 +901,8 @@ msgstr "140字以内で自己紹介"
 #: 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
+#: lib/accountsettingsaction.php:117 actions/register.php:437
+#: actions/register.php:441
 msgid "Email"
 msgstr "メール"
 
@@ -895,7 +917,7 @@ msgid "Email Settings"
 msgstr "メール設定"
 
 #: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
-#: actions/register.php:200 actions/register.php:206
+#: actions/register.php:200 actions/register.php:206 actions/register.php:212
 msgid "Email address already exists."
 msgstr "メールアドレスが既に存在します。"
 
@@ -981,7 +1003,7 @@ msgstr "ユーザ保存エラー"
 
 #: ../actions/password.php:80 actions/profilesettings.php:399
 #: actions/passwordsettings.php:164 actions/passwordsettings.php:169
-#: actions/passwordsettings.php:175
+#: actions/passwordsettings.php:175 actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "ユーザ保存エラー; 不正なユーザ"
 
@@ -993,6 +1015,7 @@ msgstr "ユーザ保存エラー; 不正なユーザ"
 #: actions/login.php:120 actions/recoverpassword.php:372
 #: actions/register.php:235 actions/login.php:122
 #: actions/recoverpassword.php:375 actions/register.php:242
+#: actions/login.php:149 actions/register.php:248
 msgid "Error setting user."
 msgstr "ユーザ設定エラー"
 
@@ -1024,6 +1047,7 @@ msgstr "よくある質問"
 
 #: ../actions/avatar.php:115 actions/profilesettings.php:352
 #: actions/avatarsettings.php:397 actions/avatarsettings.php:349
+#: actions/avatarsettings.php:363
 msgid "Failed updating avatar."
 msgstr "アバターの更新に失敗しました。"
 
@@ -1058,6 +1082,7 @@ msgid "Find people on this site"
 msgstr ""
 
 #: ../actions/login.php:122 actions/login.php:247 actions/login.php:255
+#: actions/login.php:282
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -1075,6 +1100,7 @@ msgstr ""
 #: actions/showstream.php:220 lib/groupeditform.php:157
 #: actions/profilesettings.php:111 actions/register.php:441
 #: actions/showgroup.php:247 actions/showstream.php:267
+#: actions/register.php:447 lib/userprofile.php:149
 msgid "Full name"
 msgstr "フルネーム"
 
@@ -1088,7 +1114,7 @@ msgstr "フルネーム"
 #: 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
+#: actions/register.php:214 actions/register.php:220
 msgid "Full name is too long (max 255 chars)."
 msgstr "フルネームが長すぎます。（255字まで）"
 
@@ -1109,7 +1135,7 @@ msgstr "ホーム"
 #: 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
+#: actions/register.php:446 actions/register.php:452
 msgid "Homepage"
 msgstr "ホームページ"
 
@@ -1121,7 +1147,7 @@ msgstr "ホームページ"
 #: 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
+#: actions/register.php:211 actions/register.php:217
 msgid "Homepage is not a valid URL."
 msgstr "ホームページのURLが不適切です。"
 
@@ -1189,7 +1215,7 @@ 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/login.php:116
+#: actions/facebookhome.php:129 actions/login.php:116 actions/login.php:143
 msgid "Incorrect username or password."
 msgstr "ユーザ名またはパスワードが間違っています。"
 
@@ -1267,6 +1293,7 @@ msgstr "不正なサイズ。"
 #: 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
+#: actions/register.php:243 actions/register.php:264
 msgid "Invalid username or password."
 msgstr "不正なユーザ名またはパスワード。"
 
@@ -1343,7 +1370,7 @@ msgstr ""
 #: 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
+#: lib/profilelist.php:218 actions/register.php:470 lib/userprofile.php:164
 msgid "Location"
 msgstr "場所"
 
@@ -1357,7 +1384,7 @@ msgstr "場所"
 #: 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
+#: actions/register.php:221 actions/register.php:227
 msgid "Location is too long (max 255 chars)."
 msgstr "場所が長すぎます。（255字まで）"
 
@@ -1371,6 +1398,7 @@ msgstr "場所が長すぎます。（255字まで）"
 #: 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
+#: actions/login.php:204 actions/login.php:257
 #, php-format
 msgid "Login"
 msgstr "ログイン"
@@ -1396,12 +1424,13 @@ msgstr "ログアウト"
 
 #: ../actions/register.php:166 actions/register.php:180
 #: actions/register.php:393 actions/register.php:439 actions/register.php:443
+#: actions/register.php:449
 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 actions/login.php:236
+#: lib/facebookaction.php:327 actions/login.php:236 actions/login.php:263
 msgid "Lost or forgotten password?"
 msgstr "パスワードを紛失、忘れた？"
 
@@ -1441,7 +1470,7 @@ 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:487
+#: actions/register.php:477 actions/register.php:487 actions/register.php:493
 msgid "My text and files are available under "
 msgstr "の下でテキスト及びファイルを利用可能"
 
@@ -1499,7 +1528,8 @@ msgstr "新しいパスワードの保存に成功しました。ログインし
 #: 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
+#: actions/showgroup.php:236 actions/showstream.php:249 actions/login.php:246
+#: actions/register.php:423 lib/userprofile.php:131
 msgid "Nickname"
 msgstr "ニックネーム"
 
@@ -1513,7 +1543,7 @@ msgstr "ニックネーム"
 #: 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
+#: actions/register.php:202 actions/register.php:208
 msgid "Nickname already in use. Try another one."
 msgstr "そのニックネームは既に使用されています。他のものを試してみて下さい。"
 
@@ -1529,7 +1559,7 @@ msgstr "そのニックネームは既に使用されています。他のもの
 #: 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
+#: actions/register.php:199 actions/register.php:205
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
 "ニックネームには、小文字アルファベットと数字のみ使用できます。スペースは使用"
@@ -1770,7 +1800,8 @@ msgstr ""
 #: 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
+#: lib/api.php:954 lib/api.php:982 lib/api.php:1092 lib/api.php:963
+#: lib/api.php:991 lib/api.php:1101
 msgid "Not a supported data format."
 msgstr ""
 
@@ -1791,7 +1822,7 @@ 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
+#: actions/register.php:189 actions/register.php:195 actions/register.php:201
 msgid "Not a valid email address."
 msgstr "有効なメールアドレスではありません。"
 
@@ -1803,7 +1834,7 @@ msgstr "有効なメールアドレスではありません。"
 #: 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
+#: actions/register.php:204 actions/register.php:210
 msgid "Not a valid nickname."
 msgstr "有効なニックネームではありません。"
 
@@ -1842,6 +1873,7 @@ msgstr "想定外のレスポンスです！"
 #: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
 #: actions/twitapistatuses.php:309 actions/twitapistatuses.php:327
 #: actions/twitapistatuses.php:284 actions/apistatusesupdate.php:186
+#: actions/apistatusesupdate.php:193
 msgid "Not found"
 msgstr ""
 
@@ -1988,7 +2020,8 @@ msgstr "不完全なアップロード。"
 #: 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
+#: lib/accountsettingsaction.php:114 actions/login.php:249
+#: actions/register.php:428
 msgid "Password"
 msgstr "パスワード"
 
@@ -2017,6 +2050,7 @@ msgstr "パスワード回復のリクエストされました"
 #: actions/passwordsettings.php:173 actions/recoverpassword.php:200
 #: actions/passwordsettings.php:178 actions/recoverpassword.php:208
 #: actions/passwordsettings.php:184 actions/recoverpassword.php:211
+#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "パスワードが保存されました。"
 
@@ -2025,6 +2059,7 @@ msgstr "パスワードが保存されました。"
 #: actions/passwordsettings.php:145 actions/register.php:183
 #: actions/passwordsettings.php:150 actions/register.php:220
 #: actions/passwordsettings.php:156 actions/register.php:227
+#: actions/register.php:233
 msgid "Passwords don't match."
 msgstr "パスワードが一致しません。"
 
@@ -2187,19 +2222,19 @@ msgstr "不明なユーザのための回復コード。"
 #: 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
+#: lib/logingroupnav.php:85 actions/register.php:114 actions/register.php:502
 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
+#: actions/register.php:129 actions/register.php:135
 msgid "Registration not allowed."
 msgstr ""
 
 #: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67 actions/register.php:106
+#: actions/register.php:67 actions/register.php:106 actions/register.php:112
 msgid "Registration successful"
 msgstr ""
 
@@ -2213,6 +2248,7 @@ msgstr "拒否"
 #: 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
+#: actions/login.php:252 actions/register.php:477
 msgid "Remember me"
 msgstr "ログイン状態を保持"
 
@@ -2311,6 +2347,7 @@ msgstr "上と同じパスワード"
 
 #: ../actions/register.php:156 actions/register.php:170
 #: actions/register.php:377 actions/register.php:423 actions/register.php:427
+#: actions/register.php:433
 msgid "Same as password above. Required."
 msgstr ""
 
@@ -2467,6 +2504,7 @@ msgstr "保存された OpenID は見つかりません。"
 #: actions/remotesubscribe.php:113 actions/showstream.php:376
 #: lib/subscribeform.php:139 actions/showstream.php:345
 #: actions/remotesubscribe.php:137 actions/showstream.php:439
+#: lib/userprofile.php:321
 msgid "Subscribe"
 msgstr "購読"
 
@@ -2513,6 +2551,7 @@ msgstr "ファイルのアップロードでシステムエラー"
 #: actions/profilesettings.php:123 actions/showstream.php:255
 #: lib/subscriptionlist.php:106 lib/subscriptionlist.php:108
 #: actions/profilesettings.php:138 actions/showstream.php:327
+#: lib/userprofile.php:209
 msgid "Tags"
 msgstr ""
 
@@ -2725,6 +2764,7 @@ msgstr ""
 #: actions/apifriendshipsdestroy.php:91 actions/apigroupcreate.php:104
 #: actions/apigroupjoin.php:91 actions/apigroupleave.php:91
 #: actions/apistatusesupdate.php:109
+#: actions/apiaccountupdateprofileimage.php:84
 msgid "This method requires a POST."
 msgstr ""
 
@@ -2759,7 +2799,7 @@ msgstr ""
 
 #: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
 #: actions/twitapifriendships.php:132 actions/twitapifriendships.php:139
-#: actions/apifriendshipsexists.php:103
+#: actions/apifriendshipsexists.php:103 actions/apifriendshipsexists.php:94
 msgid "Two user ids or screen_names must be supplied."
 msgstr ""
 
@@ -2767,7 +2807,7 @@ msgstr ""
 #: 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
+#: actions/register.php:448 actions/register.php:454
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "ホームページ、ブログ、プロファイル、その他サイトの URL"
 
@@ -2789,6 +2829,7 @@ msgstr "プロファイルサービスまたはマイクロブロギングサー
 #: actions/twittersettings.php:322 lib/designsettings.php:301
 #: actions/emailsettings.php:255 actions/grouplogo.php:319
 #: actions/imsettings.php:220 actions/smssettings.php:248
+#: actions/avatarsettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "予期せぬフォーム送信です。"
 
@@ -2899,7 +2940,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
+#: actions/register.php:436 actions/register.php:438 actions/register.php:442
 msgid "Used only for updates, announcements, and password recovery"
 msgstr "更新、アナウンス、パスワードリカバリーでのみ使用されます。"
 
@@ -2927,7 +2968,8 @@ 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
+#: actions/apiusershow.php:108 actions/apiaccountupdateprofileimage.php:124
+#: actions/apiaccountupdateprofileimage.php:130
 msgid "User has no profile."
 msgstr "プロファイルがありません。"
 
@@ -2956,7 +2998,7 @@ msgstr "最近どう %s?"
 #: 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
+#: actions/register.php:466 actions/register.php:472
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "いる場所, 例えば \"City, State (or Region), Country\""
 
@@ -3056,7 +3098,7 @@ 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:192
+#: actions/register.php:186 actions/register.php:192 actions/register.php:198
 msgid "You can't register if you don't agree to the license."
 msgstr "ライセンスに同意頂けない場合は登録できません。"
 
@@ -3121,56 +3163,56 @@ msgstr ""
 "することができます。ここで関連付ける OpenID を管理して下さい。"
 
 #: ../lib/util.php:943 lib/util.php:992 lib/util.php:945 lib/util.php:756
-#: lib/util.php:770 lib/util.php:816
+#: lib/util.php:770 lib/util.php:816 lib/util.php:844
 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:828
+#: lib/util.php:782 lib/util.php:828 lib/util.php:856
 #, php-format
 msgid "about %d days ago"
 msgstr "約 %d 日前"
 
 #: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953 lib/util.php:764
-#: lib/util.php:778 lib/util.php:824
+#: lib/util.php:778 lib/util.php:824 lib/util.php:852
 #, php-format
 msgid "about %d hours ago"
 msgstr "約 %d 時間前"
 
 #: ../lib/util.php:947 lib/util.php:996 lib/util.php:949 lib/util.php:760
-#: lib/util.php:774 lib/util.php:820
+#: lib/util.php:774 lib/util.php:820 lib/util.php:848
 #, php-format
 msgid "about %d minutes ago"
 msgstr "約 %d 分前"
 
 #: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961 lib/util.php:772
-#: lib/util.php:786 lib/util.php:832
+#: lib/util.php:786 lib/util.php:832 lib/util.php:860
 #, php-format
 msgid "about %d months ago"
 msgstr "約 %d ヵ月前"
 
 #: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955 lib/util.php:766
-#: lib/util.php:780 lib/util.php:826
+#: lib/util.php:780 lib/util.php:826 lib/util.php:854
 msgid "about a day ago"
 msgstr "約 1 日前"
 
 #: ../lib/util.php:945 lib/util.php:994 lib/util.php:947 lib/util.php:758
-#: lib/util.php:772 lib/util.php:818
+#: lib/util.php:772 lib/util.php:818 lib/util.php:846
 msgid "about a minute ago"
 msgstr "約 1 分前"
 
 #: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959 lib/util.php:770
-#: lib/util.php:784 lib/util.php:830
+#: lib/util.php:784 lib/util.php:830 lib/util.php:858
 msgid "about a month ago"
 msgstr "約 1 ヵ月前"
 
 #: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963 lib/util.php:774
-#: lib/util.php:788 lib/util.php:834
+#: lib/util.php:788 lib/util.php:834 lib/util.php:862
 msgid "about a year ago"
 msgstr "約 1 年前"
 
 #: ../lib/util.php:949 lib/util.php:998 lib/util.php:951 lib/util.php:762
-#: lib/util.php:776 lib/util.php:822
+#: lib/util.php:776 lib/util.php:822 lib/util.php:850
 msgid "about an hour ago"
 msgstr "約 1 時間前"
 
@@ -3240,7 +3282,9 @@ msgstr "<< 前"
 #: 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
+#: actions/userauthorization.php:52 actions/login.php:131
+#: actions/register.php:165 actions/avatarsettings.php:265
+#: lib/designsettings.php:294
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
@@ -3460,6 +3504,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
+#: actions/register.php:230
 msgid "Password must be 6 or more characters."
 msgstr ""
 
@@ -3999,13 +4044,13 @@ msgid "There was a problem with your session token. "
 msgstr ""
 
 #: actions/avatarsettings.php:303 actions/grouplogo.php:360
-#: actions/avatarsettings.php:308
+#: actions/avatarsettings.php:308 actions/avatarsettings.php:322
 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
+#: actions/grouplogo.php:377 actions/avatarsettings.php:337
 msgid "Lost our file data."
 msgstr ""
 
@@ -4493,7 +4538,7 @@ msgid "%s left group %s"
 msgstr ""
 
 #: actions/login.php:225 lib/facebookaction.php:304 actions/login.php:208
-#: actions/login.php:216
+#: actions/login.php:216 actions/login.php:243
 msgid "Login to site"
 msgstr ""
 
@@ -4682,7 +4727,8 @@ 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
+#: actions/register.php:398 actions/register.php:85 actions/register.php:189
+#: actions/register.php:404
 msgid "Sorry, only invited people can register."
 msgstr ""
 
@@ -4772,7 +4818,7 @@ msgstr "そのような通知はありません。"
 #: 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
+#: lib/profilelist.php:230 lib/userprofile.php:177
 msgid "URL"
 msgstr ""
 
@@ -4783,7 +4829,7 @@ msgstr ""
 #: 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
+#: lib/profilelist.php:245 lib/userprofile.php:194
 #, fuzzy
 msgid "Note"
 msgstr "通知"
@@ -4832,6 +4878,7 @@ msgid "Only the sender and recipient "
 msgstr ""
 
 #: actions/showstream.php:73 actions/showstream.php:78
+#: actions/showstream.php:79
 #, php-format
 msgid "%s, page %d"
 msgstr ""
@@ -4843,29 +4890,30 @@ msgstr "プロファイル"
 
 #: actions/showstream.php:236 actions/tagother.php:77
 #: actions/showstream.php:220 actions/showstream.php:185
-#: actions/showstream.php:193
+#: actions/showstream.php:193 lib/userprofile.php:75
 #, 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
+#: actions/showstream.php:220 lib/userprofile.php:102
 msgid "Photo"
 msgstr ""
 
 #: actions/showstream.php:317 actions/showstream.php:309
 #: actions/showstream.php:274 actions/showstream.php:354
+#: lib/userprofile.php:236
 msgid "User actions"
 msgstr ""
 
 #: actions/showstream.php:342 actions/showstream.php:307
-#: actions/showstream.php:390
+#: actions/showstream.php:390 lib/userprofile.php:272
 msgid "Send a direct message to this user"
 msgstr ""
 
 #: actions/showstream.php:343 actions/showstream.php:308
-#: actions/showstream.php:391
+#: actions/showstream.php:391 lib/userprofile.php:273
 msgid "Message"
 msgstr ""
 
@@ -5580,7 +5628,7 @@ msgstr "%s & ともだち"
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr ""
 
-#: actions/avatarsettings.php:373
+#: actions/avatarsettings.php:373 actions/avatarsettings.php:387
 #, fuzzy
 msgid "Avatar deleted."
 msgstr "アバターが更新されました。"
@@ -5709,10 +5757,12 @@ msgid ""
 msgstr ""
 
 #: actions/register.php:432 actions/register.php:479 actions/register.php:489
+#: actions/register.php:495
 msgid "Creative Commons Attribution 3.0"
 msgstr ""
 
 #: actions/register.php:433 actions/register.php:480 actions/register.php:490
+#: actions/register.php:496
 #, fuzzy
 msgid ""
 " except this private data: password, email address, IM address, and phone "
@@ -5747,44 +5797,48 @@ msgid "%s's profile"
 msgstr "プロファイル"
 
 #: actions/showstream.php:163 actions/showstream.php:128
+#: actions/showstream.php:129
 #, fuzzy, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "%sの通知フィード"
 
 #: actions/showstream.php:170 actions/showstream.php:135
+#: actions/showstream.php:136
 #, fuzzy, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "%sの通知フィード"
 
 #: actions/showstream.php:177 actions/showstream.php:142
+#: actions/showstream.php:143
 #, fuzzy, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "%sの通知フィード"
 
 #: actions/showstream.php:182 actions/showstream.php:147
+#: actions/showstream.php:148
 #, php-format
 msgid "FOAF for %s"
 msgstr ""
 
 #: actions/showstream.php:237 actions/showstream.php:202
-#: actions/showstream.php:234
+#: actions/showstream.php:234 lib/userprofile.php:116
 #, fuzzy
 msgid "Edit Avatar"
 msgstr "アバター"
 
 #: actions/showstream.php:316 actions/showstream.php:281
-#: actions/showstream.php:366
+#: actions/showstream.php:366 lib/userprofile.php:248
 #, fuzzy
 msgid "Edit profile settings"
 msgstr "プロファイル設定"
 
 #: actions/showstream.php:317 actions/showstream.php:282
-#: actions/showstream.php:367
+#: actions/showstream.php:367 lib/userprofile.php:249
 msgid "Edit"
 msgstr ""
 
 #: actions/showstream.php:542 actions/showstream.php:388
-#: actions/showstream.php:487
+#: actions/showstream.php:487 actions/showstream.php:234
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5827,6 +5881,9 @@ msgstr ""
 #: actions/apistatusesupdate.php:125 actions/apisubscriptions.php:87
 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#: actions/apiaccountupdateprofileimage.php:91
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apistatusesupdate.php:139
 #, fuzzy
 msgid "No such user!"
 msgstr "そのようなユーザはいません。"
@@ -5881,36 +5938,6 @@ msgid ""
 "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 ""
@@ -6081,6 +6108,7 @@ 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
+#: actions/showstream.php:202
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -6258,7 +6286,8 @@ 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
+#: lib/designsettings.php:461 lib/designsettings.php:434
+#: lib/designsettings.php:464
 #, fuzzy
 msgid "Couldn't update your design."
 msgstr "ユーザを更新できません"
@@ -6351,7 +6380,9 @@ msgid "Message sent"
 msgstr ""
 
 #: actions/newnotice.php:93 lib/designsettings.php:281
-#: actions/newnotice.php:94
+#: actions/newnotice.php:94 actions/apiaccountupdateprofileimage.php:97
+#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254
+#: lib/designsettings.php:283
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s bytes) due to its "
@@ -6519,7 +6550,7 @@ msgstr "確認されました。新しいパスワードを入力して下さい
 msgid "Password recover"
 msgstr "パスワード回復のリクエストされました"
 
-#: actions/register.php:86
+#: actions/register.php:86 actions/register.php:92
 #, fuzzy
 msgid "Sorry, invalid invitation code."
 msgstr "確認コードにエラーがあります。"
@@ -6619,28 +6650,31 @@ msgstr "管理者"
 msgid "Not a local notice"
 msgstr "そのようなユーザはいません。"
 
-#: actions/showstream.php:72
+#: actions/showstream.php:72 actions/showstream.php:73
 #, php-format
 msgid " tagged %s"
 msgstr ""
 
-#: actions/showstream.php:121
+#: actions/showstream.php:121 actions/showstream.php:122
 #, fuzzy, php-format
 msgid "Notice feed for %s tagged %s (RSS 1.0)"
 msgstr "%sの通知フィード"
 
 #: actions/showstream.php:350 actions/showstream.php:444
+#: actions/showstream.php:191
 #, 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
+#: actions/showstream.php:196
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
 msgstr ""
 
 #: actions/showstream.php:357 actions/showstream.php:451
+#: actions/showstream.php:198
 #, php-format
 msgid ""
 "You can try to nudge %s or [post something to his or her attention](%%%%"
@@ -6648,6 +6682,7 @@ msgid ""
 msgstr ""
 
 #: actions/showstream.php:393 actions/showstream.php:492
+#: actions/showstream.php:239
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -6795,6 +6830,7 @@ msgid "Problem saving notice. Too long."
 msgstr "通知を保存する際に問題が発生しました。"
 
 #: classes/User.php:319 classes/User.php:327 classes/User.php:334
+#: classes/User.php:333
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr ""
@@ -6874,9 +6910,8 @@ msgid "Background"
 msgstr ""
 
 #: lib/designsettings.php:191
-#, fuzzy
 msgid "Content"
-msgstr "接続"
+msgstr "内容"
 
 #: lib/designsettings.php:204
 #, fuzzy
@@ -6905,10 +6940,12 @@ msgid "Save design"
 msgstr ""
 
 #: lib/designsettings.php:378 lib/designsettings.php:369
+#: lib/designsettings.php:372
 msgid "Bad default color settings: "
 msgstr ""
 
 #: lib/designsettings.php:474 lib/designsettings.php:465
+#: lib/designsettings.php:468
 msgid "Design defaults restored."
 msgstr ""
 
@@ -7099,7 +7136,7 @@ msgid "%s's groups"
 msgstr "%s グループ"
 
 #: actions/apigrouplist.php:103
-#, fuzzy, php-format
+#, php-format
 msgid "Groups %s is a member of on %s."
 msgstr "そのプロファイルは送信されていません。"
 
@@ -7114,16 +7151,18 @@ msgid "Status deleted."
 msgstr "アバターが更新されました。"
 
 #: actions/apistatusesupdate.php:132
+#: actions/apiaccountupdateprofileimage.php:99
 msgid "Unable to handle that much POST data!"
 msgstr ""
 
 #: actions/apistatusesupdate.php:145 actions/newnotice.php:155
-#: scripts/maildaemon.php:71
+#: scripts/maildaemon.php:71 actions/apistatusesupdate.php:152
 #, fuzzy, php-format
 msgid "That's too long. Max notice size is %d chars."
 msgstr "長すぎます。通知は最大 140 字までです。"
 
 #: actions/apistatusesupdate.php:209 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:216
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
@@ -7187,7 +7226,7 @@ msgstr "マイクロブログ by %s"
 msgid "IM is not available."
 msgstr "このページはあなたが承認したメディアタイプでは利用できません。"
 
-#: actions/login.php:259
+#: actions/login.php:259 actions/login.php:286
 #, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -7200,14 +7239,13 @@ msgid "Updates with \"%s\""
 msgstr "マイクロブログ by %s"
 
 #: actions/noticesearchrss.php:91
-#, fuzzy, php-format
+#, php-format
 msgid "Updates matching search term \"%1$s\" on %2$s!"
 msgstr "検索語「%s」に一致するすべての更新"
 
 #: actions/oembed.php:157
-#, fuzzy
 msgid "content type "
-msgstr "接続"
+msgstr "内容種別 "
 
 #: actions/oembed.php:160
 msgid "Only "
@@ -7219,21 +7257,24 @@ msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
 msgstr ""
 
 #: actions/profilesettings.php:122 actions/register.php:454
+#: actions/register.php:460
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d chars"
 msgstr "140字以内で自己紹介"
 
 #: actions/profilesettings.php:125 actions/register.php:457
+#: actions/register.php:463
 #, fuzzy
 msgid "Describe yourself and your interests"
 msgstr "140字以内で自己紹介"
 
 #: actions/profilesettings.php:221 actions/register.php:217
-#, fuzzy, php-format
+#: actions/register.php:223
+#, php-format
 msgid "Bio is too long (max %d chars)."
 msgstr "自己紹介が長すぎます (最長140文字)。"
 
-#: actions/register.php:336
+#: actions/register.php:336 actions/register.php:342
 msgid ""
 "With this form you can create  a new account. You can then post notices and "
 "link up to friends and colleagues. "
@@ -7392,7 +7433,7 @@ msgid "Site content license"
 msgstr "新しい通知"
 
 #: lib/command.php:88
-#, fuzzy, php-format
+#, php-format
 msgid "Could not find a user with nickname %s"
 msgstr "ユーザを更新できません"
 
@@ -7429,41 +7470,6 @@ 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 "No configuration file found. "
@@ -7497,7 +7503,7 @@ msgid "Describe the group or topic in %d characters"
 msgstr "グループやトピックを140字以内記述"
 
 #: lib/jabber.php:192
-#, fuzzy, php-format
+#, php-format
 msgid "notice id: %s"
 msgstr "新しい通知"
 
@@ -7548,7 +7554,6 @@ msgid ""
 msgstr ""
 
 #: lib/mailbox.php:227 lib/noticelist.php:424
-#, fuzzy
 msgid "from"
 msgstr "から "
 
@@ -7565,3 +7570,59 @@ msgstr "ユーザを更新できません"
 #, fuzzy
 msgid "Duplicate notice"
 msgstr "新しい通知"
+
+#: actions/login.php:110 actions/login.php:120
+#, fuzzy
+msgid "Invalid or expired token."
+msgstr "不正な通知内容"
+
+#: lib/command.php:597
+#, fuzzy, php-format
+msgid "Could not create login token for %s"
+msgstr "OpenIDを作成できません : %s"
+
+#: lib/command.php:602
+#, php-format
+msgid "This link is useable only once, and is good for only 2 minutes: %s"
+msgstr ""
+
+#: lib/imagefile.php:75
+#, fuzzy, php-format
+msgid "That file is too big. The maximum file size is %s."
+msgstr "長すぎます。通知は最大 140 字までです。"
+
+#: lib/command.php:613
+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"
+"login - Get a link to login to the web interface\n"
+"drop <group> - leave group\n"
+"stats - get your stats\n"
+"stop - same as 'off'\n"
+"quit - same as 'off'\n"
+"sub <nickname> - same as 'follow'\n"
+"unsub <nickname> - same as 'leave'\n"
+"last <nickname> - same as 'get'\n"
+"on <nickname> - not yet implemented.\n"
+"off <nickname> - not yet implemented.\n"
+"nudge <nickname> - remind a user to update.\n"
+"invite <phone number> - not yet implemented.\n"
+"track <word> - not yet implemented.\n"
+"untrack <word> - not yet implemented.\n"
+"track off - not yet implemented.\n"
+"untrack all - not yet implemented.\n"
+"tracks - not yet implemented.\n"
+"tracking - not yet implemented.\n"
+msgstr ""
diff --git a/locale/ko/LC_MESSAGES/statusnet.mo b/locale/ko/LC_MESSAGES/statusnet.mo
index 572c95567..5b6fe18bf 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 4f304f221..9982d66ae 100644
--- a/locale/ko/LC_MESSAGES/statusnet.po
+++ b/locale/ko/LC_MESSAGES/statusnet.po
@@ -5,12 +5,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-06 13:16+0000\n"
-"PO-Revision-Date: 2009-11-06 15:43:59+0000\n"
+"POT-Creation-Date: 2009-11-08 11:53+0000\n"
+"PO-Revision-Date: 2009-11-08 11:56:45+0000\n"
 "Language-Team: Korean\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r58648); Translate extension (2009-08-03)\n"
+"X-Generator: MediaWiki 1.16alpha(r58760); 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"
@@ -192,7 +192,7 @@ msgid "%s updates from everyone!"
 msgstr "모두로부터의 업데이트 %s개!"
 
 #: ../actions/register.php:213 actions/register.php:497
-#: actions/register.php:545 actions/register.php:555
+#: actions/register.php:545 actions/register.php:555 actions/register.php:561
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -230,6 +230,7 @@ msgstr "1-64자 사이에 영소문자, 숫자로만 씁니다. 기호나 공백
 
 #: ../actions/register.php:152 actions/register.php:166
 #: actions/register.php:368 actions/register.php:414 actions/register.php:418
+#: actions/register.php:424
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr ""
 "1-64자 사이에 영소문자, 숫자로만 씁니다. 기호나 공백을 쓰면 안 됩니다. 필수 "
@@ -248,6 +249,7 @@ msgstr "6글자 이상, 잊어 버리지 마십시오!"
 
 #: ../actions/register.php:154 actions/register.php:168
 #: actions/register.php:373 actions/register.php:419 actions/register.php:423
+#: actions/register.php:429
 msgid "6 or more characters. Required."
 msgstr "6글자 이상이 필요합니다."
 
@@ -426,7 +428,7 @@ msgstr "\"%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
+#: actions/login.php:79 actions/register.php:137
 msgid "Already logged in."
 msgstr "이미 로그인 하셨습니다."
 
@@ -449,7 +451,7 @@ 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/login.php:226
-#: actions/register.php:473
+#: actions/register.php:473 actions/login.php:253 actions/register.php:479
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "앞으로는 자동으로 로그인합니다. 공용 컴퓨터에서는 이용하지 마십시오!"
 
@@ -471,6 +473,7 @@ msgstr "아바타"
 
 #: ../actions/avatar.php:113 actions/profilesettings.php:350
 #: actions/avatarsettings.php:395 actions/avatarsettings.php:346
+#: actions/avatarsettings.php:360
 msgid "Avatar updated."
 msgstr "아바타가 업데이트 되었습니다."
 
@@ -506,7 +509,7 @@ msgstr "뒤로 >>"
 #: 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
+#: actions/register.php:459 actions/register.php:465
 msgid "Bio"
 msgstr "자기소개"
 
@@ -535,6 +538,7 @@ msgstr "아바타 URL '%s'을(를) 읽어낼 수 없습니다."
 #: actions/passwordsettings.php:169 actions/recoverpassword.php:347
 #: actions/passwordsettings.php:174 actions/recoverpassword.php:365
 #: actions/passwordsettings.php:180 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:185
 msgid "Can't save new password."
 msgstr "새 비밀번호를 저장 할 수 없습니다."
 
@@ -597,6 +601,7 @@ msgstr "프로필 세팅 바꾸기"
 #: actions/recoverpassword.php:236 actions/register.php:422
 #: actions/passwordsettings.php:111 actions/recoverpassword.php:239
 #: actions/register.php:426 actions/smssettings.php:134
+#: actions/register.php:432
 msgid "Confirm"
 msgstr "인증"
 
@@ -626,7 +631,7 @@ msgid "Confirmation code not found."
 msgstr "인증 코드가 없습니다."
 
 #: ../actions/register.php:202 actions/register.php:473
-#: actions/register.php:521 actions/register.php:531
+#: actions/register.php:521 actions/register.php:531 actions/register.php:537
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -864,6 +869,7 @@ 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
+#: classes/Notice.php:1120
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "답신을 추가 할 때에 데이타베이스 에러 : %s"
@@ -886,7 +892,8 @@ msgstr "140자 이내에서 자기 소개"
 #: 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
+#: lib/accountsettingsaction.php:117 actions/register.php:437
+#: actions/register.php:441
 msgid "Email"
 msgstr "이메일"
 
@@ -901,7 +908,7 @@ msgid "Email Settings"
 msgstr "이메일 세팅"
 
 #: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
-#: actions/register.php:200 actions/register.php:206
+#: actions/register.php:200 actions/register.php:206 actions/register.php:212
 msgid "Email address already exists."
 msgstr "이메일 주소가 이미 존재 합니다."
 
@@ -987,7 +994,7 @@ msgstr "사용자 저장 오류"
 
 #: ../actions/password.php:80 actions/profilesettings.php:399
 #: actions/passwordsettings.php:164 actions/passwordsettings.php:169
-#: actions/passwordsettings.php:175
+#: actions/passwordsettings.php:175 actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "사용자 저장 오류; 무효한 사용자"
 
@@ -999,6 +1006,7 @@ msgstr "사용자 저장 오류; 무효한 사용자"
 #: actions/login.php:120 actions/recoverpassword.php:372
 #: actions/register.php:235 actions/login.php:122
 #: actions/recoverpassword.php:375 actions/register.php:242
+#: actions/login.php:149 actions/register.php:248
 msgid "Error setting user."
 msgstr "사용자 세팅 오류"
 
@@ -1030,6 +1038,7 @@ msgstr "자주 묻는 질문"
 
 #: ../actions/avatar.php:115 actions/profilesettings.php:352
 #: actions/avatarsettings.php:397 actions/avatarsettings.php:349
+#: actions/avatarsettings.php:363
 msgid "Failed updating avatar."
 msgstr "아바타 업데이트 실패"
 
@@ -1064,6 +1073,7 @@ msgid "Find people on this site"
 msgstr "이 사이트에 있는 사람 찾기"
 
 #: ../actions/login.php:122 actions/login.php:247 actions/login.php:255
+#: actions/login.php:282
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -1080,6 +1090,7 @@ msgstr ""
 #: actions/showstream.php:220 lib/groupeditform.php:157
 #: actions/profilesettings.php:111 actions/register.php:441
 #: actions/showgroup.php:247 actions/showstream.php:267
+#: actions/register.php:447 lib/userprofile.php:149
 msgid "Full name"
 msgstr "실명"
 
@@ -1093,7 +1104,7 @@ msgstr "실명"
 #: 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
+#: actions/register.php:214 actions/register.php:220
 msgid "Full name is too long (max 255 chars)."
 msgstr "실명이 너무 깁니다. (최대 255글자)"
 
@@ -1114,7 +1125,7 @@ msgstr "홈"
 #: 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
+#: actions/register.php:446 actions/register.php:452
 msgid "Homepage"
 msgstr "홈페이지"
 
@@ -1126,7 +1137,7 @@ msgstr "홈페이지"
 #: 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
+#: actions/register.php:211 actions/register.php:217
 msgid "Homepage is not a valid URL."
 msgstr "홈페이지 주소형식이 올바르지 않습니다."
 
@@ -1196,7 +1207,7 @@ 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/login.php:116
+#: actions/facebookhome.php:129 actions/login.php:116 actions/login.php:143
 msgid "Incorrect username or password."
 msgstr "틀린 계정 또는 비밀 번호"
 
@@ -1274,6 +1285,7 @@ msgstr "옳지 않은 크기"
 #: 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
+#: actions/register.php:243 actions/register.php:264
 msgid "Invalid username or password."
 msgstr "사용자 이름이나 비밀 번호가 틀렸습니다."
 
@@ -1350,7 +1362,7 @@ msgstr "언어가 너무 깁니다. (최대 50글자)"
 #: 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
+#: lib/profilelist.php:218 actions/register.php:470 lib/userprofile.php:164
 msgid "Location"
 msgstr "위치"
 
@@ -1364,7 +1376,7 @@ msgstr "위치"
 #: 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
+#: actions/register.php:221 actions/register.php:227
 msgid "Location is too long (max 255 chars)."
 msgstr "위치가 너무 깁니다. (최대 255글자)"
 
@@ -1378,6 +1390,7 @@ msgstr "위치가 너무 깁니다. (최대 255글자)"
 #: 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
+#: actions/login.php:204 actions/login.php:257
 #, php-format
 msgid "Login"
 msgstr "로그인"
@@ -1406,12 +1419,13 @@ msgstr "로그아웃"
 
 #: ../actions/register.php:166 actions/register.php:180
 #: actions/register.php:393 actions/register.php:439 actions/register.php:443
+#: actions/register.php:449
 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 actions/login.php:236
+#: lib/facebookaction.php:327 actions/login.php:236 actions/login.php:263
 msgid "Lost or forgotten password?"
 msgstr "비밀 번호를 잊으셨나요?"
 
@@ -1451,7 +1465,7 @@ 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:487
+#: actions/register.php:477 actions/register.php:487 actions/register.php:493
 msgid "My text and files are available under "
 msgstr "나의 글과 파일의 라이선스는 다음과 같습니다 "
 
@@ -1510,7 +1524,8 @@ msgstr ""
 #: 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
+#: actions/showgroup.php:236 actions/showstream.php:249 actions/login.php:246
+#: actions/register.php:423 lib/userprofile.php:131
 msgid "Nickname"
 msgstr "별명"
 
@@ -1524,7 +1539,7 @@ msgstr "별명"
 #: 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
+#: actions/register.php:202 actions/register.php:208
 msgid "Nickname already in use. Try another one."
 msgstr "별명이 이미 사용중 입니다. 다른 별명을 시도해 보십시오."
 
@@ -1540,7 +1555,7 @@ msgstr "별명이 이미 사용중 입니다. 다른 별명을 시도해 보십�
 #: 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
+#: actions/register.php:199 actions/register.php:205
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
 "별명은 반드시 영소문자와 숫자로만 이루어져야 하며 스페이스의 사용이 불가 합니"
@@ -1781,7 +1796,8 @@ msgstr "가입된 사용자가 아닙니다."
 #: 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
+#: lib/api.php:954 lib/api.php:982 lib/api.php:1092 lib/api.php:963
+#: lib/api.php:991 lib/api.php:1101
 msgid "Not a supported data format."
 msgstr "지원하는 형식의 데이터가 아닙니다."
 
@@ -1802,7 +1818,7 @@ 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
+#: actions/register.php:189 actions/register.php:195 actions/register.php:201
 msgid "Not a valid email address."
 msgstr "유효한 이메일 주소가 아닙니다."
 
@@ -1814,7 +1830,7 @@ msgstr "유효한 이메일 주소가 아닙니다."
 #: 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
+#: actions/register.php:204 actions/register.php:210
 msgid "Not a valid nickname."
 msgstr "유효한 별명이 아닙니다"
 
@@ -1853,6 +1869,7 @@ msgstr "예상치 못한 반응 입니다."
 #: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
 #: actions/twitapistatuses.php:309 actions/twitapistatuses.php:327
 #: actions/twitapistatuses.php:284 actions/apistatusesupdate.php:186
+#: actions/apistatusesupdate.php:193
 msgid "Not found"
 msgstr "찾지 못함"
 
@@ -1999,7 +2016,8 @@ msgstr "불완전한 업로드."
 #: 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
+#: lib/accountsettingsaction.php:114 actions/login.php:249
+#: actions/register.php:428
 msgid "Password"
 msgstr "비밀 번호"
 
@@ -2028,6 +2046,7 @@ msgstr "비밀 번호 복구가 요청되었습니다."
 #: actions/passwordsettings.php:173 actions/recoverpassword.php:200
 #: actions/passwordsettings.php:178 actions/recoverpassword.php:208
 #: actions/passwordsettings.php:184 actions/recoverpassword.php:211
+#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "비밀 번호 저장"
 
@@ -2036,6 +2055,7 @@ msgstr "비밀 번호 저장"
 #: actions/passwordsettings.php:145 actions/register.php:183
 #: actions/passwordsettings.php:150 actions/register.php:220
 #: actions/passwordsettings.php:156 actions/register.php:227
+#: actions/register.php:233
 msgid "Passwords don't match."
 msgstr "비밀 번호가 일치하지 않습니다."
 
@@ -2198,19 +2218,19 @@ msgstr "알 수 없는 취소를 위한 리커버리 코드"
 #: 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
+#: lib/logingroupnav.php:85 actions/register.php:114 actions/register.php:502
 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
+#: actions/register.php:129 actions/register.php:135
 msgid "Registration not allowed."
 msgstr "가입이 허용되지 않습니다."
 
 #: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67 actions/register.php:106
+#: actions/register.php:67 actions/register.php:106 actions/register.php:112
 msgid "Registration successful"
 msgstr "회원 가입이 성공적입니다."
 
@@ -2224,6 +2244,7 @@ msgstr "거부"
 #: 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
+#: actions/login.php:252 actions/register.php:477
 msgid "Remember me"
 msgstr "자동 로그인"
 
@@ -2322,6 +2343,7 @@ msgstr "위와 같은 비밀 번호"
 
 #: ../actions/register.php:156 actions/register.php:170
 #: actions/register.php:377 actions/register.php:423 actions/register.php:427
+#: actions/register.php:433
 msgid "Same as password above. Required."
 msgstr "위와 같은 비밀 번호. 필수 사항."
 
@@ -2484,6 +2506,7 @@ msgstr "저장된 OpenID를 찾을 수 없습니다."
 #: actions/remotesubscribe.php:113 actions/showstream.php:376
 #: lib/subscribeform.php:139 actions/showstream.php:345
 #: actions/remotesubscribe.php:137 actions/showstream.php:439
+#: lib/userprofile.php:321
 msgid "Subscribe"
 msgstr "구독"
 
@@ -2530,6 +2553,7 @@ msgstr "파일을 올리는데 시스템 오류 발생"
 #: actions/profilesettings.php:123 actions/showstream.php:255
 #: lib/subscriptionlist.php:106 lib/subscriptionlist.php:108
 #: actions/profilesettings.php:138 actions/showstream.php:327
+#: lib/userprofile.php:209
 msgid "Tags"
 msgstr "태그"
 
@@ -2746,6 +2770,7 @@ msgstr "이 메서드는 등록 또는 삭제를 요구합니다."
 #: actions/apifriendshipsdestroy.php:91 actions/apigroupcreate.php:104
 #: actions/apigroupjoin.php:91 actions/apigroupleave.php:91
 #: actions/apistatusesupdate.php:109
+#: actions/apiaccountupdateprofileimage.php:84
 msgid "This method requires a POST."
 msgstr "이 메서드는 등록을 요구합니다."
 
@@ -2779,7 +2804,7 @@ msgstr ""
 
 #: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
 #: actions/twitapifriendships.php:132 actions/twitapifriendships.php:139
-#: actions/apifriendshipsexists.php:103
+#: actions/apifriendshipsexists.php:103 actions/apifriendshipsexists.php:94
 msgid "Two user ids or screen_names must be supplied."
 msgstr "두 개의 사용자 ID나 대화명을 입력해야 합니다."
 
@@ -2787,7 +2812,7 @@ msgstr "두 개의 사용자 ID나 대화명을 입력해야 합니다."
 #: 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
+#: actions/register.php:448 actions/register.php:454
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "귀하의 홈페이지, 블로그 혹은 다른 사이트의 프로필 페이지 URL"
 
@@ -2809,6 +2834,7 @@ msgstr "다른 마이크로블로깅 서비스의 귀하의 프로필 URL"
 #: actions/twittersettings.php:322 lib/designsettings.php:301
 #: actions/emailsettings.php:255 actions/grouplogo.php:319
 #: actions/imsettings.php:220 actions/smssettings.php:248
+#: actions/avatarsettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "잘못된 폼 제출"
 
@@ -2918,7 +2944,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
+#: actions/register.php:436 actions/register.php:438 actions/register.php:442
 msgid "Used only for updates, announcements, and password recovery"
 msgstr "업데이트나 공지, 비밀번호 찾기에 사용하세요."
 
@@ -2946,7 +2972,8 @@ 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
+#: actions/apiusershow.php:108 actions/apiaccountupdateprofileimage.php:124
+#: actions/apiaccountupdateprofileimage.php:130
 msgid "User has no profile."
 msgstr "이용자가 프로필을 가지고 있지 않습니다."
 
@@ -2975,7 +3002,7 @@ msgstr "뭐하세요? %?"
 #: 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
+#: actions/register.php:466 actions/register.php:472
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "당신은 어디에 삽니까? \"시, 도 (or 군,구), 나라"
 
@@ -3079,7 +3106,7 @@ 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:192
+#: actions/register.php:186 actions/register.php:192 actions/register.php:198
 msgid "You can't register if you don't agree to the license."
 msgstr "라이선스에 동의하지 않는다면 등록할 수 없습니다."
 
@@ -3148,56 +3175,56 @@ msgstr ""
 "있게 해줍니다. 여기에서 당신의 관련된 오픈ID를 관리하세요."
 
 #: ../lib/util.php:943 lib/util.php:992 lib/util.php:945 lib/util.php:756
-#: lib/util.php:770 lib/util.php:816
+#: lib/util.php:770 lib/util.php:816 lib/util.php:844
 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:828
+#: lib/util.php:782 lib/util.php:828 lib/util.php:856
 #, php-format
 msgid "about %d days ago"
 msgstr "%d일 전"
 
 #: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953 lib/util.php:764
-#: lib/util.php:778 lib/util.php:824
+#: lib/util.php:778 lib/util.php:824 lib/util.php:852
 #, php-format
 msgid "about %d hours ago"
 msgstr "%d시간 전"
 
 #: ../lib/util.php:947 lib/util.php:996 lib/util.php:949 lib/util.php:760
-#: lib/util.php:774 lib/util.php:820
+#: lib/util.php:774 lib/util.php:820 lib/util.php:848
 #, php-format
 msgid "about %d minutes ago"
 msgstr "%d분 전"
 
 #: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961 lib/util.php:772
-#: lib/util.php:786 lib/util.php:832
+#: lib/util.php:786 lib/util.php:832 lib/util.php:860
 #, php-format
 msgid "about %d months ago"
 msgstr "%d달 전"
 
 #: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955 lib/util.php:766
-#: lib/util.php:780 lib/util.php:826
+#: lib/util.php:780 lib/util.php:826 lib/util.php:854
 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:818
+#: lib/util.php:772 lib/util.php:818 lib/util.php:846
 msgid "about a minute ago"
 msgstr "1분 전"
 
 #: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959 lib/util.php:770
-#: lib/util.php:784 lib/util.php:830
+#: lib/util.php:784 lib/util.php:830 lib/util.php:858
 msgid "about a month ago"
 msgstr "1달 전"
 
 #: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963 lib/util.php:774
-#: lib/util.php:788 lib/util.php:834
+#: lib/util.php:788 lib/util.php:834 lib/util.php:862
 msgid "about a year ago"
 msgstr "1년 전"
 
 #: ../lib/util.php:949 lib/util.php:998 lib/util.php:951 lib/util.php:762
-#: lib/util.php:776 lib/util.php:822
+#: lib/util.php:776 lib/util.php:822 lib/util.php:850
 msgid "about an hour ago"
 msgstr "1시간 전"
 
@@ -3266,7 +3293,9 @@ msgstr "<< 뒤에"
 #: 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
+#: actions/userauthorization.php:52 actions/login.php:131
+#: actions/register.php:165 actions/avatarsettings.php:265
+#: lib/designsettings.php:294
 msgid "There was a problem with your session token. Try again, please."
 msgstr "세션토큰에 문제가 있습니다. 다시 시도해주세요."
 
@@ -3490,6 +3519,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
+#: actions/register.php:230
 msgid "Password must be 6 or more characters."
 msgstr "비밀번호는 6자리 이상이어야 합니다."
 
@@ -4040,13 +4070,13 @@ msgid "There was a problem with your session token. "
 msgstr "당신의 세션토큰에 문제가 있습니다."
 
 #: actions/avatarsettings.php:303 actions/grouplogo.php:360
-#: actions/avatarsettings.php:308
+#: actions/avatarsettings.php:308 actions/avatarsettings.php:322
 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
+#: actions/grouplogo.php:377 actions/avatarsettings.php:337
 msgid "Lost our file data."
 msgstr "파일 데이터를 잃어버렸습니다."
 
@@ -4502,7 +4532,7 @@ msgid "%s left group %s"
 msgstr "%s가 그룹%s를 떠났습니다."
 
 #: actions/login.php:225 lib/facebookaction.php:304 actions/login.php:208
-#: actions/login.php:216
+#: actions/login.php:216 actions/login.php:243
 msgid "Login to site"
 msgstr "사이트에 로그인하세요."
 
@@ -4680,7 +4710,8 @@ 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
+#: actions/register.php:398 actions/register.php:85 actions/register.php:189
+#: actions/register.php:404
 msgid "Sorry, only invited people can register."
 msgstr "죄송합니다. 단지 초대된 사람들만 등록할 수 있습니다."
 
@@ -4762,7 +4793,7 @@ msgstr "그룹 프로필"
 #: 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
+#: lib/profilelist.php:230 lib/userprofile.php:177
 msgid "URL"
 msgstr "URL"
 
@@ -4773,7 +4804,7 @@ msgstr "URL"
 #: 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
+#: lib/profilelist.php:245 lib/userprofile.php:194
 msgid "Note"
 msgstr "설명"
 
@@ -4822,6 +4853,7 @@ msgid "Only the sender and recipient "
 msgstr "오직 보내는 사람과 받는 사람"
 
 #: actions/showstream.php:73 actions/showstream.php:78
+#: actions/showstream.php:79
 #, php-format
 msgid "%s, page %d"
 msgstr "%s, %d 페이지"
@@ -4832,28 +4864,29 @@ msgstr "'의 프로필"
 
 #: actions/showstream.php:236 actions/tagother.php:77
 #: actions/showstream.php:220 actions/showstream.php:185
-#: actions/showstream.php:193
+#: actions/showstream.php:193 lib/userprofile.php:75
 msgid "User profile"
 msgstr "이용자 프로필"
 
 #: actions/showstream.php:240 actions/tagother.php:81
 #: actions/showstream.php:224 actions/showstream.php:189
-#: actions/showstream.php:220
+#: actions/showstream.php:220 lib/userprofile.php:102
 msgid "Photo"
 msgstr "사진"
 
 #: actions/showstream.php:317 actions/showstream.php:309
 #: actions/showstream.php:274 actions/showstream.php:354
+#: lib/userprofile.php:236
 msgid "User actions"
 msgstr "사용자 동작"
 
 #: actions/showstream.php:342 actions/showstream.php:307
-#: actions/showstream.php:390
+#: actions/showstream.php:390 lib/userprofile.php:272
 msgid "Send a direct message to this user"
 msgstr "이 회원에게 직접 메시지를 보냅니다."
 
 #: actions/showstream.php:343 actions/showstream.php:308
-#: actions/showstream.php:391
+#: actions/showstream.php:391 lib/userprofile.php:273
 msgid "Message"
 msgstr "메시지"
 
@@ -5555,7 +5588,7 @@ msgstr "%s 및 친구들"
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr "당신의 개인적인 아바타를 업로드할 수 있습니다."
 
-#: actions/avatarsettings.php:373
+#: actions/avatarsettings.php:373 actions/avatarsettings.php:387
 #, fuzzy
 msgid "Avatar deleted."
 msgstr "아바타가 업데이트 되었습니다."
@@ -5690,10 +5723,12 @@ msgid ""
 msgstr ""
 
 #: actions/register.php:432 actions/register.php:479 actions/register.php:489
+#: actions/register.php:495
 msgid "Creative Commons Attribution 3.0"
 msgstr ""
 
 #: actions/register.php:433 actions/register.php:480 actions/register.php:490
+#: actions/register.php:496
 #, fuzzy
 msgid ""
 " except this private data: password, email address, IM address, and phone "
@@ -5728,44 +5763,48 @@ msgid "%s's profile"
 msgstr "'의 프로필"
 
 #: actions/showstream.php:163 actions/showstream.php:128
+#: actions/showstream.php:129
 #, fuzzy, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "%s의 통지 피드"
 
 #: actions/showstream.php:170 actions/showstream.php:135
+#: actions/showstream.php:136
 #, fuzzy, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "%s의 통지 피드"
 
 #: actions/showstream.php:177 actions/showstream.php:142
+#: actions/showstream.php:143
 #, fuzzy, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "%s의 통지 피드"
 
 #: actions/showstream.php:182 actions/showstream.php:147
+#: actions/showstream.php:148
 #, fuzzy, php-format
 msgid "FOAF for %s"
 msgstr "%s의 보낸쪽지함"
 
 #: actions/showstream.php:237 actions/showstream.php:202
-#: actions/showstream.php:234
+#: actions/showstream.php:234 lib/userprofile.php:116
 #, fuzzy
 msgid "Edit Avatar"
 msgstr "아바타"
 
 #: actions/showstream.php:316 actions/showstream.php:281
-#: actions/showstream.php:366
+#: actions/showstream.php:366 lib/userprofile.php:248
 #, fuzzy
 msgid "Edit profile settings"
 msgstr "프로필 세팅"
 
 #: actions/showstream.php:317 actions/showstream.php:282
-#: actions/showstream.php:367
+#: actions/showstream.php:367 lib/userprofile.php:249
 msgid "Edit"
 msgstr ""
 
 #: actions/showstream.php:542 actions/showstream.php:388
-#: actions/showstream.php:487
+#: actions/showstream.php:487 actions/showstream.php:234
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5810,6 +5849,9 @@ msgstr ""
 #: actions/apistatusesupdate.php:125 actions/apisubscriptions.php:87
 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#: actions/apiaccountupdateprofileimage.php:91
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apistatusesupdate.php:139
 #, fuzzy
 msgid "No such user!"
 msgstr "그러한 사용자가 없습니다."
@@ -5870,36 +5912,6 @@ msgid ""
 "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 ""
@@ -6066,6 +6078,7 @@ 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
+#: actions/showstream.php:202
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -6247,7 +6260,8 @@ 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
+#: lib/designsettings.php:461 lib/designsettings.php:434
+#: lib/designsettings.php:464
 #, fuzzy
 msgid "Couldn't update your design."
 msgstr "사용자를 업데이트 할 수 없습니다."
@@ -6343,7 +6357,9 @@ msgid "Message sent"
 msgstr "메시지"
 
 #: actions/newnotice.php:93 lib/designsettings.php:281
-#: actions/newnotice.php:94
+#: actions/newnotice.php:94 actions/apiaccountupdateprofileimage.php:97
+#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254
+#: lib/designsettings.php:283
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s bytes) due to its "
@@ -6512,7 +6528,7 @@ msgstr "당신은 인증되었습니다. 아래 새 비밀번호를 입력하세
 msgid "Password recover"
 msgstr "비밀 번호 복구가 요청되었습니다."
 
-#: actions/register.php:86
+#: actions/register.php:86 actions/register.php:92
 #, fuzzy
 msgid "Sorry, invalid invitation code."
 msgstr "확인 코드 오류"
@@ -6614,28 +6630,31 @@ msgstr "관리자"
 msgid "Not a local notice"
 msgstr "로컬 사용자 아닙니다."
 
-#: actions/showstream.php:72
+#: actions/showstream.php:72 actions/showstream.php:73
 #, fuzzy, php-format
 msgid " tagged %s"
 msgstr "%s 태그된 통지"
 
-#: actions/showstream.php:121
+#: actions/showstream.php:121 actions/showstream.php:122
 #, fuzzy, php-format
 msgid "Notice feed for %s tagged %s (RSS 1.0)"
 msgstr "%s 그룹을 위한 공지피드"
 
 #: actions/showstream.php:350 actions/showstream.php:444
+#: actions/showstream.php:191
 #, 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
+#: actions/showstream.php:196
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
 msgstr ""
 
 #: actions/showstream.php:357 actions/showstream.php:451
+#: actions/showstream.php:198
 #, php-format
 msgid ""
 "You can try to nudge %s or [post something to his or her attention](%%%%"
@@ -6643,6 +6662,7 @@ msgid ""
 msgstr ""
 
 #: actions/showstream.php:393 actions/showstream.php:492
+#: actions/showstream.php:239
 #, fuzzy, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -6795,6 +6815,7 @@ msgid "Problem saving notice. Too long."
 msgstr "통지를 저장하는데 문제가 발생했습니다."
 
 #: classes/User.php:319 classes/User.php:327 classes/User.php:334
+#: classes/User.php:333
 #, fuzzy, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "%2$s에서 %1$s까지 메시지"
@@ -6905,10 +6926,12 @@ msgid "Save design"
 msgstr ""
 
 #: lib/designsettings.php:378 lib/designsettings.php:369
+#: lib/designsettings.php:372
 msgid "Bad default color settings: "
 msgstr ""
 
 #: lib/designsettings.php:474 lib/designsettings.php:465
+#: lib/designsettings.php:468
 msgid "Design defaults restored."
 msgstr ""
 
@@ -7115,16 +7138,18 @@ msgid "Status deleted."
 msgstr "아바타가 업데이트 되었습니다."
 
 #: actions/apistatusesupdate.php:132
+#: actions/apiaccountupdateprofileimage.php:99
 msgid "Unable to handle that much POST data!"
 msgstr ""
 
 #: actions/apistatusesupdate.php:145 actions/newnotice.php:155
-#: scripts/maildaemon.php:71
+#: scripts/maildaemon.php:71 actions/apistatusesupdate.php:152
 #, fuzzy, php-format
 msgid "That's too long. Max notice size is %d chars."
 msgstr "너무 깁니다. 통지의 최대 길이는 140글자 입니다."
 
 #: actions/apistatusesupdate.php:209 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:216
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
@@ -7189,7 +7214,7 @@ msgstr "%2$s에 있는 %1$s의 업데이트!"
 msgid "IM is not available."
 msgstr "이 페이지는 귀하가 승인한 미디어 타입에서는 이용할 수 없습니다."
 
-#: actions/login.php:259
+#: actions/login.php:259 actions/login.php:286
 #, fuzzy, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -7224,21 +7249,24 @@ msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
 msgstr ""
 
 #: actions/profilesettings.php:122 actions/register.php:454
+#: actions/register.php:460
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d chars"
 msgstr "140자 이내에서 자기 소개"
 
 #: actions/profilesettings.php:125 actions/register.php:457
+#: actions/register.php:463
 #, fuzzy
 msgid "Describe yourself and your interests"
 msgstr "당신에 대해 소개해주세요."
 
 #: actions/profilesettings.php:221 actions/register.php:217
+#: actions/register.php:223
 #, fuzzy, php-format
 msgid "Bio is too long (max %d chars)."
 msgstr "자기소개가 너무 깁니다. (최대 140글자)"
 
-#: actions/register.php:336
+#: actions/register.php:336 actions/register.php:342
 msgid ""
 "With this form you can create  a new account. You can then post notices and "
 "link up to friends and colleagues. "
@@ -7271,7 +7299,7 @@ msgid "Replies feed for %s (RSS 2.0)"
 msgstr "%s의 통지 피드"
 
 #: actions/replies.php:158
-#, fuzzy, php-format
+#, php-format
 msgid "Replies feed for %s (Atom)"
 msgstr "%s의 통지 피드"
 
@@ -7281,17 +7309,17 @@ msgid "Replies to %1$s on %2$s!"
 msgstr "%2$s에서 %1$s까지 메시지"
 
 #: actions/showfavorites.php:170
-#, fuzzy, php-format
+#, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
 msgstr "%s의 친구들을 위한 피드"
 
 #: actions/showfavorites.php:177
-#, fuzzy, php-format
+#, php-format
 msgid "Feed for favorites of %s (RSS 2.0)"
 msgstr "%s의 친구들을 위한 피드"
 
 #: actions/showfavorites.php:184
-#, fuzzy, php-format
+#, php-format
 msgid "Feed for favorites of %s (Atom)"
 msgstr "%s의 친구들을 위한 피드"
 
@@ -7304,7 +7332,7 @@ msgid ""
 msgstr ""
 
 #: actions/showgroup.php:345
-#, fuzzy, php-format
+#, php-format
 msgid "FOAF for %s group"
 msgstr "%s의 보낸쪽지함"
 
@@ -7441,41 +7469,6 @@ 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 "No configuration file found. "
@@ -7510,7 +7503,7 @@ msgid "Describe the group or topic in %d characters"
 msgstr "140글자로 그룹이나 토픽 설명하기"
 
 #: lib/jabber.php:192
-#, fuzzy, php-format
+#, php-format
 msgid "notice id: %s"
 msgstr "새로운 통지"
 
@@ -7570,7 +7563,6 @@ 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을 불러올 수 없습니다."
 
@@ -7578,3 +7570,59 @@ msgstr "공개 stream을 불러올 수 없습니다."
 #, fuzzy
 msgid "Duplicate notice"
 msgstr "통지 삭제"
+
+#: actions/login.php:110 actions/login.php:120
+#, fuzzy
+msgid "Invalid or expired token."
+msgstr "옳지 않은 통지 내용"
+
+#: lib/command.php:597
+#, fuzzy, php-format
+msgid "Could not create login token for %s"
+msgstr "OpenID를 작성 할 수 없습니다 : %s"
+
+#: lib/command.php:602
+#, php-format
+msgid "This link is useable only once, and is good for only 2 minutes: %s"
+msgstr ""
+
+#: lib/imagefile.php:75
+#, fuzzy, php-format
+msgid "That file is too big. The maximum file size is %s."
+msgstr "당신그룹의 로고 이미지를 업로드할 수 있습니다."
+
+#: lib/command.php:613
+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"
+"login - Get a link to login to the web interface\n"
+"drop <group> - leave group\n"
+"stats - get your stats\n"
+"stop - same as 'off'\n"
+"quit - same as 'off'\n"
+"sub <nickname> - same as 'follow'\n"
+"unsub <nickname> - same as 'leave'\n"
+"last <nickname> - same as 'get'\n"
+"on <nickname> - not yet implemented.\n"
+"off <nickname> - not yet implemented.\n"
+"nudge <nickname> - remind a user to update.\n"
+"invite <phone number> - not yet implemented.\n"
+"track <word> - not yet implemented.\n"
+"untrack <word> - not yet implemented.\n"
+"track off - not yet implemented.\n"
+"untrack all - not yet implemented.\n"
+"tracks - not yet implemented.\n"
+"tracking - not yet implemented.\n"
+msgstr ""
diff --git a/locale/mk/LC_MESSAGES/statusnet.mo b/locale/mk/LC_MESSAGES/statusnet.mo
index d931277e3..f844f445d 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 5061e1b84..66c175a0c 100644
--- a/locale/mk/LC_MESSAGES/statusnet.po
+++ b/locale/mk/LC_MESSAGES/statusnet.po
@@ -6,12 +6,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-06 13:16+0000\n"
-"PO-Revision-Date: 2009-11-06 15:44:02+0000\n"
+"POT-Creation-Date: 2009-11-08 11:53+0000\n"
+"PO-Revision-Date: 2009-11-08 11:56:48+0000\n"
 "Language-Team: Macedonian\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r58648); Translate extension (2009-08-03)\n"
+"X-Generator: MediaWiki 1.16alpha(r58760); 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"
@@ -176,7 +176,7 @@ msgid "%s updates from everyone!"
 msgstr ""
 
 #: ../actions/register.php:213 actions/register.php:497
-#: actions/register.php:545 actions/register.php:555
+#: actions/register.php:545 actions/register.php:555 actions/register.php:561
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -212,6 +212,7 @@ msgstr "1-64 мали букви или бројки. Без интерпукц�
 
 #: ../actions/register.php:152 actions/register.php:166
 #: actions/register.php:368 actions/register.php:414 actions/register.php:418
+#: actions/register.php:424
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr ""
 
@@ -228,6 +229,7 @@ msgstr "6 или повеќе знаци и не ја заборавајте!"
 
 #: ../actions/register.php:154 actions/register.php:168
 #: actions/register.php:373 actions/register.php:419 actions/register.php:423
+#: actions/register.php:429
 msgid "6 or more characters. Required."
 msgstr ""
 
@@ -402,7 +404,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
+#: actions/login.php:79 actions/register.php:137
 msgid "Already logged in."
 msgstr "Веќе сте најавени."
 
@@ -425,7 +427,7 @@ 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/login.php:226
-#: actions/register.php:473
+#: actions/register.php:473 actions/login.php:253 actions/register.php:479
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Следниот пат најавете се автоматски; не за компјутери кои ги делите со други!"
@@ -448,6 +450,7 @@ msgstr "Аватар"
 
 #: ../actions/avatar.php:113 actions/profilesettings.php:350
 #: actions/avatarsettings.php:395 actions/avatarsettings.php:346
+#: actions/avatarsettings.php:360
 msgid "Avatar updated."
 msgstr "Аватарот е ажуриран."
 
@@ -482,7 +485,7 @@ msgstr "Претходно »"
 #: 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
+#: actions/register.php:459 actions/register.php:465
 msgid "Bio"
 msgstr "Био"
 
@@ -511,6 +514,7 @@ msgstr "Не може да се прочита URL-то на аватарот: '
 #: actions/passwordsettings.php:169 actions/recoverpassword.php:347
 #: actions/passwordsettings.php:174 actions/recoverpassword.php:365
 #: actions/passwordsettings.php:180 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:185
 msgid "Can't save new password."
 msgstr "Новата лозинка не може да се сними"
 
@@ -573,6 +577,7 @@ msgstr ""
 #: actions/recoverpassword.php:236 actions/register.php:422
 #: actions/passwordsettings.php:111 actions/recoverpassword.php:239
 #: actions/register.php:426 actions/smssettings.php:134
+#: actions/register.php:432
 msgid "Confirm"
 msgstr "Потврди"
 
@@ -602,7 +607,7 @@ msgid "Confirmation code not found."
 msgstr "Кодот за потврда не е пронајден."
 
 #: ../actions/register.php:202 actions/register.php:473
-#: actions/register.php:521 actions/register.php:531
+#: actions/register.php:521 actions/register.php:531 actions/register.php:537
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -826,6 +831,7 @@ 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
+#: classes/Notice.php:1120
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Одговор од внесот во базата: %s"
@@ -848,7 +854,8 @@ msgstr "Опишете се себе си и сопствените интере
 #: 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
+#: lib/accountsettingsaction.php:117 actions/register.php:437
+#: actions/register.php:441
 msgid "Email"
 msgstr "Е-пошта"
 
@@ -863,7 +870,7 @@ msgid "Email Settings"
 msgstr ""
 
 #: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
-#: actions/register.php:200 actions/register.php:206
+#: actions/register.php:200 actions/register.php:206 actions/register.php:212
 msgid "Email address already exists."
 msgstr "Адресата веќе постои."
 
@@ -949,7 +956,7 @@ msgstr "Грешка во снимањето на корисникот."
 
 #: ../actions/password.php:80 actions/profilesettings.php:399
 #: actions/passwordsettings.php:164 actions/passwordsettings.php:169
-#: actions/passwordsettings.php:175
+#: actions/passwordsettings.php:175 actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "Грешка во снимањето на корисникот; неправилен."
 
@@ -961,6 +968,7 @@ msgstr "Грешка во снимањето на корисникот; непр
 #: actions/login.php:120 actions/recoverpassword.php:372
 #: actions/register.php:235 actions/login.php:122
 #: actions/recoverpassword.php:375 actions/register.php:242
+#: actions/login.php:149 actions/register.php:248
 msgid "Error setting user."
 msgstr "Грешка во поставувањето на корисникот."
 
@@ -992,6 +1000,7 @@ msgstr "ЧПП"
 
 #: ../actions/avatar.php:115 actions/profilesettings.php:352
 #: actions/avatarsettings.php:397 actions/avatarsettings.php:349
+#: actions/avatarsettings.php:363
 msgid "Failed updating avatar."
 msgstr "Товарањето на аватарот не успеа."
 
@@ -1026,6 +1035,7 @@ msgid "Find people on this site"
 msgstr ""
 
 #: ../actions/login.php:122 actions/login.php:247 actions/login.php:255
+#: actions/login.php:282
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -1043,6 +1053,7 @@ msgstr ""
 #: actions/showstream.php:220 lib/groupeditform.php:157
 #: actions/profilesettings.php:111 actions/register.php:441
 #: actions/showgroup.php:247 actions/showstream.php:267
+#: actions/register.php:447 lib/userprofile.php:149
 msgid "Full name"
 msgstr "Цело име"
 
@@ -1056,7 +1067,7 @@ msgstr "Цело име"
 #: 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
+#: actions/register.php:214 actions/register.php:220
 msgid "Full name is too long (max 255 chars)."
 msgstr "Целото име е предолго (максимум 255 знаци)"
 
@@ -1077,7 +1088,7 @@ msgstr "Дома"
 #: 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
+#: actions/register.php:446 actions/register.php:452
 msgid "Homepage"
 msgstr "Домашна страница"
 
@@ -1089,7 +1100,7 @@ msgstr "Домашна страница"
 #: 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
+#: actions/register.php:211 actions/register.php:217
 msgid "Homepage is not a valid URL."
 msgstr "Домашната страница не е правилно URL."
 
@@ -1159,7 +1170,7 @@ 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/login.php:116
+#: actions/facebookhome.php:129 actions/login.php:116 actions/login.php:143
 msgid "Incorrect username or password."
 msgstr "Неточно корисничко име или лозинка"
 
@@ -1239,6 +1250,7 @@ msgstr "Погрешна големина."
 #: 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
+#: actions/register.php:243 actions/register.php:264
 msgid "Invalid username or password."
 msgstr "Погрешно име или лозинка."
 
@@ -1315,7 +1327,7 @@ msgstr ""
 #: 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
+#: lib/profilelist.php:218 actions/register.php:470 lib/userprofile.php:164
 msgid "Location"
 msgstr "Локација"
 
@@ -1329,7 +1341,7 @@ msgstr "Локација"
 #: 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
+#: actions/register.php:221 actions/register.php:227
 msgid "Location is too long (max 255 chars)."
 msgstr "Локацијата е предолга (максимумот е 255 знаци)."
 
@@ -1343,6 +1355,7 @@ msgstr "Локацијата е предолга (максимумот е 255 з
 #: 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
+#: actions/login.php:204 actions/login.php:257
 #, php-format
 msgid "Login"
 msgstr "Пријави се"
@@ -1370,12 +1383,13 @@ msgstr "Одјави се"
 
 #: ../actions/register.php:166 actions/register.php:180
 #: actions/register.php:393 actions/register.php:439 actions/register.php:443
+#: actions/register.php:449
 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 actions/login.php:236
+#: lib/facebookaction.php:327 actions/login.php:236 actions/login.php:263
 msgid "Lost or forgotten password?"
 msgstr "Загубена или заборавена лозинка?"
 
@@ -1415,7 +1429,7 @@ 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:487
+#: actions/register.php:477 actions/register.php:487 actions/register.php:493
 msgid "My text and files are available under "
 msgstr "Мојот текст и датотеки се достапни под"
 
@@ -1473,7 +1487,8 @@ msgstr "Новата лозинка успешно е снимена. Сега �
 #: 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
+#: actions/showgroup.php:236 actions/showstream.php:249 actions/login.php:246
+#: actions/register.php:423 lib/userprofile.php:131
 msgid "Nickname"
 msgstr "Прекар"
 
@@ -1487,7 +1502,7 @@ msgstr "Прекар"
 #: 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
+#: actions/register.php:202 actions/register.php:208
 msgid "Nickname already in use. Try another one."
 msgstr "Тој прекар е во употреба. Одберете друг."
 
@@ -1503,7 +1518,7 @@ msgstr "Тој прекар е во употреба. Одберете друг.
 #: 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
+#: actions/register.php:199 actions/register.php:205
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr "Прекарот мора да има само мали букви и бројки и да нема празни места."
 
@@ -1742,7 +1757,8 @@ msgstr ""
 #: 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
+#: lib/api.php:954 lib/api.php:982 lib/api.php:1092 lib/api.php:963
+#: lib/api.php:991 lib/api.php:1101
 msgid "Not a supported data format."
 msgstr ""
 
@@ -1763,7 +1779,7 @@ 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
+#: actions/register.php:189 actions/register.php:195 actions/register.php:201
 msgid "Not a valid email address."
 msgstr "Неправилна адреса за е-пошта."
 
@@ -1775,7 +1791,7 @@ msgstr "Неправилна адреса за е-пошта."
 #: 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
+#: actions/register.php:204 actions/register.php:210
 msgid "Not a valid nickname."
 msgstr "Неправилен прекар."
 
@@ -1814,6 +1830,7 @@ msgstr "Овој одговор не беше очекуван!"
 #: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
 #: actions/twitapistatuses.php:309 actions/twitapistatuses.php:327
 #: actions/twitapistatuses.php:284 actions/apistatusesupdate.php:186
+#: actions/apistatusesupdate.php:193
 msgid "Not found"
 msgstr ""
 
@@ -1960,7 +1977,8 @@ msgstr "Парцијално товарање"
 #: 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
+#: lib/accountsettingsaction.php:114 actions/login.php:249
+#: actions/register.php:428
 msgid "Password"
 msgstr "Лозинка"
 
@@ -1989,6 +2007,7 @@ msgstr "Побарано е пронаоѓање на лозинката"
 #: actions/passwordsettings.php:173 actions/recoverpassword.php:200
 #: actions/passwordsettings.php:178 actions/recoverpassword.php:208
 #: actions/passwordsettings.php:184 actions/recoverpassword.php:211
+#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "Лозинката е снимена."
 
@@ -1997,6 +2016,7 @@ msgstr "Лозинката е снимена."
 #: actions/passwordsettings.php:145 actions/register.php:183
 #: actions/passwordsettings.php:150 actions/register.php:220
 #: actions/passwordsettings.php:156 actions/register.php:227
+#: actions/register.php:233
 msgid "Passwords don't match."
 msgstr "Лозинките не се совпаѓаат."
 
@@ -2159,19 +2179,19 @@ msgstr "Код за пронаоѓање за непознат корисник.
 #: 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
+#: lib/logingroupnav.php:85 actions/register.php:114 actions/register.php:502
 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
+#: actions/register.php:129 actions/register.php:135
 msgid "Registration not allowed."
 msgstr ""
 
 #: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67 actions/register.php:106
+#: actions/register.php:67 actions/register.php:106 actions/register.php:112
 msgid "Registration successful"
 msgstr ""
 
@@ -2185,6 +2205,7 @@ msgstr "Одбиј"
 #: 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
+#: actions/login.php:252 actions/register.php:477
 msgid "Remember me"
 msgstr "Запамети ме"
 
@@ -2283,6 +2304,7 @@ msgstr "Исто како лозинката погоре"
 
 #: ../actions/register.php:156 actions/register.php:170
 #: actions/register.php:377 actions/register.php:423 actions/register.php:427
+#: actions/register.php:433
 msgid "Same as password above. Required."
 msgstr ""
 
@@ -2442,6 +2464,7 @@ msgstr "Зачуваниот OpenID не е пронајден."
 #: actions/remotesubscribe.php:113 actions/showstream.php:376
 #: lib/subscribeform.php:139 actions/showstream.php:345
 #: actions/remotesubscribe.php:137 actions/showstream.php:439
+#: lib/userprofile.php:321
 msgid "Subscribe"
 msgstr "Претплати се"
 
@@ -2488,6 +2511,7 @@ msgstr "Системска грешка при товарањето на дат�
 #: actions/profilesettings.php:123 actions/showstream.php:255
 #: lib/subscriptionlist.php:106 lib/subscriptionlist.php:108
 #: actions/profilesettings.php:138 actions/showstream.php:327
+#: lib/userprofile.php:209
 msgid "Tags"
 msgstr ""
 
@@ -2706,6 +2730,7 @@ msgstr ""
 #: actions/apifriendshipsdestroy.php:91 actions/apigroupcreate.php:104
 #: actions/apigroupjoin.php:91 actions/apigroupleave.php:91
 #: actions/apistatusesupdate.php:109
+#: actions/apiaccountupdateprofileimage.php:84
 msgid "This method requires a POST."
 msgstr ""
 
@@ -2740,7 +2765,7 @@ msgstr ""
 
 #: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
 #: actions/twitapifriendships.php:132 actions/twitapifriendships.php:139
-#: actions/apifriendshipsexists.php:103
+#: actions/apifriendshipsexists.php:103 actions/apifriendshipsexists.php:94
 msgid "Two user ids or screen_names must be supplied."
 msgstr ""
 
@@ -2748,7 +2773,7 @@ msgstr ""
 #: 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
+#: actions/register.php:448 actions/register.php:454
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "URL на Вашата домашна страница, блог или профил на друго место."
 
@@ -2770,6 +2795,7 @@ msgstr "URL на Вашиот профил на друго компатибил�
 #: actions/twittersettings.php:322 lib/designsettings.php:301
 #: actions/emailsettings.php:255 actions/grouplogo.php:319
 #: actions/imsettings.php:220 actions/smssettings.php:248
+#: actions/avatarsettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "Неочекувано испраќање на формулар."
 
@@ -2880,7 +2906,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
+#: actions/register.php:436 actions/register.php:438 actions/register.php:442
 msgid "Used only for updates, announcements, and password recovery"
 msgstr "Се користи само за надградби, објави и пронаоѓање на лозинка."
 
@@ -2908,7 +2934,8 @@ 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
+#: actions/apiusershow.php:108 actions/apiaccountupdateprofileimage.php:124
+#: actions/apiaccountupdateprofileimage.php:130
 msgid "User has no profile."
 msgstr "Корисникот нема профил."
 
@@ -2937,7 +2964,7 @@ msgstr "Што има %s?"
 #: 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
+#: actions/register.php:466 actions/register.php:472
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Каде се наоѓате, на пр. „Град, Држава“."
 
@@ -3038,7 +3065,7 @@ 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:192
+#: actions/register.php:186 actions/register.php:192 actions/register.php:198
 msgid "You can't register if you don't agree to the license."
 msgstr "Не може да се регистрирате ако не ја прифаќате лиценцата."
 
@@ -3106,56 +3133,56 @@ msgstr ""
 "ја."
 
 #: ../lib/util.php:943 lib/util.php:992 lib/util.php:945 lib/util.php:756
-#: lib/util.php:770 lib/util.php:816
+#: lib/util.php:770 lib/util.php:816 lib/util.php:844
 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:828
+#: lib/util.php:782 lib/util.php:828 lib/util.php:856
 #, php-format
 msgid "about %d days ago"
 msgstr "пред %d денови"
 
 #: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953 lib/util.php:764
-#: lib/util.php:778 lib/util.php:824
+#: lib/util.php:778 lib/util.php:824 lib/util.php:852
 #, php-format
 msgid "about %d hours ago"
 msgstr "пред %d часа"
 
 #: ../lib/util.php:947 lib/util.php:996 lib/util.php:949 lib/util.php:760
-#: lib/util.php:774 lib/util.php:820
+#: lib/util.php:774 lib/util.php:820 lib/util.php:848
 #, php-format
 msgid "about %d minutes ago"
 msgstr "пред %d минути"
 
 #: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961 lib/util.php:772
-#: lib/util.php:786 lib/util.php:832
+#: lib/util.php:786 lib/util.php:832 lib/util.php:860
 #, php-format
 msgid "about %d months ago"
 msgstr "пред %d месеци"
 
 #: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955 lib/util.php:766
-#: lib/util.php:780 lib/util.php:826
+#: lib/util.php:780 lib/util.php:826 lib/util.php:854
 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:818
+#: lib/util.php:772 lib/util.php:818 lib/util.php:846
 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:830
+#: lib/util.php:784 lib/util.php:830 lib/util.php:858
 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:834
+#: lib/util.php:788 lib/util.php:834 lib/util.php:862
 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:822
+#: lib/util.php:776 lib/util.php:822 lib/util.php:850
 msgid "about an hour ago"
 msgstr "пред еден час"
 
@@ -3224,7 +3251,9 @@ msgstr "« Следно"
 #: 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
+#: actions/userauthorization.php:52 actions/login.php:131
+#: actions/register.php:165 actions/avatarsettings.php:265
+#: lib/designsettings.php:294
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
@@ -3444,6 +3473,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
+#: actions/register.php:230
 msgid "Password must be 6 or more characters."
 msgstr ""
 
@@ -3983,13 +4013,13 @@ msgid "There was a problem with your session token. "
 msgstr ""
 
 #: actions/avatarsettings.php:303 actions/grouplogo.php:360
-#: actions/avatarsettings.php:308
+#: actions/avatarsettings.php:308 actions/avatarsettings.php:322
 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
+#: actions/grouplogo.php:377 actions/avatarsettings.php:337
 msgid "Lost our file data."
 msgstr ""
 
@@ -4475,7 +4505,7 @@ msgid "%s left group %s"
 msgstr ""
 
 #: actions/login.php:225 lib/facebookaction.php:304 actions/login.php:208
-#: actions/login.php:216
+#: actions/login.php:216 actions/login.php:243
 msgid "Login to site"
 msgstr ""
 
@@ -4664,7 +4694,8 @@ 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
+#: actions/register.php:398 actions/register.php:85 actions/register.php:189
+#: actions/register.php:404
 msgid "Sorry, only invited people can register."
 msgstr ""
 
@@ -4756,7 +4787,7 @@ msgstr "Нема такво известување."
 #: 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
+#: lib/profilelist.php:230 lib/userprofile.php:177
 msgid "URL"
 msgstr ""
 
@@ -4767,7 +4798,7 @@ msgstr ""
 #: 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
+#: lib/profilelist.php:245 lib/userprofile.php:194
 #, fuzzy
 msgid "Note"
 msgstr "Известувања"
@@ -4816,6 +4847,7 @@ msgid "Only the sender and recipient "
 msgstr ""
 
 #: actions/showstream.php:73 actions/showstream.php:78
+#: actions/showstream.php:79
 #, php-format
 msgid "%s, page %d"
 msgstr ""
@@ -4827,29 +4859,30 @@ msgstr "Профил"
 
 #: actions/showstream.php:236 actions/tagother.php:77
 #: actions/showstream.php:220 actions/showstream.php:185
-#: actions/showstream.php:193
+#: actions/showstream.php:193 lib/userprofile.php:75
 #, 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
+#: actions/showstream.php:220 lib/userprofile.php:102
 msgid "Photo"
 msgstr ""
 
 #: actions/showstream.php:317 actions/showstream.php:309
 #: actions/showstream.php:274 actions/showstream.php:354
+#: lib/userprofile.php:236
 msgid "User actions"
 msgstr ""
 
 #: actions/showstream.php:342 actions/showstream.php:307
-#: actions/showstream.php:390
+#: actions/showstream.php:390 lib/userprofile.php:272
 msgid "Send a direct message to this user"
 msgstr ""
 
 #: actions/showstream.php:343 actions/showstream.php:308
-#: actions/showstream.php:391
+#: actions/showstream.php:391 lib/userprofile.php:273
 msgid "Message"
 msgstr ""
 
@@ -5593,7 +5626,7 @@ msgstr "%s и пријателите"
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr ""
 
-#: actions/avatarsettings.php:373
+#: actions/avatarsettings.php:373 actions/avatarsettings.php:387
 #, fuzzy
 msgid "Avatar deleted."
 msgstr "Аватарот е ажуриран."
@@ -5723,10 +5756,12 @@ msgid ""
 msgstr ""
 
 #: actions/register.php:432 actions/register.php:479 actions/register.php:489
+#: actions/register.php:495
 msgid "Creative Commons Attribution 3.0"
 msgstr ""
 
 #: actions/register.php:433 actions/register.php:480 actions/register.php:490
+#: actions/register.php:496
 #, fuzzy
 msgid ""
 " except this private data: password, email address, IM address, and phone "
@@ -5763,44 +5798,48 @@ msgid "%s's profile"
 msgstr "Профил"
 
 #: actions/showstream.php:163 actions/showstream.php:128
+#: actions/showstream.php:129
 #, fuzzy, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "Канал со известувања на %s"
 
 #: actions/showstream.php:170 actions/showstream.php:135
+#: actions/showstream.php:136
 #, fuzzy, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "Канал со известувања на %s"
 
 #: actions/showstream.php:177 actions/showstream.php:142
+#: actions/showstream.php:143
 #, fuzzy, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "Канал со известувања на %s"
 
 #: actions/showstream.php:182 actions/showstream.php:147
+#: actions/showstream.php:148
 #, php-format
 msgid "FOAF for %s"
 msgstr ""
 
 #: actions/showstream.php:237 actions/showstream.php:202
-#: actions/showstream.php:234
+#: actions/showstream.php:234 lib/userprofile.php:116
 #, fuzzy
 msgid "Edit Avatar"
 msgstr "Аватар"
 
 #: actions/showstream.php:316 actions/showstream.php:281
-#: actions/showstream.php:366
+#: actions/showstream.php:366 lib/userprofile.php:248
 #, fuzzy
 msgid "Edit profile settings"
 msgstr "Поставки на профилот"
 
 #: actions/showstream.php:317 actions/showstream.php:282
-#: actions/showstream.php:367
+#: actions/showstream.php:367 lib/userprofile.php:249
 msgid "Edit"
 msgstr ""
 
 #: actions/showstream.php:542 actions/showstream.php:388
-#: actions/showstream.php:487
+#: actions/showstream.php:487 actions/showstream.php:234
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5843,6 +5882,9 @@ msgstr ""
 #: actions/apistatusesupdate.php:125 actions/apisubscriptions.php:87
 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#: actions/apiaccountupdateprofileimage.php:91
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apistatusesupdate.php:139
 #, fuzzy
 msgid "No such user!"
 msgstr "Нема таков корисник."
@@ -5894,36 +5936,6 @@ msgid ""
 "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 ""
@@ -6094,6 +6106,7 @@ 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
+#: actions/showstream.php:202
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -6271,7 +6284,8 @@ 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
+#: lib/designsettings.php:461 lib/designsettings.php:434
+#: lib/designsettings.php:464
 #, fuzzy
 msgid "Couldn't update your design."
 msgstr "Корисникот не може да се освежи/"
@@ -6363,7 +6377,9 @@ msgid "Message sent"
 msgstr ""
 
 #: actions/newnotice.php:93 lib/designsettings.php:281
-#: actions/newnotice.php:94
+#: actions/newnotice.php:94 actions/apiaccountupdateprofileimage.php:97
+#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254
+#: lib/designsettings.php:283
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s bytes) due to its "
@@ -6532,7 +6548,7 @@ msgstr "Идентификувани сте. Подолу можете да вн
 msgid "Password recover"
 msgstr "Побарано е пронаоѓање на лозинката"
 
-#: actions/register.php:86
+#: actions/register.php:86 actions/register.php:92
 #, fuzzy
 msgid "Sorry, invalid invitation code."
 msgstr "Грешка со кодот за потврдување."
@@ -6631,28 +6647,31 @@ msgstr ""
 msgid "Not a local notice"
 msgstr "Нема таков корисник."
 
-#: actions/showstream.php:72
+#: actions/showstream.php:72 actions/showstream.php:73
 #, php-format
 msgid " tagged %s"
 msgstr ""
 
-#: actions/showstream.php:121
+#: actions/showstream.php:121 actions/showstream.php:122
 #, fuzzy, php-format
 msgid "Notice feed for %s tagged %s (RSS 1.0)"
 msgstr "Канал со известувања на %s"
 
 #: actions/showstream.php:350 actions/showstream.php:444
+#: actions/showstream.php:191
 #, 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
+#: actions/showstream.php:196
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
 msgstr ""
 
 #: actions/showstream.php:357 actions/showstream.php:451
+#: actions/showstream.php:198
 #, php-format
 msgid ""
 "You can try to nudge %s or [post something to his or her attention](%%%%"
@@ -6660,6 +6679,7 @@ msgid ""
 msgstr ""
 
 #: actions/showstream.php:393 actions/showstream.php:492
+#: actions/showstream.php:239
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -6806,6 +6826,7 @@ msgid "Problem saving notice. Too long."
 msgstr "Проблем во снимањето на известувањето."
 
 #: classes/User.php:319 classes/User.php:327 classes/User.php:334
+#: classes/User.php:333
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr ""
@@ -6916,10 +6937,12 @@ msgid "Save design"
 msgstr ""
 
 #: lib/designsettings.php:378 lib/designsettings.php:369
+#: lib/designsettings.php:372
 msgid "Bad default color settings: "
 msgstr ""
 
 #: lib/designsettings.php:474 lib/designsettings.php:465
+#: lib/designsettings.php:468
 msgid "Design defaults restored."
 msgstr ""
 
@@ -7125,16 +7148,18 @@ msgid "Status deleted."
 msgstr "Аватарот е ажуриран."
 
 #: actions/apistatusesupdate.php:132
+#: actions/apiaccountupdateprofileimage.php:99
 msgid "Unable to handle that much POST data!"
 msgstr ""
 
 #: actions/apistatusesupdate.php:145 actions/newnotice.php:155
-#: scripts/maildaemon.php:71
+#: scripts/maildaemon.php:71 actions/apistatusesupdate.php:152
 #, fuzzy, php-format
 msgid "That's too long. Max notice size is %d chars."
 msgstr "Ова е предолго. Максималната должина е 140 знаци."
 
 #: actions/apistatusesupdate.php:209 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:216
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
@@ -7198,7 +7223,7 @@ msgstr "Микроблог на %s"
 msgid "IM is not available."
 msgstr "Оваа страница не е достапна во форматот кој Вие го прифаќате."
 
-#: actions/login.php:259
+#: actions/login.php:259 actions/login.php:286
 #, fuzzy, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -7232,21 +7257,24 @@ msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
 msgstr ""
 
 #: actions/profilesettings.php:122 actions/register.php:454
+#: actions/register.php:460
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d chars"
 msgstr "Опишете се себе си и сопствените интереси во 140 знаци."
 
 #: actions/profilesettings.php:125 actions/register.php:457
+#: actions/register.php:463
 #, fuzzy
 msgid "Describe yourself and your interests"
 msgstr "Опишете се себе си и сопствените интереси во 140 знаци."
 
 #: actions/profilesettings.php:221 actions/register.php:217
+#: actions/register.php:223
 #, fuzzy, php-format
 msgid "Bio is too long (max %d chars)."
 msgstr "Биографијата е предолга (максимумот е 140 знаци)."
 
-#: actions/register.php:336
+#: actions/register.php:336 actions/register.php:342
 msgid ""
 "With this form you can create  a new account. You can then post notices and "
 "link up to friends and colleagues. "
@@ -7412,7 +7440,7 @@ msgid "Site content license"
 msgstr "Ново известување"
 
 #: lib/command.php:88
-#, fuzzy, php-format
+#, php-format
 msgid "Could not find a user with nickname %s"
 msgstr "Корисникот не може да се освежи/"
 
@@ -7449,41 +7477,6 @@ msgstr "Одговори испратени до %s"
 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. "
@@ -7516,7 +7509,7 @@ msgid "Describe the group or topic in %d characters"
 msgstr "Опишете се себе си и сопствените интереси во 140 знаци."
 
 #: lib/jabber.php:192
-#, fuzzy, php-format
+#, php-format
 msgid "notice id: %s"
 msgstr "Ново известување"
 
@@ -7580,6 +7573,61 @@ msgid "Could not determine file's mime-type!"
 msgstr "Корисникот не може да се освежи/"
 
 #: lib/oauthstore.php:345
-#, fuzzy
 msgid "Duplicate notice"
-msgstr "Ново известување"
+msgstr "Дуплирано известување"
+
+#: actions/login.php:110 actions/login.php:120
+#, fuzzy
+msgid "Invalid or expired token."
+msgstr "Неправилна содржина за известување"
+
+#: lib/command.php:597
+#, fuzzy, php-format
+msgid "Could not create login token for %s"
+msgstr "OpenID формуларот не може да се креира:%s"
+
+#: lib/command.php:602
+#, php-format
+msgid "This link is useable only once, and is good for only 2 minutes: %s"
+msgstr ""
+
+#: lib/imagefile.php:75
+#, fuzzy, php-format
+msgid "That file is too big. The maximum file size is %s."
+msgstr "Ова е предолго. Максималната должина е 140 знаци."
+
+#: lib/command.php:613
+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"
+"login - Get a link to login to the web interface\n"
+"drop <group> - leave group\n"
+"stats - get your stats\n"
+"stop - same as 'off'\n"
+"quit - same as 'off'\n"
+"sub <nickname> - same as 'follow'\n"
+"unsub <nickname> - same as 'leave'\n"
+"last <nickname> - same as 'get'\n"
+"on <nickname> - not yet implemented.\n"
+"off <nickname> - not yet implemented.\n"
+"nudge <nickname> - remind a user to update.\n"
+"invite <phone number> - not yet implemented.\n"
+"track <word> - not yet implemented.\n"
+"untrack <word> - not yet implemented.\n"
+"track off - not yet implemented.\n"
+"untrack all - not yet implemented.\n"
+"tracks - not yet implemented.\n"
+"tracking - not yet implemented.\n"
+msgstr ""
diff --git a/locale/nb/LC_MESSAGES/statusnet.mo b/locale/nb/LC_MESSAGES/statusnet.mo
index 509dd898c..b965bd49e 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 e53d2ddeb..d2dfcfb30 100644
--- a/locale/nb/LC_MESSAGES/statusnet.po
+++ b/locale/nb/LC_MESSAGES/statusnet.po
@@ -10,13 +10,14 @@
 #
 msgid ""
 msgstr ""
-""
 "Project-Id-Version: StatusNet\n"
-"PO-Revision-Date: 2009-11-06 13:07:43+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-11-08 11:53+0000\n"
+"PO-Revision-Date: 2009-11-08 11:56:51+0000\n"
 "Language-Team: Norwegian (bokmål)‬\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r58638); Translate extension (2009-08-03)\n"
+"X-Generator: MediaWiki 1.16alpha(r58760); 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"
@@ -30,8 +31,11 @@ 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 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."
+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
@@ -53,8 +57,55 @@ msgstr "%1$s har invitert deg til %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\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"
+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"
 
 #: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
 #: lib/mail.php:236 lib/mail.php:235
@@ -64,8 +115,20 @@ 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	%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"
+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"
 
 #: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
 #: actions/twitapistatuses.php:350 actions/twitapistatuses.php:367
@@ -140,15 +203,23 @@ msgid "%s updates from everyone!"
 msgstr "%s oppdateringer fra alle sammen!"
 
 #: ../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)"
+#: actions/register.php:545 actions/register.php:555 actions/register.php:561
+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/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/action.php:704
 #: lib/action.php:754 lib/action.php:769
@@ -170,8 +241,10 @@ 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
+#: actions/register.php:424
 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:108
@@ -186,23 +259,36 @@ msgstr "6 eller flere tegn. Og ikke glem det!"
 
 #: ../actions/register.php:154 actions/register.php:168
 #: actions/register.php:373 actions/register.php:419 actions/register.php:423
+#: actions/register.php:429
 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
 #: 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."
+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
@@ -352,7 +438,7 @@ msgstr "Alle oppdateringer for søket: «%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
+#: actions/login.php:79 actions/register.php:137
 msgid "Already logged in."
 msgstr "Allerede innlogget."
 
@@ -375,15 +461,18 @@ msgstr "Autoriser abonnementet"
 #: ../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
+#: actions/register.php:473 actions/login.php:253 actions/register.php:479
 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
 #: 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)"
+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
@@ -396,19 +485,28 @@ msgstr "Brukerbilde"
 
 #: ../actions/avatar.php:113 actions/profilesettings.php:350
 #: actions/avatarsettings.php:395 actions/avatarsettings.php:346
+#: actions/avatarsettings.php:360
 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
 #: 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."
+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:123
@@ -424,7 +522,7 @@ msgstr "Tidligere »"
 #: 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
+#: actions/register.php:459 actions/register.php:465
 msgid "Bio"
 msgstr "Om meg"
 
@@ -453,6 +551,7 @@ msgstr "Kan ikke lese brukerbilde-URL «%s»"
 #: actions/passwordsettings.php:169 actions/recoverpassword.php:347
 #: actions/passwordsettings.php:174 actions/recoverpassword.php:365
 #: actions/passwordsettings.php:180 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:185
 msgid "Can't save new password."
 msgstr "Klarer ikke å lagre nytt passord."
 
@@ -515,6 +614,7 @@ msgstr "Endre profilinnstillingene dine"
 #: actions/recoverpassword.php:236 actions/register.php:422
 #: actions/passwordsettings.php:111 actions/recoverpassword.php:239
 #: actions/register.php:426 actions/smssettings.php:134
+#: actions/register.php:432
 msgid "Confirm"
 msgstr "Bekreft"
 
@@ -544,10 +644,38 @@ msgid "Confirmation code not found."
 msgstr "Fant ikke bekreftelseskode."
 
 #: ../actions/register.php:202 actions/register.php:473
-#: actions/register.php:521 actions/register.php:531
+#: actions/register.php:521 actions/register.php:531 actions/register.php:537
 #, 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\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."
+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."
 
 #: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
 #: actions/finishopenidlogin.php:119 lib/action.php:330 lib/action.php:403
@@ -566,6 +694,33 @@ msgstr "Koble til eksisterende konto"
 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 ""
+
+#: ../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: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:176
 msgid "Could not save avatar info"
@@ -576,11 +731,65 @@ msgstr "Klarte ikke å lagre brukerbilde-informasjonen"
 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 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:56
+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
+#: 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:136
+msgid "Couldn't delete subscription."
+msgstr ""
+
+#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
+#: actions/twitapistatuses.php:84 actions/twitapistatuses.php:87
+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 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
@@ -588,6 +797,22 @@ msgstr "Klarte ikke å oppdatere bruker med bekreftet e-post."
 msgid "Couldn't save profile."
 msgstr "Klarte ikke å lagre profil."
 
+#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
+#: 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 ""
+
 #: ../actions/confirmaddress.php:72 ../actions/emailsettings.php:156
 #: ../actions/emailsettings.php:259 ../actions/imsettings.php:138
 #: ../actions/imsettings.php:243 ../actions/profilesettings.php:141
@@ -625,6 +850,11 @@ msgstr "Lag en ny bruker med dette nicket."
 msgid "Create new account"
 msgstr "Opprett en ny konto"
 
+#: ../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 ""
+
 #: ../actions/imsettings.php:45 actions/imsettings.php:46
 #: actions/imsettings.php:100 actions/imsettings.php:106
 msgid "Current confirmed Jabber/GTalk address."
@@ -640,6 +870,29 @@ msgstr "Nåværende bekreftede telefonnummer med mulighet for å motta SMS."
 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
+#: 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
+#: classes/Notice.php:1120
+#, 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 ""
+
 #: ../actions/profilesettings.php:51 ../actions/register.php:172
 #: actions/profilesettings.php:84 actions/register.php:186
 #: actions/profilesettings.php:114 actions/register.php:404
@@ -652,7 +905,8 @@ msgstr "Beskriv degselv og dine interesser med 140 tegn"
 #: 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
+#: lib/accountsettingsaction.php:117 actions/register.php:437
+#: actions/register.php:441
 msgid "Email"
 msgstr "E-post"
 
@@ -666,6 +920,125 @@ msgstr "E-postadresse"
 msgid "Email Settings"
 msgstr "Innstillinger for e-post"
 
+#: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
+#: actions/register.php:200 actions/register.php:206 actions/register.php:212
+msgid "Email address already exists."
+msgstr ""
+
+#: ../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: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: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: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:200
+msgid "Error authorizing token"
+msgstr ""
+
+#: ../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 ""
+
+#: ../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
+#: 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 ""
+
+#: ../actions/userauthorization.php:140 actions/userauthorization.php:147
+#: 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:169
+#: actions/passwordsettings.php:175 actions/passwordsettings.php:180
+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
+#: actions/login.php:120 actions/recoverpassword.php:372
+#: actions/register.php:235 actions/login.php:122
+#: actions/recoverpassword.php:375 actions/register.php:242
+#: actions/login.php:149 actions/register.php:248
+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
+#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+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:116
 msgid "Existing nickname"
@@ -676,6 +1049,12 @@ msgstr "Eksisterende nick"
 msgid "FAQ"
 msgstr "OSS/FAQ"
 
+#: ../actions/avatar.php:115 actions/profilesettings.php:352
+#: actions/avatarsettings.php:397 actions/avatarsettings.php:349
+#: actions/avatarsettings.php:363
+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
@@ -696,6 +1075,23 @@ msgstr "Feed for svar til %s"
 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 actions/login.php:247 actions/login.php:255
+#: actions/login.php:282
+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
@@ -706,6 +1102,7 @@ msgstr "Feed for taggen %s"
 #: actions/showstream.php:220 lib/groupeditform.php:157
 #: actions/profilesettings.php:111 actions/register.php:441
 #: actions/showgroup.php:247 actions/showstream.php:267
+#: actions/register.php:447 lib/userprofile.php:149
 msgid "Full name"
 msgstr "Fullt navn"
 
@@ -719,7 +1116,7 @@ msgstr "Fullt navn"
 #: 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
+#: actions/register.php:214 actions/register.php:220
 msgid "Full name is too long (max 255 chars)."
 msgstr "Beklager, navnet er for langt (max 250 tegn)."
 
@@ -740,10 +1137,33 @@ msgstr "Hjem"
 #: 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
+#: actions/register.php:446 actions/register.php:452
 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
+#: 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 actions/register.php:217
+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:110
+msgid "IM"
+msgstr ""
+
 #: ../actions/imsettings.php:60 actions/imsettings.php:61
 #: actions/imsettings.php:118 actions/imsettings.php:124
 msgid "IM Address"
@@ -754,6 +1174,25 @@ msgstr "IM-adresse"
 msgid "IM Settings"
 msgstr "Innstillinger for IM"
 
+#: ../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 ""
+
+#: ../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: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/emailsettings.php:67 ../actions/smssettings.php:76
 #: actions/emailsettings.php:68 actions/smssettings.php:76
 #: actions/emailsettings.php:127 actions/smssettings.php:140
@@ -761,6 +1200,13 @@ msgstr "Innstillinger for IM"
 msgid "Incoming email"
 msgstr "innkommende e-post"
 
+#: ../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
@@ -769,14 +1215,18 @@ msgstr "Feil gammelt passord"
 
 #: ../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
+#: actions/facebookhome.php:129 actions/login.php:116 actions/login.php:143
 msgid "Incorrect username or password."
 msgstr "Feil brukernavn eller passord"
 
 #: ../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."
+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:120
@@ -784,18 +1234,55 @@ msgstr "Instruksjoner om hvordan du kan gjenopprette ditt passord har blitt send
 msgid "Invalid avatar URL '%s'"
 msgstr "Ugyldig 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 ""
+
 #: ../actions/updateprofile.php:98 actions/updateprofile.php:99
 #: 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 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:84
+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: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 actions/remotesubscribe.php:159
+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."
@@ -808,15 +1295,96 @@ msgstr "Ugyldig størrelse"
 #: 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
+#: actions/register.php:243 actions/register.php:264
 msgid "Invalid username or password."
 msgstr "Ugyldig brukernavn 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 ""
+
+#: ../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/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/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 ""
+
+#: ../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 ""
+
+#: ../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 ""
+
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
 #: 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:218
+#: actions/profilesettings.php:234
+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 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 actions/register.php:470 lib/userprofile.php:164
+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 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 actions/register.php:227
+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
@@ -827,6 +1395,7 @@ msgstr "Språk"
 #: 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
+#: actions/login.php:204 actions/login.php:257
 #, php-format
 msgid "Login"
 msgstr "Logg inn"
@@ -837,6 +1406,14 @@ msgstr "Logg inn"
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "Logg inn med en [OpenID](%%doc.openid%%)-konto."
 
+#: ../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 ""
+
 #: ../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"
@@ -844,15 +1421,29 @@ msgstr "Logg ut"
 
 #: ../actions/register.php:166 actions/register.php:180
 #: actions/register.php:393 actions/register.php:439 actions/register.php:443
+#: actions/register.php:449
 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 actions/login.php:228 lib/facebookaction.php:325
-#: lib/facebookaction.php:327 actions/login.php:236
+#: lib/facebookaction.php:327 actions/login.php:236 actions/login.php:263
 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
+#: 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 ""
+
+#: ../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 lib/profileaction.php:182
 msgid "Member since"
@@ -864,6 +1455,22 @@ msgstr "Medlem siden"
 msgid "Microblog by %s"
 msgstr "Mikroblogg av %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 "
+"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
+#: actions/register.php:430 actions/finishopenidlogin.php:106
+#: actions/register.php:477 actions/register.php:487 actions/register.php:493
+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
@@ -871,11 +1478,28 @@ msgstr "Mikroblogg av %s"
 msgid "New"
 msgstr "Ny"
 
+#: ../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: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:98
 msgid "New nickname"
 msgstr "Nytt nick"
 
+#: ../actions/newnotice.php:87 actions/newnotice.php:96
+#: 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
@@ -884,6 +1508,11 @@ msgstr "Nytt nick"
 msgid "New password"
 msgstr "Nytt passord"
 
+#: ../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 ""
+
 #: ../actions/login.php:101 ../actions/profilesettings.php:41
 #: ../actions/register.php:151 actions/login.php:101
 #: actions/profilesettings.php:74 actions/register.php:165
@@ -896,7 +1525,8 @@ msgstr "Nytt passord"
 #: 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
+#: actions/showgroup.php:236 actions/showstream.php:249 actions/login.php:246
+#: actions/register.php:423 lib/userprofile.php:131
 msgid "Nickname"
 msgstr "Nick"
 
@@ -910,25 +1540,84 @@ msgstr "Nick"
 #: 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
+#: actions/register.php:202 actions/register.php:208
 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 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 actions/register.php:205
+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:226
 msgid "Nickname not allowed."
 msgstr "Dette nicket er ikke tillatt"
 
+#: ../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 ""
+
 #: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
 #: 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
+#: 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:285
 msgid "No Jabber ID."
 msgstr "Ingen Jabber ID."
 
+#: ../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:311
+msgid "No carrier selected."
+msgstr ""
+
+#: ../actions/smssettings.php:316 actions/smssettings.php:324
+#: actions/smssettings.php:486 actions/smssettings.php:498
+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
+#: 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:311
 #: actions/emailsettings.php:319
@@ -939,6 +1628,178 @@ msgstr "Ingen e-postadresse."
 msgid "No id."
 msgstr "Ingen id."
 
+#: ../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 ""
+
+#: ../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
+#: actions/leavegroup.php:76
+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 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:306
+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 actions/recoverpassword.php:284
+#: actions/recoverpassword.php:287
+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 actions/noticesearch.php:117
+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 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:442
+#: actions/twitapistatuses.php:399 actions/apistatusesshow.php:144
+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
+#: 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 actions/deletenotice.php:52
+#: actions/shownotice.php:92
+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 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:269
+#: actions/recoverpassword.php:272
+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 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: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 lib/api.php:963
+#: lib/api.php:991 lib/api.php:1101
+msgid "Not a supported data format."
+msgstr ""
+
 #: ../actions/imsettings.php:167 actions/imsettings.php:175
 #: actions/imsettings.php:290 actions/imsettings.php:296
 msgid "Not a valid Jabber ID"
@@ -956,7 +1817,7 @@ 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
+#: actions/register.php:189 actions/register.php:195 actions/register.php:201
 msgid "Not a valid email address."
 msgstr "Ugyldig e-postadresse."
 
@@ -968,15 +1829,49 @@ msgstr "Ugyldig e-postadresse."
 #: 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
+#: actions/register.php:204 actions/register.php:210
 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 lib/imagefile.php:90 lib/imagefile.php:91
+#: lib/imagefile.php:96
+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
+#: 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/apistatusesupdate.php:186
+#: actions/apistatusesupdate.php:193
+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
@@ -997,6 +1892,43 @@ msgstr "Ikke autorisert."
 msgid "Not logged in."
 msgstr "Ikke logget inn."
 
+#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122 lib/subs.php:124
+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 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/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: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:103
 msgid "Old password"
@@ -1008,6 +1940,24 @@ msgstr "Gammelt passord"
 msgid "OpenID"
 msgstr "OpenID"
 
+#: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
+#: 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 ""
+
+#: ../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 ""
+
 #: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
 #: actions/openidlogin.php:74 actions/openidsettings.php:50
 #: actions/openidlogin.php:102 actions/openidsettings.php:101
@@ -1023,6 +1973,20 @@ msgstr "OpenID-URL"
 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
+#: 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 ""
+
 #: ../actions/openidsettings.php:144 actions/openidsettings.php:153
 #: actions/openidsettings.php:231
 msgid "OpenID removed."
@@ -1033,6 +1997,16 @@ msgstr "OpenID fjernet"
 msgid "OpenID settings"
 msgstr "Innstillinger for 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:79 lib/imagefile.php:80
+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
@@ -1042,29 +2016,132 @@ msgstr "Innstillinger for OpenID"
 #: 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
+#: lib/accountsettingsaction.php:114 actions/login.php:249
+#: actions/register.php:428
 msgid "Password"
 msgstr "Passord"
 
+#: ../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 "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
+#: 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
+#: actions/passwordsettings.php:191
 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
+#: actions/passwordsettings.php:150 actions/register.php:220
+#: actions/passwordsettings.php:156 actions/register.php:227
+#: actions/register.php:233
+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
+#: 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 ""
+
+#: ../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 actions/imsettings.php:148
+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 actions/twittersettings.php:137
+#: actions/emailsettings.php:153 actions/imsettings.php:139
+#: actions/smssettings.php:169
+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
+#: 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: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:109
@@ -1072,6 +2149,33 @@ msgstr "Personlig"
 msgid "Profile"
 msgstr "Profil"
 
+#: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
+#: 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: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 ""
+
+#: ../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 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:159
 msgid "Publish a MicroID for my Jabber/GTalk address."
@@ -1094,13 +2198,64 @@ msgstr "Nyeste Tagger"
 msgid "Recover"
 msgstr "Gjenopprett"
 
+#: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
+#: actions/recoverpassword.php:198 actions/recoverpassword.php:206
+#: actions/recoverpassword.php:209
+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
+#: 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 actions/register.php:114 actions/register.php:502
+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 actions/register.php:135
+msgid "Registration not allowed."
+msgstr ""
+
+#: ../actions/register.php:200 actions/register.php:214
+#: actions/register.php:67 actions/register.php:106 actions/register.php:112
+msgid "Registration successful"
+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/login.php:225 actions/register.php:471
+#: actions/login.php:252 actions/register.php:477
 msgid "Remember me"
 msgstr "Husk meg"
 
+#: ../actions/updateprofile.php:70 actions/updateprofile.php:71
+#: 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:112
+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
@@ -1122,6 +2277,12 @@ msgstr "Fjern"
 msgid "Remove OpenID"
 msgstr "Fjern 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 ""
+
 #: ../lib/stream.php:55 lib/personal.php:55 lib/personalgroupnav.php:103
 #: lib/personalgroupnav.php:104
 msgid "Replies"
@@ -1143,6 +2304,19 @@ msgstr "Svar til %s"
 msgid "Reset"
 msgstr "Nullstill"
 
+#: ../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:138
 msgid "SMS Phone number"
@@ -1153,6 +2327,22 @@ msgstr "Telefonnummer for SMS"
 msgid "SMS Settings"
 msgstr "Innstillinger for SMS"
 
+#: ../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: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:427
+#: actions/register.php:433
+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
@@ -1180,6 +2370,31 @@ msgstr "Lagre"
 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 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: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 ""
+
+#: ../actions/smssettings.php:296 actions/smssettings.php:304
+#: 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 actions/invite.php:189
@@ -1189,6 +2404,71 @@ msgstr "Søk"
 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 ""
+
+#: ../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 ""
+
+#: ../actions/imsettings.php:70 actions/imsettings.php:71
+#: 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:318
+#: actions/profilesettings.php:344
+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 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:56
+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:732
 msgid "Source"
@@ -1201,6 +2481,59 @@ msgstr "Kilde"
 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 ""
+
+#: ../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
+#: lib/userprofile.php:321
+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/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: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:355
+#: actions/userauthorization.php:389 actions/userauthorization.php:259
+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 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: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
@@ -1209,6 +2542,7 @@ msgstr "Statistikk"
 #: actions/profilesettings.php:123 actions/showstream.php:255
 #: lib/subscriptionlist.php:106 lib/subscriptionlist.php:108
 #: actions/profilesettings.php:138 actions/showstream.php:327
+#: lib/userprofile.php:209
 msgid "Tags"
 msgstr "Tagger"
 
@@ -1222,6 +2556,26 @@ msgstr "Tekst"
 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
+#: actions/emailsettings.php:328 actions/emailsettings.php:336
+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."
@@ -1267,20 +2621,274 @@ msgstr "Det er ikke ditt telefonnummer."
 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 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: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: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 ""
+
+#: ../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 ""
+
+#: ../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: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 ""
+
+#: ../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:97
+msgid "This confirmation code is too old. Please start again."
+msgstr ""
+
+#: ../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: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 ""
+
+#: ../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 ""
+
+#: ../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
+#: actions/apiaccountupdateprofileimage.php:84
+msgid "This method requires a POST."
+msgstr ""
+
+#: ../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:139
 #: actions/profilesettings.php:154
 msgid "Timezone"
 msgstr "Tidssone"
 
+#: ../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."
+"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 actions/twitapifriendships.php:139
+#: actions/apifriendshipsexists.php:103 actions/apifriendshipsexists.php:94
+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/profilesettings.php:117
-#: actions/register.php:448
+#: actions/register.php:448 actions/register.php:454
 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 actions/remotesubscribe.php:134
+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
+#: 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
+#: actions/avatarsettings.php:277 lib/designsettings.php:304
+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:213
+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
+#: actions/updateprofile.php:51
+msgid "Unsupported OMB version"
+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:116
+msgid "Updates by SMS"
+msgstr ""
+
+#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
+#: 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/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: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
@@ -1288,6 +2896,101 @@ msgstr "URL til din hjemmeside, blogg, eller profil på annen nettside."
 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
+#: 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:382
+#: actions/register.php:386 actions/register.php:428 actions/register.php:432
+#: actions/register.php:436 actions/register.php:438 actions/register.php:442
+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
+#: 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 actions/apiaccountupdateprofileimage.php:124
+#: actions/apiaccountupdateprofileimage.php:130
+msgid "User has no profile."
+msgstr ""
+
+#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
+#: 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 ""
+
+#: ../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 ""
+
+#: ../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 actions/register.php:472
+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: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:129
+#, 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
@@ -1297,62 +3000,190 @@ msgstr "Last opp"
 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
+#: 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:111
+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 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:69
+#: actions/profilesettings.php:71
+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
+#: 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:192 actions/register.php:198
+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:69
+msgid "You did not send us that profile"
+msgstr ""
+
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../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: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:113
+msgid "Your OpenID URL"
+msgstr ""
+
+#: ../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: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:756
-#: lib/util.php:770 lib/util.php:816
+#: lib/util.php:770 lib/util.php:816 lib/util.php:844
 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:768
-#: lib/util.php:782 lib/util.php:828
+#: lib/util.php:782 lib/util.php:828 lib/util.php:856
 #, 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:764
-#: lib/util.php:778 lib/util.php:824
+#: lib/util.php:778 lib/util.php:824 lib/util.php:852
 #, 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:760
-#: lib/util.php:774 lib/util.php:820
+#: lib/util.php:774 lib/util.php:820 lib/util.php:848
 #, 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:772
-#: lib/util.php:786 lib/util.php:832
+#: lib/util.php:786 lib/util.php:832 lib/util.php:860
 #, 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:766
-#: lib/util.php:780 lib/util.php:826
+#: lib/util.php:780 lib/util.php:826 lib/util.php:854
 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:758
-#: lib/util.php:772 lib/util.php:818
+#: lib/util.php:772 lib/util.php:818 lib/util.php:846
 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:770
-#: lib/util.php:784 lib/util.php:830
+#: lib/util.php:784 lib/util.php:830 lib/util.php:858
 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:774
-#: lib/util.php:788 lib/util.php:834
+#: lib/util.php:788 lib/util.php:834 lib/util.php:862
 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:762
-#: lib/util.php:776 lib/util.php:822
+#: lib/util.php:776 lib/util.php:822 lib/util.php:850
 msgid "about an hour ago"
 msgstr "omtrent én time siden"
 
@@ -1361,19 +3192,785 @@ 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 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: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
+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
+#: 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 actions/login.php:131
+#: actions/register.php:165 actions/avatarsettings.php:265
+#: lib/designsettings.php:294
+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
+#: actions/twitapifavorites.php:188 actions/apifavoritedestroy.php:134
+msgid "Could not delete favorite."
+msgstr ""
+
+#: actions/disfavor.php:72 lib/favorform.php:140
+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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: actions/favor.php:70
+msgid "Disfavor"
+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 ""
+
+#: 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 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 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:231
+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
+#: 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 ""
+
+#: 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
+#: actions/passwordsettings.php:147 actions/register.php:217
+#: actions/passwordsettings.php:153 actions/register.php:224
+#: actions/register.php:230
+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
+#: 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 ""
+
+#: actions/showmessage.php:33 actions/showmessage.php:81
+msgid "No such message."
+msgstr ""
+
+#: actions/showmessage.php:42 actions/showmessage.php:98
+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
+#: 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 ""
+
+#: 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
+#: 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 ""
+
+#: actions/twittersettings.php:63
+msgid "Twitter Username"
+msgstr ""
+
+#: actions/twittersettings.php:65 actions/twittersettings.php:123
+#: actions/twittersettings.php:126
+msgid "No spaces, please."
+msgstr ""
+
+#: actions/twittersettings.php:67
+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: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 ""
+
+#: 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
+#: 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: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: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 ""
+
+#: 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
+#: lib/channel.php:138 lib/channel.php:158
+msgid "Command results"
+msgstr ""
+
+#: classes/Channel.php:148 classes/Channel.php:204 lib/channel.php:210
+msgid "Command complete"
+msgstr ""
+
+#: classes/Channel.php:158 classes/Channel.php:215 lib/channel.php:221
+msgid "Command failed"
+msgstr ""
+
+#: classes/Command.php:39 classes/Command.php:44 lib/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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 lib/command.php:356
+#: 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: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:574
+msgid "Notification on."
+msgstr ""
+
+#: 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 ""
+
+#: 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:65
+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 lib/mail.php:509
+#, 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 lib/mailbox.php:91
+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
+#: 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 ""
+
+#: 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:66
 #: actions/facebookhome.php:161 actions/all.php:48
 #: actions/facebookhome.php:156 actions/all.php:84
-#, php-format, fuzzy
+#, fuzzy, php-format
 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/avatarsettings.php:119
 #: actions/avatarsettings.php:194 actions/grouplogo.php:256
@@ -1382,6 +3979,51 @@ msgstr "%s og venner"
 msgid "Avatar settings"
 msgstr "Innstillinger for IM"
 
+#: 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
+msgid "There was a problem with your session token. "
+msgstr ""
+
+#: actions/avatarsettings.php:303 actions/grouplogo.php:360
+#: actions/avatarsettings.php:308 actions/avatarsettings.php:322
+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 actions/avatarsettings.php:337
+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
@@ -1389,11 +4031,74 @@ msgstr "Innstillinger for IM"
 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 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/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:134
+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:165
 #, fuzzy
 msgid "You have already blocked this user."
 msgstr "Du er allerede logget inn!"
 
+#: actions/block.php:167 actions/block.php:170
+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 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/grouplogo.php:91 actions/grouprss.php:96
@@ -1417,6 +4122,24 @@ msgstr "Nytt nick"
 msgid "No such group"
 msgstr "Klarte ikke å lagre profil."
 
+#: 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 ""
+
+#: actions/editgroup.php:157 actions/editgroup.php:159
+#: actions/editgroup.php:154
+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
@@ -1428,11 +4151,74 @@ msgstr "Bioen er for lang (max 140 tegn)"
 msgid "Could not update group."
 msgstr "Klarte ikke å oppdatere bruker."
 
+#: actions/editgroup.php:226 actions/editgroup.php:269
+msgid "Options saved."
+msgstr ""
+
 #: actions/emailsettings.php:107 actions/imsettings.php:108
-#, php-format, fuzzy
+#, fuzzy, php-format
 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 actions/emailsettings.php:173
+#: actions/emailsettings.php:179
+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 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
+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
@@ -1441,49 +4227,235 @@ msgstr "Venter på bekreftelse på dette telefonnummeret"
 msgid "Before"
 msgstr "Tidligere »"
 
+#: 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
+msgid "Invitations have been sent to the following users:"
+msgstr ""
+
+#: 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:111
 #: actions/facebookinvite.php:103
-#, php-format, fuzzy
+#, fuzzy, php-format
 msgid "Invite your friends to use %s"
 msgstr "Feed for %s sine venner"
 
+#: 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
 #, 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 actions/favor.php:92
+msgid "Disfavor favorite"
+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 ""
+
+#: 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 lib/publicgroupnav.php:89
+#: lib/featureduserssection.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 actions/finishremotesubscribe.php:96
+msgid "That user has blocked you from subscribing."
+msgstr ""
+
+#: 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 "Avataren har blitt oppdatert."
 
+#: actions/grouplogo.php:450 actions/grouplogo.php:403
+#: actions/grouplogo.php:398
+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 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/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: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
-#, php-format, fuzzy
+#, fuzzy, php-format
 msgid "A confirmation code was sent "
 msgstr "Bekreftelseskode"
 
+#: 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: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 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 lib/command.php:239
+#, 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 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
@@ -1492,12 +4464,48 @@ msgstr "Du er allerede logget inn!"
 msgid "No such group."
 msgstr "Klarte ikke å lagre profil."
 
+#: actions/leavegroup.php:95 actions/leavegroup.php:90 lib/command.php:268
+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 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, fuzzy
+#, fuzzy, php-format
 msgid "Could not remove user %s to group %s"
 msgstr "Klarte ikke å oppdatere bruker."
 
+#: 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 actions/login.php:243
+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 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
 #, fuzzy
@@ -1515,6 +4523,34 @@ 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 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: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 ""
+
+#: 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:106
 #, fuzzy
 msgid "OpenID login"
@@ -1530,11 +4566,24 @@ 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 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
 #, fuzzy
@@ -1553,10 +4602,30 @@ msgid "Password change"
 msgstr "Passordet ble lagret"
 
 #: actions/peopletag.php:35 actions/peopletag.php:70
-#, php-format, fuzzy
+#, fuzzy, php-format
 msgid "Not a valid people tag: %s"
 msgstr "Ugyldig e-postadresse"
 
+#: actions/peopletag.php:47 actions/peopletag.php:144
+#, 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 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 ""
+
 #: actions/profilesettings.php:144
 #, fuzzy
 msgid "Automatically subscribe to whoever "
@@ -1565,7 +4634,7 @@ msgstr "Abonner "
 #: actions/profilesettings.php:229 actions/tagother.php:176
 #: actions/tagother.php:178 actions/profilesettings.php:230
 #: actions/profilesettings.php:246
-#, php-format, fuzzy
+#, fuzzy, php-format
 msgid "Invalid tag: \"%s\""
 msgstr "Ugyldig hjemmeside '%s'"
 
@@ -1575,6 +4644,60 @@ msgstr "Ugyldig hjemmeside '%s'"
 msgid "Couldn't save tags."
 msgstr "Klarte ikke å lagre profil."
 
+#: 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 ""
+
+#: 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 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 actions/register.php:85 actions/register.php:189
+#: actions/register.php:404
+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, "
@@ -1585,18 +4708,86 @@ 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 actions/replies.php:120 actions/replies.php:119
 #: actions/replies.php:127
-#, php-format, fuzzy
+#, fuzzy, php-format
 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 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 "Klarte ikke å lagre 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 lib/userprofile.php:177
+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 lib/userprofile.php:194
+msgid "Note"
+msgstr ""
+
+#: 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:304
+#, php-format
+msgid "Notice feed for %s group"
+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:381
@@ -1605,6 +4796,37 @@ msgstr "Klarte ikke å lagre profil."
 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 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:392
+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 actions/showstream.php:78
+#: actions/showstream.php:79
+#, php-format
+msgid "%s, page %d"
+msgstr ""
+
 #: actions/showstream.php:143
 #, fuzzy
 msgid "'s profile"
@@ -1612,21 +4834,70 @@ msgstr "Profil"
 
 #: actions/showstream.php:236 actions/tagother.php:77
 #: actions/showstream.php:220 actions/showstream.php:185
-#: actions/showstream.php:193
+#: actions/showstream.php:193 lib/userprofile.php:75
 #, fuzzy
 msgid "User profile"
 msgstr "Klarte ikke å lagre profil."
 
+#: actions/showstream.php:240 actions/tagother.php:81
+#: actions/showstream.php:224 actions/showstream.php:189
+#: actions/showstream.php:220 lib/userprofile.php:102
+msgid "Photo"
+msgstr ""
+
+#: actions/showstream.php:317 actions/showstream.php:309
+#: actions/showstream.php:274 actions/showstream.php:354
+#: lib/userprofile.php:236
+msgid "User actions"
+msgstr ""
+
+#: actions/showstream.php:342 actions/showstream.php:307
+#: actions/showstream.php:390 lib/userprofile.php:272
+msgid "Send a direct message to this user"
+msgstr ""
+
+#: actions/showstream.php:343 actions/showstream.php:308
+#: actions/showstream.php:391 lib/userprofile.php:273
+msgid "Message"
+msgstr ""
+
 #: actions/showstream.php:451 lib/profileaction.php:157
 #, fuzzy
 msgid "All subscribers"
 msgstr "Alle abonnementer"
 
+#: actions/showstream.php:533 lib/profileaction.php:235
+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 actions/smssettings.php:465
+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."
@@ -1637,16 +4908,48 @@ 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
-#, php-format, fuzzy
+#, fuzzy, php-format
 msgid "%s subscriptions"
 msgstr "Alle abonnementer"
 
 #: actions/subscriptions.php:54
-#, php-format, fuzzy
+#, fuzzy, php-format
 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:124
 #: actions/subscriptions.php:183 actions/subscriptions.php:194
 #, fuzzy
@@ -1654,17 +4957,26 @@ msgid "Jabber"
 msgstr "Ingen Jabber ID."
 
 #: actions/tag.php:43 actions/tag.php:51 actions/tag.php:59 actions/tag.php:68
-#, php-format, fuzzy
+#, fuzzy, php-format
 msgid "Notices tagged with %s, page %d"
 msgstr "Mikroblogg av %s"
 
+#: 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 "Ikke logget inn."
 
+#: actions/tagother.php:39
+msgid "No id argument."
+msgstr ""
+
 #: actions/tagother.php:65
-#, php-format, fuzzy
+#, fuzzy, php-format
 msgid "Tag %s"
 msgstr "Tagger"
 
@@ -1673,42 +4985,243 @@ msgstr "Tagger"
 msgid "Tag user"
 msgstr "Tagger"
 
+#: actions/tagother.php:149 actions/tagother.php:151
+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 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:200
 #, fuzzy
 msgid "Could not save tags."
 msgstr "Klarte ikke å lagre avatar-informasjonen"
 
+#: 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
+msgid "No such tag."
+msgstr ""
+
 #: actions/tagrss.php:66 actions/tagrss.php:64
-#, php-format, fuzzy
+#, fuzzy, php-format
 msgid "Microblog tagged with %s"
 msgstr "Mikroblogg av %s"
 
+#: 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/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 actions/twittersettings.php:122
+msgid "Twitter user name"
+msgstr ""
+
 #: actions/twittersettings.php:126 actions/twittersettings.php:129
 #, fuzzy
 msgid "Twitter password"
 msgstr "Nytt passord"
 
+#: actions/twittersettings.php:228 actions/twittersettings.php:232
+#: actions/twittersettings.php:248
+msgid "Twitter Friends"
+msgstr ""
+
+#: actions/twittersettings.php:327
+msgid "Username must have only numbers, "
+msgstr ""
+
+#: actions/twittersettings.php:341
+#, php-format
+msgid "Unable to retrieve account information "
+msgstr ""
+
+#: actions/unblock.php:108 actions/groupunblock.php:128
+msgid "Error removing the block."
+msgstr ""
+
+#: actions/unsubscribe.php:50 actions/unsubscribe.php:77
+msgid "No profile id in request."
+msgstr ""
+
+#: actions/unsubscribe.php:57 actions/unsubscribe.php:84
+msgid "No profile with that id."
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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: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:144
+#, php-format
+msgid "%s - %s"
+msgstr ""
+
+#: 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 "Om"
 
+#: 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: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 "Opprett en ny konto"
 
+#: lib/action.php:341 lib/action.php:418
+msgid "Login with OpenID"
+msgstr ""
+
 #: lib/action.php:344 lib/action.php:421 lib/action.php:446 lib/action.php:456
 #, fuzzy
 msgid "Help me!"
 msgstr "Hjelp"
 
+#: 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:546
+msgid "Local views"
+msgstr ""
+
+#: 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: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:764
+msgid "StatusNet software license"
+msgstr ""
+
+#: 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: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 ""
+
+#: lib/disfavorform.php:114 lib/disfavorform.php:140
+msgid "Disfavor this notice"
+msgstr ""
+
+#: 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
@@ -1722,17 +5235,39 @@ msgstr "Opprett en ny konto"
 msgid "Published"
 msgstr "Offentlig"
 
+#: lib/favorform.php:114 lib/favorform.php:140
+msgid "Favor this notice"
+msgstr ""
+
+#: lib/feedlist.php:64
+msgid "Export data"
+msgstr ""
+
 #: lib/galleryaction.php:121
 #, fuzzy
 msgid "Filter tags"
 msgstr "Feed for taggen %s"
 
+#: lib/galleryaction.php:131
+msgid "All"
+msgstr ""
+
 #: lib/galleryaction.php:137 lib/galleryaction.php:138
 #: lib/galleryaction.php:140
 #, fuzzy
 msgid "Tag"
 msgstr "Tagger"
 
+#: 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 ""
+
 #: lib/groupeditform.php:148 lib/groupeditform.php:163
 #, fuzzy
 msgid "URL of the homepage or blog of the group or topic"
@@ -1749,11 +5284,52 @@ msgstr "Alle abonnementer"
 msgid "Describe the group or topic in 140 chars"
 msgstr "Beskriv degselv og dine interesser med 140 tegn"
 
+#: 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 ""
+
+#: 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 "Logg ut"
 
+#: 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
+msgid "This page is not available in a "
+msgstr ""
+
 #: lib/joinform.php:114
 #, fuzzy
 msgid "Join"
@@ -1774,11 +5350,67 @@ msgstr "Ugyldig brukernavn eller passord"
 msgid "Sign up for a new account"
 msgstr "Opprett en ny konto"
 
+#: 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
+#, php-format
+msgid "%1$s is now listening to "
+msgstr ""
+
+#: lib/mail.php:254 lib/mail.php:253
+#, php-format
+msgid "Location: %s\n"
+msgstr ""
+
 #: lib/mail.php:256 lib/mail.php:255
-#, php-format, fuzzy
+#, fuzzy, php-format
 msgid "Homepage: %s\n"
 msgstr "Hjemmesiden: %s\n"
 
+#: 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 ""
+
+#: lib/mail.php:465
+#, php-format
+msgid "%1$s (%2$s) is wondering what you are up to "
+msgstr ""
+
+#: lib/mail.php:555
+#, php-format
+msgid "%1$s just added your notice from %2$s"
+msgstr ""
+
+#: 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:109 lib/messageform.php:120
+msgid "Send a direct notice"
+msgstr ""
+
+#: 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/messageform.php:162
 #: lib/noticeform.php:173
 #, fuzzy
@@ -1790,46 +5422,150 @@ msgstr "6 eller flere tegn"
 msgid "in reply to"
 msgstr "svar"
 
+#: 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
 #, fuzzy
 msgid "Reply"
 msgstr "svar"
 
+#: 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 actions/avatarsettings.php:148
 #: lib/noticelist.php:479 lib/noticelist.php:486 lib/noticelist.php:522
 #, fuzzy
 msgid "Delete"
 msgstr "slett"
 
+#: lib/nudgeform.php:116
+msgid "Nudge this user"
+msgstr ""
+
+#: lib/nudgeform.php:128
+msgid "Nudge"
+msgstr ""
+
+#: lib/nudgeform.php:128
+msgid "Send a nudge to this user"
+msgstr ""
+
+#: lib/personaltagcloudsection.php:56
+#, php-format
+msgid "Tags in %s's notices"
+msgstr ""
+
+#: lib/profilelist.php:182 lib/profilelist.php:180
+#: lib/subscriptionlist.php:126
+msgid "(none)"
+msgstr ""
+
 #: lib/publicgroupnav.php:76 lib/publicgroupnav.php:78
 #, fuzzy
 msgid "Public"
 msgstr "Offentlig"
 
+#: 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 "Nyeste Tagger"
 
+#: lib/publicgroupnav.php:86 lib/publicgroupnav.php:88
+msgid "Featured"
+msgstr ""
+
+#: lib/publicgroupnav.php:90 lib/publicgroupnav.php:92
+msgid "Popular"
+msgstr ""
+
+#: lib/searchgroupnav.php:82
+msgid "Notice"
+msgstr ""
+
+#: lib/searchgroupnav.php:85
+msgid "Find groups on this site"
+msgstr ""
+
+#: lib/section.php:89
+msgid "Untitled section"
+msgstr ""
+
+#: lib/subgroupnav.php:81 lib/subgroupnav.php:83
+#, php-format
+msgid "People %s subscribes to"
+msgstr ""
+
 #: lib/subgroupnav.php:89 lib/subgroupnav.php:91
-#, php-format, fuzzy
+#, fuzzy, php-format
 msgid "People subscribed to %s"
 msgstr "Svar til %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
+#, php-format
+msgid "Invite friends and colleagues to join you on %s"
+msgstr ""
+
+#: 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 ""
+
+#: lib/tagcloudsection.php:56
+msgid "None"
+msgstr ""
+
+#: lib/topposterssection.php:74
+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 actions/blockedfromgroup.php:313
+msgid "Unblock"
+msgstr ""
+
+#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
+msgid "Unsubscribe from this user"
+msgstr ""
+
 #: actions/all.php:77 actions/all.php:59 actions/all.php:99
-#, php-format, fuzzy
+#, fuzzy, php-format
 msgid "Feed for friends of %s (RSS 1.0)"
 msgstr "Feed for %s sine venner"
 
 #: actions/all.php:82 actions/all.php:64 actions/all.php:107
-#, php-format, fuzzy
+#, fuzzy, php-format
 msgid "Feed for friends of %s (RSS 2.0)"
 msgstr "Feed for %s sine venner"
 
 #: actions/all.php:87 actions/all.php:69 actions/all.php:115
-#, php-format, fuzzy
+#, fuzzy, php-format
 msgid "Feed for friends of %s (Atom)"
 msgstr "Feed for %s sine venner"
 
@@ -1838,30 +5574,148 @@ msgstr "Feed for %s sine venner"
 msgid "You and friends"
 msgstr "%s og venner"
 
-#: actions/avatarsettings.php:373
+#: actions/avatarsettings.php:78
+#, php-format
+msgid "You can upload your personal avatar. The maximum file size is %s."
+msgstr ""
+
+#: actions/avatarsettings.php:373 actions/avatarsettings.php:387
 #, fuzzy
 msgid "Avatar deleted."
 msgstr "Brukerbildet har blitt oppdatert."
 
+#: 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, fuzzy
+#, fuzzy, php-format
 msgid "Microblog by %s group"
 msgstr "Mikroblogg av %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
-#, php-format, fuzzy
+#, fuzzy, php-format
 msgid "Search results for \"%s\" on %s"
 msgstr "Søkestrøm for «%s»"
 
+#: 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
 #, fuzzy
 msgid "Public Stream Feed (Atom)"
 msgstr "%s offentlig 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
+#: actions/register.php:495
+msgid "Creative Commons Attribution 3.0"
+msgstr ""
+
 #: actions/register.php:433 actions/register.php:480 actions/register.php:490
+#: actions/register.php:496
 #, 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."
+msgid ""
+" except this private data: password, email address, IM address, and phone "
+"number."
+msgstr ""
+"utenom disse private dataene: passord, epost, adresse, lynmeldingsadresse og "
+"telefonnummer."
 
 #: actions/showgroup.php:378 actions/showgroup.php:424
 #: actions/showgroup.php:432
@@ -1869,37 +5723,104 @@ msgstr "utenom disse private dataene: passord, epost, adresse, lynmeldingsadress
 msgid "Created"
 msgstr "Opprett"
 
+#: 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 "Klarte ikke å lagre profil."
 
 #: actions/showstream.php:149
-#, php-format, fuzzy
+#, fuzzy, php-format
 msgid "%s's profile"
 msgstr "Profil"
 
+#: actions/showstream.php:163 actions/showstream.php:128
+#: actions/showstream.php:129
+#, php-format
+msgid "Notice feed for %s (RSS 1.0)"
+msgstr ""
+
+#: actions/showstream.php:170 actions/showstream.php:135
+#: actions/showstream.php:136
+#, php-format
+msgid "Notice feed for %s (RSS 2.0)"
+msgstr ""
+
+#: actions/showstream.php:177 actions/showstream.php:142
+#: actions/showstream.php:143
+#, php-format
+msgid "Notice feed for %s (Atom)"
+msgstr ""
+
 #: actions/showstream.php:182 actions/showstream.php:147
-#, php-format, fuzzy
+#: actions/showstream.php:148
+#, fuzzy, php-format
 msgid "FOAF for %s"
 msgstr "Feed for taggen %s"
 
 #: actions/showstream.php:237 actions/showstream.php:202
-#: actions/showstream.php:234
+#: actions/showstream.php:234 lib/userprofile.php:116
 #, fuzzy
 msgid "Edit Avatar"
 msgstr "Brukerbilde"
 
 #: actions/showstream.php:316 actions/showstream.php:281
-#: actions/showstream.php:366
+#: actions/showstream.php:366 lib/userprofile.php:248
 #, fuzzy
 msgid "Edit profile settings"
 msgstr "Endre profilinnstillingene dine"
 
+#: actions/showstream.php:317 actions/showstream.php:282
+#: actions/showstream.php:367 lib/userprofile.php:249
+msgid "Edit"
+msgstr ""
+
+#: actions/showstream.php:542 actions/showstream.php:388
+#: actions/showstream.php:487 actions/showstream.php:234
+#, 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 "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 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."
+
+#: 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
@@ -1910,30 +5831,262 @@ msgstr "En bekreftelseskode ble sendt til telefonnummeret du la til. Sjekk innbo
 #: actions/apistatusesupdate.php:125 actions/apisubscriptions.php:87
 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#: actions/apiaccountupdateprofileimage.php:91
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apistatusesupdate.php:139
 #, fuzzy
 msgid "No such user!"
 msgstr "Klarte ikke å lagre profil."
 
+#: 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/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, 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"
+#, 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 lytter nå til dine notiser på %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"Vennlig hilsen,\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
+#: actions/showstream.php:202
+#, 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, fuzzy
+#, fuzzy, php-format
 msgid "%s blocked profiles"
 msgstr "Klarte ikke å lagre profil."
 
 #: actions/blockedfromgroup.php:93
-#, php-format, fuzzy
+#, fuzzy, php-format
 msgid "%s blocked profiles, page %d"
 msgstr "%s og venner"
 
+#: 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"
@@ -1944,26 +6097,56 @@ msgstr "Bekreftelseskode"
 msgid "Do not delete this notice"
 msgstr "Kan ikke slette 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
-#, php-format, fuzzy
+#, fuzzy, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "Ugyldig hjemmeside '%s'"
 
 #: actions/editgroup.php:227 actions/newgroup.php:177
 #: actions/apigroupcreate.php:321 actions/editgroup.php:228
 #: actions/newgroup.php:172
-#, php-format, fuzzy
+#, fuzzy, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "Det nicket er allerede i bruk. Prøv et annet."
 
+#: 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 "Klarte ikke å lagre avatar-informasjonen"
 
+#: 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"
@@ -1974,62 +6157,505 @@ msgstr "Nytt nick"
 msgid "No notice"
 msgstr "Nytt nick"
 
+#: 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 "Ugyldig nick."
 
+#: 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 "Du er allerede logget inn!"
 
+#: 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
+#: lib/designsettings.php:461 lib/designsettings.php:434
+#: lib/designsettings.php:464
 #, fuzzy
 msgid "Couldn't update your design."
 msgstr "Klarte ikke å oppdatere bruker."
 
+#: 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 actions/apiaccountupdateprofileimage.php:97
+#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254
+#: lib/designsettings.php:283
+#, php-format
+msgid ""
+"The server was unable to handle that much POST data (%s bytes) due to its "
+"current configuration."
+msgstr ""
+
+#: 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 "Klarte ikke å lagre 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
+#, 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 "Instruksjoner om hvordan du kan gjenopprette ditt passord har blitt sendt til din registrerte e-postadresse."
+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."
+
+#: actions/recoverpassword.php:158
+msgid "You've been identified. Enter a new password below. "
+msgstr ""
 
 #: actions/recoverpassword.php:188
 #, fuzzy
 msgid "Password recover"
 msgstr "Passordet ble lagret"
 
+#: actions/register.php:86 actions/register.php:92
+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, fuzzy
+#, fuzzy, php-format
 msgid "%s's favorite notices, page %d"
 msgstr "%s og venner"
 
+#: 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 "Ugyldig OpenID"
 
-#: actions/showstream.php:72
-#, php-format, fuzzy
+#: actions/showstream.php:72 actions/showstream.php:73
+#, fuzzy, php-format
 msgid " tagged %s"
 msgstr "Tagger"
 
+#: actions/showstream.php:121 actions/showstream.php:122
+#, php-format
+msgid "Notice feed for %s tagged %s (RSS 1.0)"
+msgstr ""
+
+#: actions/showstream.php:350 actions/showstream.php:444
+#: actions/showstream.php:191
+#, 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
+#: actions/showstream.php:196
+msgid ""
+"Seen anything interesting recently? You haven't posted any notices yet, now "
+"would be a good time to start :)"
+msgstr ""
+
+#: actions/showstream.php:357 actions/showstream.php:451
+#: actions/showstream.php:198
+#, 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
+#: actions/showstream.php:239
+#, 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, fuzzy
+#, fuzzy, php-format
 msgid "%s is not listening to anyone."
 msgstr "%1$s lytter nå til dine notiser på %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, fuzzy
+#, fuzzy, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr "Feed for taggen %s"
 
@@ -2038,28 +6664,44 @@ msgstr "Feed for taggen %s"
 msgid "This status is already a favorite!"
 msgstr "Det er allerede din e-postadresse."
 
+#: 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 "Klarte ikke å oppdatere bruker."
 
+#: 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 "Klarte ikke å oppdatere bruker."
 
 #: actions/twitapistatuses.php:322 actions/apitimelinementions.php:116
-#, php-format, fuzzy
+#, fuzzy, php-format
 msgid "%1$s / Updates mentioning %2$s"
 msgstr "%1$s / Oppdateringer som svarer til %2$s"
 
 #: actions/twitapitags.php:74 actions/apitimelinetag.php:107
 #: actions/tagrss.php:64
-#, php-format, fuzzy
+#, fuzzy, php-format
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Mikroblogg av %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"
@@ -2070,31 +6712,127 @@ msgstr "Alle abonnementer"
 msgid "Profile design"
 msgstr "Profil"
 
+#: actions/userdesignsettings.php:87 lib/designsettings.php:76
+msgid ""
+"Customize the way your profile looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+
+#: actions/userdesignsettings.php:282
+msgid "Enjoy your hotdog!"
+msgstr ""
+
 #: actions/usergroups.php:153
-#, php-format, fuzzy
+#, fuzzy, php-format
 msgid "%s is not a member of any group."
 msgstr "Du er allerede logget inn!"
 
+#: 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
+#: classes/User.php:333
+#, 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 "Klarte ikke å lagre 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 "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 "Endre passordet ditt"
 
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr ""
+
 #: lib/designsettings.php:191
 #, fuzzy
 msgid "Content"
@@ -2110,24 +6848,188 @@ msgstr "Søk"
 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
+#: lib/designsettings.php:372
+msgid "Bad default color settings: "
+msgstr ""
+
+#: lib/designsettings.php:474 lib/designsettings.php:465
+#: lib/designsettings.php:468
+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
 #, 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
+#, 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 "Klarte ikke å lagre profil."
 
+#: 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 "Klarte ikke å oppdatere bruker."
 
+#: actions/apifriendshipsdestroy.php:120
+msgid "You cannot unfollow yourself!"
+msgstr ""
+
 #: actions/apigroupcreate.php:261
-#, php-format, fuzzy
+#, fuzzy, php-format
 msgid "Description is too long (max %d chars)."
 msgstr "Bioen er for lang (max 140 tegn)"
 
@@ -2137,7 +7039,7 @@ msgid "You are already a member of that group."
 msgstr "Du er allerede logget inn!"
 
 #: actions/apigroupjoin.php:138
-#, php-format, fuzzy
+#, fuzzy, php-format
 msgid "Could not join user %s to group %s."
 msgstr "Klarte ikke å oppdatere bruker."
 
@@ -2147,20 +7049,81 @@ msgid "You are not a member of this group."
 msgstr "Du er allerede logget inn!"
 
 #: actions/apigroupleave.php:124
-#, php-format, fuzzy
+#, fuzzy, php-format
 msgid "Could not remove user %s to group %s."
 msgstr "Klarte ikke å oppdatere bruker."
 
+#: 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
+#: actions/apiaccountupdateprofileimage.php:99
+msgid "Unable to handle that much POST data!"
+msgstr ""
+
+#: actions/apistatusesupdate.php:145 actions/newnotice.php:155
+#: scripts/maildaemon.php:71 actions/apistatusesupdate.php:152
+#, php-format
+msgid "That's too long. Max notice size is %d chars."
+msgstr ""
+
+#: actions/apistatusesupdate.php:209 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:216
+#, 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, fuzzy
+#, fuzzy, php-format
 msgid "description is too long (max %d chars)."
 msgstr "Bioen er for lang (max 140 tegn)"
 
+#: 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
 #, fuzzy
 msgid "You are not authorized."
 msgstr "Ikke autorisert."
 
+#: 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."
@@ -2171,88 +7134,399 @@ msgstr "Klarte ikke å lagre profil."
 msgid "Cannot read file."
 msgstr "Klarte ikke å lagre profil."
 
+#: 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 actions/login.php:286
+#, 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, fuzzy
+#, fuzzy, php-format
 msgid "Updates matching search term \"%1$s\" on %2$s!"
 msgstr "Alle oppdateringer for søket: «%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
-#, php-format, fuzzy
+#: actions/register.php:460
+#, fuzzy, php-format
 msgid "Describe yourself and your interests in %d chars"
 msgstr "Beskriv degselv og dine interesser med 140 tegn"
 
 #: actions/profilesettings.php:125 actions/register.php:457
+#: actions/register.php:463
 #, fuzzy
 msgid "Describe yourself and your interests"
 msgstr "Beskriv degselv og dine interesser med 140 tegn"
 
 #: actions/profilesettings.php:221 actions/register.php:217
-#, php-format, fuzzy
+#: actions/register.php:223
+#, fuzzy, php-format
 msgid "Bio is too long (max %d chars)."
 msgstr "«Om meg» er for lang (maks 140 tegn)."
 
+#: actions/register.php:336 actions/register.php:342
+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, fuzzy
+#, fuzzy, php-format
 msgid "Replies feed for %s (Atom)"
 msgstr "Svar til %s"
 
 #: actions/repliesrss.php:72
-#, php-format, fuzzy
+#, fuzzy, php-format
 msgid "Replies to %1$s on %2$s!"
 msgstr "Svar til %s"
 
 #: actions/showfavorites.php:170
-#, php-format, fuzzy
+#, fuzzy, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
 msgstr "Feed for %s sine venner"
 
 #: actions/showfavorites.php:177
-#, php-format, fuzzy
+#, fuzzy, php-format
 msgid "Feed for favorites of %s (RSS 2.0)"
 msgstr "Feed for %s sine venner"
 
 #: actions/showfavorites.php:184
-#, php-format, fuzzy
+#, fuzzy, php-format
 msgid "Feed for favorites of %s (Atom)"
 msgstr "Feed for %s sine venner"
 
+#: 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, fuzzy
+#, fuzzy, php-format
 msgid "FOAF for %s group"
 msgstr "Klarte ikke å lagre profil."
 
+#: 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, fuzzy
+#, fuzzy, php-format
 msgid "Can’t read avatar URL ‘%s’."
 msgstr "Kan ikke lese brukerbilde-URL «%s»"
 
+#: 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, fuzzy
+#, fuzzy, php-format
 msgid "Could not find a user with nickname %s"
 msgstr "Klarte ikke å oppdatere bruker med bekreftet e-post."
 
+#: 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, fuzzy
+#, fuzzy, php-format
 msgid "Reply to %s sent"
 msgstr "Svar til %s"
 
+#: lib/command.php:441
+msgid "Error saving notice."
+msgstr ""
+
 #: lib/common.php:191
 #, fuzzy
 msgid "No configuration file found. "
 msgstr "Fant ikke bekreftelseskode."
 
+#: 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 "Beskriv degselv og dine interesser med 140 tegn"
 
 #: lib/groupeditform.php:170
-#, php-format, fuzzy
+#, fuzzy, php-format
 msgid "Describe the group or topic in %d characters"
 msgstr "Beskriv degselv og dine interesser med 140 tegn"
 
+#: 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
 #, fuzzy
 msgid "from"
 msgstr "fra"
 
+#: 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 ""
+
+#: actions/login.php:110 actions/login.php:120
+msgid "Invalid or expired token."
+msgstr ""
+
+#: lib/command.php:597
+#, fuzzy, php-format
+msgid "Could not create login token for %s"
+msgstr "Klarte ikke å lagre avatar-informasjonen"
+
+#: lib/command.php:602
+#, php-format
+msgid "This link is useable only once, and is good for only 2 minutes: %s"
+msgstr ""
+
+#: lib/imagefile.php:75
+#, php-format
+msgid "That file is too big. The maximum file size is %s."
+msgstr ""
+
+#: lib/command.php:613
+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"
+"login - Get a link to login to the web interface\n"
+"drop <group> - leave group\n"
+"stats - get your stats\n"
+"stop - same as 'off'\n"
+"quit - same as 'off'\n"
+"sub <nickname> - same as 'follow'\n"
+"unsub <nickname> - same as 'leave'\n"
+"last <nickname> - same as 'get'\n"
+"on <nickname> - not yet implemented.\n"
+"off <nickname> - not yet implemented.\n"
+"nudge <nickname> - remind a user to update.\n"
+"invite <phone number> - not yet implemented.\n"
+"track <word> - not yet implemented.\n"
+"untrack <word> - not yet implemented.\n"
+"track off - not yet implemented.\n"
+"untrack all - not yet implemented.\n"
+"tracks - not yet implemented.\n"
+"tracking - not yet implemented.\n"
+msgstr ""
diff --git a/locale/nl/LC_MESSAGES/statusnet.mo b/locale/nl/LC_MESSAGES/statusnet.mo
index 269fac730..c2f7d2de6 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 b2a64da2f..f097a8d75 100644
--- a/locale/nl/LC_MESSAGES/statusnet.po
+++ b/locale/nl/LC_MESSAGES/statusnet.po
@@ -6,12 +6,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-06 13:16+0000\n"
-"PO-Revision-Date: 2009-11-06 15:44:14+0000\n"
+"POT-Creation-Date: 2009-11-08 11:53+0000\n"
+"PO-Revision-Date: 2009-11-08 11:56:57+0000\n"
 "Language-Team: Dutch\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r58648); Translate extension (2009-08-03)\n"
+"X-Generator: MediaWiki 1.16alpha(r58760); 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"
@@ -202,7 +202,7 @@ msgid "%s updates from everyone!"
 msgstr "%s updates van iedereen"
 
 #: ../actions/register.php:213 actions/register.php:497
-#: actions/register.php:545 actions/register.php:555
+#: actions/register.php:545 actions/register.php:555 actions/register.php:561
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -242,6 +242,7 @@ 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
+#: actions/register.php:424
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr "1-64 kleine letters of cijfers, geen leestekens of spaties. Verplicht."
 
@@ -258,6 +259,7 @@ 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:419 actions/register.php:423
+#: actions/register.php:429
 msgid "6 or more characters. Required."
 msgstr "Zes of meer tekens. Verplicht"
 
@@ -437,7 +439,7 @@ msgstr "Alle updates die overeenkomen met de zoekterm \"%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
+#: actions/login.php:79 actions/register.php:137
 msgid "Already logged in."
 msgstr "U bent al aangemeld."
 
@@ -460,7 +462,7 @@ msgstr "Abonneren"
 #: ../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
+#: actions/register.php:473 actions/login.php:253 actions/register.php:479
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Voortaan automatisch aanmelden. Niet gebruiken op gedeelde computers!"
 
@@ -484,6 +486,7 @@ msgstr "Avatar"
 
 #: ../actions/avatar.php:113 actions/profilesettings.php:350
 #: actions/avatarsettings.php:395 actions/avatarsettings.php:346
+#: actions/avatarsettings.php:360
 msgid "Avatar updated."
 msgstr "De avatar is bijgewerkt."
 
@@ -520,7 +523,7 @@ msgstr "Voor »"
 #: 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
+#: actions/register.php:459 actions/register.php:465
 msgid "Bio"
 msgstr "Beschrijving"
 
@@ -549,6 +552,7 @@ msgstr "Het was niet mogelijk de avatar-URL \"%s\" te lezen."
 #: actions/passwordsettings.php:169 actions/recoverpassword.php:347
 #: actions/passwordsettings.php:174 actions/recoverpassword.php:365
 #: actions/passwordsettings.php:180 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:185
 msgid "Can't save new password."
 msgstr "Het was niet mogelijk het nieuwe wachtwoord op te slaan."
 
@@ -611,6 +615,7 @@ msgstr "Uw profielgegevens wijzigen"
 #: actions/recoverpassword.php:236 actions/register.php:422
 #: actions/passwordsettings.php:111 actions/recoverpassword.php:239
 #: actions/register.php:426 actions/smssettings.php:134
+#: actions/register.php:432
 msgid "Confirm"
 msgstr "Bevestigen"
 
@@ -640,7 +645,7 @@ msgid "Confirmation code not found."
 msgstr "De bevestigingscode niet gevonden."
 
 #: ../actions/register.php:202 actions/register.php:473
-#: actions/register.php:521 actions/register.php:531
+#: actions/register.php:521 actions/register.php:531 actions/register.php:537
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -886,6 +891,7 @@ 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
+#: classes/Notice.php:1120
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr ""
@@ -909,7 +915,8 @@ msgstr "Beschrijf uzelf en uw interesses in 140 tekens"
 #: 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
+#: lib/accountsettingsaction.php:117 actions/register.php:437
+#: actions/register.php:441
 msgid "Email"
 msgstr "E-mail"
 
@@ -924,7 +931,7 @@ msgid "Email Settings"
 msgstr "E-mailinstellingen"
 
 #: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
-#: actions/register.php:200 actions/register.php:206
+#: actions/register.php:200 actions/register.php:206 actions/register.php:212
 msgid "Email address already exists."
 msgstr "Het e--mailadres bestaat al."
 
@@ -1013,7 +1020,7 @@ 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:169
-#: actions/passwordsettings.php:175
+#: actions/passwordsettings.php:175 actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "Fout bij opslaan gebruiker; ongeldig."
 
@@ -1025,6 +1032,7 @@ msgstr "Fout bij opslaan gebruiker; ongeldig."
 #: actions/login.php:120 actions/recoverpassword.php:372
 #: actions/register.php:235 actions/login.php:122
 #: actions/recoverpassword.php:375 actions/register.php:242
+#: actions/login.php:149 actions/register.php:248
 msgid "Error setting user."
 msgstr "Er is een fout opgetreden tijdens het instellen van de gebruiker."
 
@@ -1057,6 +1065,7 @@ msgstr "Veelgestelde vragen"
 
 #: ../actions/avatar.php:115 actions/profilesettings.php:352
 #: actions/avatarsettings.php:397 actions/avatarsettings.php:349
+#: actions/avatarsettings.php:363
 msgid "Failed updating avatar."
 msgstr "Het bijwerken van de avatar is mislukt."
 
@@ -1091,6 +1100,7 @@ msgid "Find people on this site"
 msgstr "Gebruikers op deze site vinden"
 
 #: ../actions/login.php:122 actions/login.php:247 actions/login.php:255
+#: actions/login.php:282
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -1108,6 +1118,7 @@ msgstr ""
 #: actions/showstream.php:220 lib/groupeditform.php:157
 #: actions/profilesettings.php:111 actions/register.php:441
 #: actions/showgroup.php:247 actions/showstream.php:267
+#: actions/register.php:447 lib/userprofile.php:149
 msgid "Full name"
 msgstr "Volledige naam"
 
@@ -1121,7 +1132,7 @@ msgstr "Volledige naam"
 #: 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
+#: actions/register.php:214 actions/register.php:220
 msgid "Full name is too long (max 255 chars)."
 msgstr "De volledige naam is te lang (maximaal 255 tekens)."
 
@@ -1142,7 +1153,7 @@ msgstr "Thuis"
 #: 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
+#: actions/register.php:446 actions/register.php:452
 msgid "Homepage"
 msgstr "Thuispagina"
 
@@ -1154,7 +1165,7 @@ msgstr "Thuispagina"
 #: 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
+#: actions/register.php:211 actions/register.php:217
 msgid "Homepage is not a valid URL."
 msgstr "De thuispagina is geen geldige URL."
 
@@ -1226,7 +1237,7 @@ msgstr "Het oude wachtwoord is onjuist"
 
 #: ../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
+#: actions/facebookhome.php:129 actions/login.php:116 actions/login.php:143
 msgid "Incorrect username or password."
 msgstr "De gebruikersnaam of wachtwoord is onjuist."
 
@@ -1306,6 +1317,7 @@ msgstr "Ongeldige afmetingen."
 #: 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
+#: actions/register.php:243 actions/register.php:264
 msgid "Invalid username or password."
 msgstr "Ongeldige gebruikersnaam of wachtwoord."
 
@@ -1382,7 +1394,7 @@ msgstr "Taal is te lang (max 50 tekens)."
 #: 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
+#: lib/profilelist.php:218 actions/register.php:470 lib/userprofile.php:164
 msgid "Location"
 msgstr "Locatie"
 
@@ -1396,7 +1408,7 @@ msgstr "Locatie"
 #: 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
+#: actions/register.php:221 actions/register.php:227
 msgid "Location is too long (max 255 chars)."
 msgstr "Locatie is te lang (maximaal 255 tekens)."
 
@@ -1410,6 +1422,7 @@ msgstr "Locatie is te lang (maximaal 255 tekens)."
 #: 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
+#: actions/login.php:204 actions/login.php:257
 #, php-format
 msgid "Login"
 msgstr "Aanmelden"
@@ -1438,12 +1451,13 @@ msgstr "Afmelden"
 
 #: ../actions/register.php:166 actions/register.php:180
 #: actions/register.php:393 actions/register.php:439 actions/register.php:443
+#: actions/register.php:449
 msgid "Longer name, preferably your \"real\" name"
 msgstr "Een langere naam, mogelijk uw echte naam"
 
 #: ../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
+#: lib/facebookaction.php:327 actions/login.php:236 actions/login.php:263
 msgid "Lost or forgotten password?"
 msgstr "Wachtwoord kwijt of vergeten?"
 
@@ -1488,7 +1502,7 @@ 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:487
+#: actions/register.php:477 actions/register.php:487 actions/register.php:493
 msgid "My text and files are available under "
 msgstr "Mijn teksten en bestanden zijn beschikbaar onder "
 
@@ -1546,7 +1560,8 @@ msgstr "Het nieuwe wachtwoord is opgeslagen. U bent nu aangemeld."
 #: 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
+#: actions/showgroup.php:236 actions/showstream.php:249 actions/login.php:246
+#: actions/register.php:423 lib/userprofile.php:131
 msgid "Nickname"
 msgstr "Gebruikersnaam"
 
@@ -1560,7 +1575,7 @@ msgstr "Gebruikersnaam"
 #: 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
+#: actions/register.php:202 actions/register.php:208
 msgid "Nickname already in use. Try another one."
 msgstr ""
 "De opgegeven gebruikersnaam is al in gebruik. Kies een andere gebruikersnaam."
@@ -1577,7 +1592,7 @@ msgstr ""
 #: 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
+#: actions/register.php:199 actions/register.php:205
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
 "De gebruikersnaam moet alleen bestaan uit kleine letters en cijfers, en mag "
@@ -1820,7 +1835,8 @@ msgstr "Geen geregistreerde gebruiker"
 #: 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
+#: lib/api.php:954 lib/api.php:982 lib/api.php:1092 lib/api.php:963
+#: lib/api.php:991 lib/api.php:1101
 msgid "Not a supported data format."
 msgstr "Geen ondersteund gegevensformaat."
 
@@ -1841,7 +1857,7 @@ 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
+#: actions/register.php:189 actions/register.php:195 actions/register.php:201
 msgid "Not a valid email address."
 msgstr "Geen geldig e-mailadres."
 
@@ -1853,7 +1869,7 @@ msgstr "Geen geldig e-mailadres."
 #: 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
+#: actions/register.php:204 actions/register.php:210
 msgid "Not a valid nickname."
 msgstr "Geen geldige gebruikersnaam."
 
@@ -1892,6 +1908,7 @@ msgstr "Onverwacht antwoord!"
 #: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
 #: actions/twitapistatuses.php:309 actions/twitapistatuses.php:327
 #: actions/twitapistatuses.php:284 actions/apistatusesupdate.php:186
+#: actions/apistatusesupdate.php:193
 msgid "Not found"
 msgstr "Niet gevonden"
 
@@ -2038,7 +2055,8 @@ msgstr "Gedeeltelijke upload."
 #: 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
+#: lib/accountsettingsaction.php:114 actions/login.php:249
+#: actions/register.php:428
 msgid "Password"
 msgstr "Wachtwoord"
 
@@ -2067,6 +2085,7 @@ msgstr "Wachtwoordherstel aangevraagd"
 #: actions/passwordsettings.php:173 actions/recoverpassword.php:200
 #: actions/passwordsettings.php:178 actions/recoverpassword.php:208
 #: actions/passwordsettings.php:184 actions/recoverpassword.php:211
+#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "Het wachtwoord is opgeslagen."
 
@@ -2075,6 +2094,7 @@ msgstr "Het wachtwoord is opgeslagen."
 #: actions/passwordsettings.php:145 actions/register.php:183
 #: actions/passwordsettings.php:150 actions/register.php:220
 #: actions/passwordsettings.php:156 actions/register.php:227
+#: actions/register.php:233
 msgid "Passwords don't match."
 msgstr "De wachtwoorden komen niet overeen."
 
@@ -2239,19 +2259,19 @@ msgstr "Herstelcode voor onbekende gebruiker."
 #: 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
+#: lib/logingroupnav.php:85 actions/register.php:114 actions/register.php:502
 msgid "Register"
 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
+#: actions/register.php:129 actions/register.php:135
 msgid "Registration not allowed."
 msgstr "Registratie is niet toegestaan."
 
 #: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67 actions/register.php:106
+#: actions/register.php:67 actions/register.php:106 actions/register.php:112
 msgid "Registration successful"
 msgstr "De registratie is voltooid"
 
@@ -2265,6 +2285,7 @@ msgstr "Afwijzen"
 #: 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
+#: actions/login.php:252 actions/register.php:477
 msgid "Remember me"
 msgstr "Aanmeldgegevens onthouden"
 
@@ -2363,6 +2384,7 @@ msgstr "Gelijk aan het wachtwoord hierboven"
 
 #: ../actions/register.php:156 actions/register.php:170
 #: actions/register.php:377 actions/register.php:423 actions/register.php:427
+#: actions/register.php:433
 msgid "Same as password above. Required."
 msgstr "Gelijk aan het wachtwoord hierboven. Verplicht"
 
@@ -2527,6 +2549,7 @@ msgstr "Het opgeslagen OpenID is niet gevonden."
 #: actions/remotesubscribe.php:113 actions/showstream.php:376
 #: lib/subscribeform.php:139 actions/showstream.php:345
 #: actions/remotesubscribe.php:137 actions/showstream.php:439
+#: lib/userprofile.php:321
 msgid "Subscribe"
 msgstr "Abonneren"
 
@@ -2573,6 +2596,7 @@ msgstr "Er is een systeemfout opgetreden tijdens het uploaden van het bestand."
 #: actions/profilesettings.php:123 actions/showstream.php:255
 #: lib/subscriptionlist.php:106 lib/subscriptionlist.php:108
 #: actions/profilesettings.php:138 actions/showstream.php:327
+#: lib/userprofile.php:209
 msgid "Tags"
 msgstr "Labels"
 
@@ -2794,6 +2818,7 @@ msgstr "Deze methode heeft een POST of DELETE nodig."
 #: actions/apifriendshipsdestroy.php:91 actions/apigroupcreate.php:104
 #: actions/apigroupjoin.php:91 actions/apigroupleave.php:91
 #: actions/apistatusesupdate.php:109
+#: actions/apiaccountupdateprofileimage.php:84
 msgid "This method requires a POST."
 msgstr "Deze methode heeft een POST nodig."
 
@@ -2828,7 +2853,7 @@ msgstr ""
 
 #: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
 #: actions/twitapifriendships.php:132 actions/twitapifriendships.php:139
-#: actions/apifriendshipsexists.php:103
+#: actions/apifriendshipsexists.php:103 actions/apifriendshipsexists.php:94
 msgid "Two user ids or screen_names must be supplied."
 msgstr "Er moeten twee gebruikersnamen opgegeven worden."
 
@@ -2836,7 +2861,7 @@ msgstr "Er moeten twee gebruikersnamen opgegeven worden."
 #: 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
+#: actions/register.php:448 actions/register.php:454
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "De URL van uw thuispagina, blog of profiel bij een andere website"
 
@@ -2858,6 +2883,7 @@ msgstr "De URL van uw profiel bij een andere, compatibele microblogdienst"
 #: actions/twittersettings.php:322 lib/designsettings.php:301
 #: actions/emailsettings.php:255 actions/grouplogo.php:319
 #: actions/imsettings.php:220 actions/smssettings.php:248
+#: actions/avatarsettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "Het formulier is onverwacht ingezonden."
 
@@ -2970,7 +2996,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
+#: actions/register.php:436 actions/register.php:438 actions/register.php:442
 msgid "Used only for updates, announcements, and password recovery"
 msgstr "Alleen gebruikt voor updates, aankondigingen en wachtwoordherstel"
 
@@ -2998,7 +3024,8 @@ msgstr "Gebruiker waarnaar geluisterd wordt bestaat niet."
 #: 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
+#: actions/apiusershow.php:108 actions/apiaccountupdateprofileimage.php:124
+#: actions/apiaccountupdateprofileimage.php:130
 msgid "User has no profile."
 msgstr "Deze gebruiker heeft geen profiel."
 
@@ -3027,7 +3054,7 @@ msgstr "Hallo, %s."
 #: 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
+#: actions/register.php:466 actions/register.php:472
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Waar u bent, bijvoorbeeld \"woonplaats, land\" of \"postcode, land\""
 
@@ -3130,7 +3157,7 @@ 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/register.php:149
-#: actions/register.php:186 actions/register.php:192
+#: actions/register.php:186 actions/register.php:192 actions/register.php:198
 msgid "You can't register if you don't agree to the license."
 msgstr "U kunt zich niet registreren als u niet met de licentie akkoord gaat."
 
@@ -3207,56 +3234,56 @@ msgstr ""
 "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:756
-#: lib/util.php:770 lib/util.php:816
+#: lib/util.php:770 lib/util.php:816 lib/util.php:844
 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:768
-#: lib/util.php:782 lib/util.php:828
+#: lib/util.php:782 lib/util.php:828 lib/util.php:856
 #, 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:764
-#: lib/util.php:778 lib/util.php:824
+#: lib/util.php:778 lib/util.php:824 lib/util.php:852
 #, 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:760
-#: lib/util.php:774 lib/util.php:820
+#: lib/util.php:774 lib/util.php:820 lib/util.php:848
 #, 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:772
-#: lib/util.php:786 lib/util.php:832
+#: lib/util.php:786 lib/util.php:832 lib/util.php:860
 #, 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:766
-#: lib/util.php:780 lib/util.php:826
+#: lib/util.php:780 lib/util.php:826 lib/util.php:854
 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:758
-#: lib/util.php:772 lib/util.php:818
+#: lib/util.php:772 lib/util.php:818 lib/util.php:846
 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:770
-#: lib/util.php:784 lib/util.php:830
+#: lib/util.php:784 lib/util.php:830 lib/util.php:858
 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:774
-#: lib/util.php:788 lib/util.php:834
+#: lib/util.php:788 lib/util.php:834 lib/util.php:862
 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:762
-#: lib/util.php:776 lib/util.php:822
+#: lib/util.php:776 lib/util.php:822 lib/util.php:850
 msgid "about an hour ago"
 msgstr "ongeveer een uur geleden"
 
@@ -3325,7 +3352,9 @@ msgstr "« Later"
 #: 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
+#: actions/userauthorization.php:52 actions/login.php:131
+#: actions/register.php:165 actions/avatarsettings.php:265
+#: lib/designsettings.php:294
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 "Er is een probleem ontstaan met uw sessie. Probeer het nog een keer, "
@@ -3481,34 +3510,36 @@ 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! "
 msgstr ""
+"Door uw enige OpenID te verwijderen zou u niet langer kunnen aanmelden! "
 
 #: actions/openidsettings.php:87 actions/openidsettings.php:143
 msgid "You can remove an OpenID from your account "
-msgstr ""
+msgstr "U kunt een OpenID van uw gebruiker verwijderen "
 
 #: actions/outbox.php:28 actions/outbox.php:58
 #, php-format
 msgid "Outbox for %s - page %d"
-msgstr ""
+msgstr "Postvak UIT voor %s - pagina %d"
 
 #: actions/outbox.php:30 actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
-msgstr ""
+msgstr "Postvak UIT voor %s"
 
 #: actions/outbox.php:53 actions/outbox.php:116
 msgid "This is your outbox, which lists private messages you have sent."
-msgstr ""
+msgstr "Dit is uw Postvak UIT waarin de door u verzonden privéberichten staan."
 
 #: actions/peoplesearch.php:28 actions/peoplesearch.php:52
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
 msgstr ""
+"Zoeken naar gebruikers van %%site.name%% op naam, locatie of interesse. "
 
 #: actions/profilesettings.php:27 actions/profilesettings.php:69
 msgid "You can update your personal profile info here "
-msgstr ""
+msgstr "Hier kunt u uw persoonlijke profiel bijwerken "
 
 #: actions/profilesettings.php:115 actions/remotesubscribe.php:320
 #: actions/userauthorization.php:159 actions/userrss.php:76
@@ -3521,88 +3552,89 @@ msgstr ""
 #: actions/userrss.php:103 actions/grouplogo.php:178
 #: actions/remotesubscribe.php:191 actions/userauthorization.php:72
 msgid "User without matching profile"
-msgstr ""
+msgstr "Gebruiker zonder bijbehorend profiel"
 
 #: actions/recoverpassword.php:91 actions/recoverpassword.php:97
 msgid "This confirmation code is too old. "
-msgstr ""
+msgstr "Deze bevestigingscode is te oud. "
 
 #: actions/recoverpassword.php:141 actions/recoverpassword.php:152
 msgid "If you've forgotten or lost your"
-msgstr ""
+msgstr "Als u uw wachtwoord vergeten of verloren hebt"
 
 #: actions/recoverpassword.php:154 actions/recoverpassword.php:158
 msgid "You've been identified. Enter a "
-msgstr ""
+msgstr "U bent geïdentificeerd. Voer een "
 
 #: actions/recoverpassword.php:169 actions/recoverpassword.php:188
 msgid "Your nickname on this server, "
-msgstr ""
+msgstr "Uw naam op deze server, "
 
 #: actions/recoverpassword.php:271 actions/recoverpassword.php:304
 msgid "Instructions for recovering your password "
-msgstr ""
+msgstr "Instructies voor het opnieuw instellen van uw wachtwoord "
 
 #: actions/recoverpassword.php:327 actions/recoverpassword.php:361
 msgid "New password successfully saved. "
-msgstr ""
+msgstr "Het nieuwe wachtwoord is ingesteld. "
 
 #: actions/register.php:95 actions/register.php:180
 #: actions/passwordsettings.php:147 actions/register.php:217
 #: actions/passwordsettings.php:153 actions/register.php:224
+#: actions/register.php:230
 msgid "Password must be 6 or more characters."
-msgstr ""
+msgstr "Het wachtwoord moet zes of meer tekens bevatten."
 
 #: actions/register.php:216
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
 "want to..."
-msgstr ""
+msgstr "Gefeliciteerd, %s. Welkom bij %%%%site.name%%%%. Nu wilt u wellicht..."
 
 #: actions/register.php:227
 msgid "(You should receive a message by email momentarily, with "
-msgstr ""
+msgstr "U ontvangt nu snel een e-mail met "
 
 #: actions/remotesubscribe.php:51 actions/remotesubscribe.php:74
 #, php-format
 msgid "To subscribe, you can [login](%%action.login%%),"
-msgstr ""
+msgstr "Om te abonneren kunt u [aanmelden](%%action.login%%),"
 
 #: actions/showfavorites.php:61 actions/showfavorites.php:145
 #: actions/showfavorites.php:147
 #, php-format
 msgid "Feed for favorites of %s"
-msgstr ""
+msgstr "Favorietenfeed van %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 ""
+msgstr "Het was niet mogelijk de favoriete mededelingen op te halen."
 
 #: actions/showmessage.php:33 actions/showmessage.php:81
 msgid "No such message."
-msgstr ""
+msgstr "Dat bericht bestaat niet."
 
 #: actions/showmessage.php:42 actions/showmessage.php:98
 msgid "Only the sender and recipient may read this message."
-msgstr ""
+msgstr "Alleen de verzender en de ontvanger kunnen dit bericht lezen."
 
 #: actions/showmessage.php:61 actions/showmessage.php:108
 #, php-format
 msgid "Message to %1$s on %2$s"
-msgstr ""
+msgstr "Bericht aan %1$s op %2$s"
 
 #: actions/showmessage.php:66 actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
-msgstr ""
+msgstr "Bericht van %1$s op %2$s"
 
 #: actions/showstream.php:154
 msgid "Send a message"
-msgstr ""
+msgstr "Bericht verzenden"
 
 #: actions/smssettings.php:312 actions/smssettings.php:464
 #, php-format
@@ -3614,19 +3646,19 @@ msgstr ""
 #: actions/apidirectmessage.php:101
 #, php-format
 msgid "Direct messages to %s"
-msgstr ""
+msgstr "Directe beichten aan %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 ""
+msgstr "Alle directe berichten verzonden aan %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 ""
+msgstr "Door u verzonden directe berichten"
 
 #: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
 #: actions/twitapidirect_messages.php:73 actions/twitapidirect_messages.php:60
@@ -3640,7 +3672,7 @@ msgstr ""
 #: actions/twitapidirect_messages.php:146
 #: actions/twitapidirect_messages.php:140 actions/apidirectmessagenew.php:126
 msgid "No message text!"
-msgstr ""
+msgstr "Het bericht bevat geen inhoud!"
 
 #: actions/twitapidirect_messages.php:138
 #: actions/twitapidirect_messages.php:150
@@ -3661,7 +3693,7 @@ msgstr ""
 #: actions/apitimelinefavorites.php:107
 #, php-format
 msgid "%s / Favorites from %s"
-msgstr ""
+msgstr "%s / Favorieten van %s"
 
 #: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
 #: actions/twitapifavorites.php:68 actions/twitapifavorites.php:55
@@ -3676,7 +3708,7 @@ msgstr ""
 #: actions/twitapifavorites.php:221
 #, php-format
 msgid "%s added your notice as a favorite"
-msgstr ""
+msgstr "%s heeft uw mededeling als favoriet toegevoegd"
 
 #: actions/twitapifavorites.php:188 lib/mail.php:276
 #: actions/twitapifavorites.php:165
@@ -3694,35 +3726,35 @@ msgstr ""
 #: actions/twittersettings.php:41 actions/twittersettings.php:60
 #: actions/twittersettings.php:61
 msgid "Twitter settings"
-msgstr ""
+msgstr "Twitter-instellingen"
 
 #: actions/twittersettings.php:48 actions/twittersettings.php:105
 #: actions/twittersettings.php:106
 msgid "Twitter Account"
-msgstr ""
+msgstr "Twitter-gebruiker"
 
 #: actions/twittersettings.php:56 actions/twittersettings.php:113
 #: actions/twittersettings.php:114
 msgid "Current verified Twitter account."
-msgstr ""
+msgstr "Huidige bevestigde Twitter-gebruiker."
 
 #: actions/twittersettings.php:63
 msgid "Twitter Username"
-msgstr ""
+msgstr "Twitter-gebruiker"
 
 #: actions/twittersettings.php:65 actions/twittersettings.php:123
 #: actions/twittersettings.php:126
 msgid "No spaces, please."
-msgstr ""
+msgstr "Gebruik geen spaties, alstublieft."
 
 #: actions/twittersettings.php:67
 msgid "Twitter Password"
-msgstr ""
+msgstr "Twitter-wachtwoord"
 
 #: actions/twittersettings.php:72 actions/twittersettings.php:139
 #: actions/twittersettings.php:142
 msgid "Automatically send my notices to Twitter."
-msgstr ""
+msgstr "Stuur mijn mededelingen automatisch naar Twitter."
 
 #: actions/twittersettings.php:75 actions/twittersettings.php:146
 #: actions/twittersettings.php:149
@@ -3761,18 +3793,18 @@ msgstr ""
 #: actions/twittersettings.php:174 actions/twittersettings.php:376
 #: actions/twittersettings.php:380 actions/twittersettings.php:399
 msgid "Twitter settings saved."
-msgstr ""
+msgstr "De Twitter-instellingen zijn opgeslagen."
 
 #: actions/twittersettings.php:192 actions/twittersettings.php:395
 #: actions/twittersettings.php:399 actions/twittersettings.php:418
 msgid "That is not your Twitter account."
-msgstr ""
+msgstr "Dat is niet uw Twitter-gebruiker."
 
 #: 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 ""
+msgstr "Het was niet mogelijk de Twitter-gebruiker te verwijderen."
 
 #: actions/twittersettings.php:212 actions/twittersettings.php:407
 #: actions/twittersettings.php:411 actions/twittersettings.php:430
@@ -3786,12 +3818,12 @@ msgstr ""
 #: actions/twittersettings.php:452 actions/twittersettings.php:463
 #: actions/twittersettings.php:477
 msgid "Couldn't save Twitter preferences."
-msgstr ""
+msgstr "Het was niet mogelijk de Twitter-instellingen op te slaan."
 
 #: actions/twittersettings.php:245 actions/twittersettings.php:461
 #: actions/twittersettings.php:465 actions/twittersettings.php:485
 msgid "Twitter preferences saved."
-msgstr ""
+msgstr "De Twitter-voorkeuren zijn opgeslagen."
 
 #: actions/userauthorization.php:84 actions/userauthorization.php:86
 msgid "Please check these details to make sure "
@@ -3808,7 +3840,7 @@ 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 "Commandoresultaten"
 
 #: classes/Channel.php:148 classes/Channel.php:204 lib/channel.php:210
 msgid "Command complete"
@@ -3832,7 +3864,7 @@ msgstr ""
 #: 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 ""
+msgstr "Deze gebruiker heeft geen laatste mededeling"
 
 #: classes/Command.php:146 classes/Command.php:166 lib/command.php:166
 #: lib/command.php:159 lib/command.php:190
@@ -3849,19 +3881,19 @@ msgstr ""
 #: lib/command.php:185 lib/command.php:318
 #, php-format
 msgid "Fullname: %s"
-msgstr ""
+msgstr "Volledige naam: %s"
 
 #: 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 ""
+msgstr "Locatie: %s"
 
 #: 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 ""
+msgstr "Thuispagina: %s"
 
 #: classes/Command.php:178 classes/Command.php:201 lib/command.php:201
 #: lib/command.php:194 lib/command.php:327
@@ -3874,6 +3906,8 @@ msgstr "Over: %s"
 #, php-format
 msgid "Message too long - maximum is 140 characters, you sent %d"
 msgstr ""
+"Het bericht is te lang. De maximale lengte is 140 tekens. U hebt %d tekens "
+"gebruikt"
 
 #: classes/Command.php:214 classes/Command.php:245 lib/command.php:245
 #: actions/newmessage.php:182 lib/command.php:238 actions/newmessage.php:185
@@ -4088,13 +4122,13 @@ msgid "There was a problem with your session token. "
 msgstr "Er was een probleem met uw sessietoken. "
 
 #: actions/avatarsettings.php:303 actions/grouplogo.php:360
-#: actions/avatarsettings.php:308
+#: actions/avatarsettings.php:308 actions/avatarsettings.php:322
 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
+#: actions/grouplogo.php:377 actions/avatarsettings.php:337
 msgid "Lost our file data."
 msgstr "Ons databestand is verloren gegaan."
 
@@ -4556,7 +4590,7 @@ msgid "%s left group %s"
 msgstr "%s heeft de groep %s verlaten"
 
 #: actions/login.php:225 lib/facebookaction.php:304 actions/login.php:208
-#: actions/login.php:216
+#: actions/login.php:216 actions/login.php:243
 msgid "Login to site"
 msgstr "Aanmelden"
 
@@ -4733,7 +4767,8 @@ msgstr "Woordwolk"
 
 #: 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
+#: actions/register.php:398 actions/register.php:85 actions/register.php:189
+#: actions/register.php:404
 msgid "Sorry, only invited people can register."
 msgstr "U kunt zich alleen registreren als u wordt uitgenodigd."
 
@@ -4815,7 +4850,7 @@ msgstr "Groepsprofiel"
 #: 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
+#: lib/profilelist.php:230 lib/userprofile.php:177
 msgid "URL"
 msgstr "URL"
 
@@ -4826,7 +4861,7 @@ msgstr "URL"
 #: 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
+#: lib/profilelist.php:245 lib/userprofile.php:194
 msgid "Note"
 msgstr "Opmerking"
 
@@ -4875,6 +4910,7 @@ msgid "Only the sender and recipient "
 msgstr "Alleen de afzender en ontvanger "
 
 #: actions/showstream.php:73 actions/showstream.php:78
+#: actions/showstream.php:79
 #, php-format
 msgid "%s, page %d"
 msgstr "%s, pagina %d"
@@ -4885,28 +4921,29 @@ msgstr "'s profiel"
 
 #: actions/showstream.php:236 actions/tagother.php:77
 #: actions/showstream.php:220 actions/showstream.php:185
-#: actions/showstream.php:193
+#: actions/showstream.php:193 lib/userprofile.php:75
 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
+#: actions/showstream.php:220 lib/userprofile.php:102
 msgid "Photo"
 msgstr "Foto"
 
 #: actions/showstream.php:317 actions/showstream.php:309
 #: actions/showstream.php:274 actions/showstream.php:354
+#: lib/userprofile.php:236
 msgid "User actions"
 msgstr "Gebruikershandelingen"
 
 #: actions/showstream.php:342 actions/showstream.php:307
-#: actions/showstream.php:390
+#: actions/showstream.php:390 lib/userprofile.php:272
 msgid "Send a direct message to this user"
 msgstr "Deze gebruiker een direct bericht zenden"
 
 #: actions/showstream.php:343 actions/showstream.php:308
-#: actions/showstream.php:391
+#: actions/showstream.php:391 lib/userprofile.php:273
 msgid "Message"
 msgstr "Bericht"
 
@@ -5611,7 +5648,7 @@ 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
+#: actions/avatarsettings.php:373 actions/avatarsettings.php:387
 msgid "Avatar deleted."
 msgstr "De avatar is verwijderd."
 
@@ -5744,10 +5781,12 @@ msgid ""
 msgstr ""
 
 #: actions/register.php:432 actions/register.php:479 actions/register.php:489
+#: actions/register.php:495
 msgid "Creative Commons Attribution 3.0"
 msgstr ""
 
 #: actions/register.php:433 actions/register.php:480 actions/register.php:490
+#: actions/register.php:496
 msgid ""
 " except this private data: password, email address, IM address, and phone "
 "number."
@@ -5781,42 +5820,46 @@ msgid "%s's profile"
 msgstr "Profiel van %s"
 
 #: actions/showstream.php:163 actions/showstream.php:128
+#: actions/showstream.php:129
 #, 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
+#: actions/showstream.php:136
 #, 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
+#: actions/showstream.php:143
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "Mededelingenfeed voor %s (Atom)"
 
 #: actions/showstream.php:182 actions/showstream.php:147
+#: actions/showstream.php:148
 #, 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
+#: actions/showstream.php:234 lib/userprofile.php:116
 msgid "Edit Avatar"
 msgstr "Avatar bewerken"
 
 #: actions/showstream.php:316 actions/showstream.php:281
-#: actions/showstream.php:366
+#: actions/showstream.php:366 lib/userprofile.php:248
 msgid "Edit profile settings"
 msgstr "Profielinstellingen bewerken"
 
 #: actions/showstream.php:317 actions/showstream.php:282
-#: actions/showstream.php:367
+#: actions/showstream.php:367 lib/userprofile.php:249
 msgid "Edit"
-msgstr ""
+msgstr "Bewerken"
 
 #: actions/showstream.php:542 actions/showstream.php:388
-#: actions/showstream.php:487
+#: actions/showstream.php:487 actions/showstream.php:234
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5860,6 +5903,9 @@ msgstr ""
 #: actions/apistatusesupdate.php:125 actions/apisubscriptions.php:87
 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#: actions/apiaccountupdateprofileimage.php:91
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apistatusesupdate.php:139
 msgid "No such user!"
 msgstr "Deze gebruiker bestaat niet."
 
@@ -5903,7 +5949,7 @@ msgstr ""
 
 #: lib/action.php:671 lib/action.php:721 lib/action.php:736
 msgid "Badge"
-msgstr ""
+msgstr "Naamplaatje"
 
 #: lib/command.php:113 lib/command.php:106 lib/command.php:126
 #, php-format
@@ -5913,36 +5959,6 @@ msgid ""
 "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"
@@ -5958,15 +5974,15 @@ msgstr ""
 
 #: lib/feed.php:85
 msgid "RSS 1.0"
-msgstr ""
+msgstr "RSS 1.0"
 
 #: lib/feed.php:87
 msgid "RSS 2.0"
-msgstr ""
+msgstr "RSS 2.0"
 
 #: lib/feed.php:89
 msgid "Atom"
-msgstr ""
+msgstr "Atom"
 
 #: lib/feed.php:91
 msgid "FOAF"
@@ -5975,7 +5991,7 @@ msgstr "Vrienden van vrienden (FOAF)"
 #: lib/imagefile.php:75
 #, php-format
 msgid "That file is too big. The maximum file size is %d."
-msgstr ""
+msgstr "Dat bestand is te groot. De maximale bestandsgrootte is %d."
 
 #: lib/mail.php:175 lib/mail.php:174
 #, php-format
@@ -6092,7 +6108,7 @@ msgstr "Site doorzoeken"
 
 #: lib/section.php:106
 msgid "More..."
-msgstr ""
+msgstr "Meer..."
 
 #: actions/all.php:80 actions/all.php:127
 #, php-format
@@ -6116,6 +6132,7 @@ 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
+#: actions/showstream.php:202
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -6280,7 +6297,8 @@ 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
+#: lib/designsettings.php:461 lib/designsettings.php:434
+#: lib/designsettings.php:464
 msgid "Couldn't update your design."
 msgstr "Het was niet mogelijk uw ontwerp bij te werken."
 
@@ -6302,11 +6320,11 @@ msgstr ""
 
 #: actions/groupmembers.php:470 actions/groupmembers.php:473
 msgid "Make Admin"
-msgstr ""
+msgstr "Beheerder maken"
 
 #: actions/groupmembers.php:470 actions/groupmembers.php:473
 msgid "Make this user an admin"
-msgstr ""
+msgstr "Deze gebruiker beheerder maken"
 
 #: actions/groupsearch.php:79 actions/noticesearch.php:117
 #: actions/peoplesearch.php:83
@@ -6368,7 +6386,9 @@ msgid "Message sent"
 msgstr "Bericht verzonden."
 
 #: actions/newnotice.php:93 lib/designsettings.php:281
-#: actions/newnotice.php:94
+#: actions/newnotice.php:94 actions/apiaccountupdateprofileimage.php:97
+#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254
+#: lib/designsettings.php:283
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s bytes) due to its "
@@ -6533,7 +6553,7 @@ msgstr "U bent geïdentificeerd. Voer hieronder een nieuw wachtwoord in. "
 msgid "Password recover"
 msgstr "Wachtwoordherstel"
 
-#: actions/register.php:86
+#: actions/register.php:86 actions/register.php:92
 msgid "Sorry, invalid invitation code."
 msgstr "Sorry. De uitnodigingscode is ongeldig."
 
@@ -6595,7 +6615,7 @@ msgstr ""
 #: actions/showgroup.php:279 lib/groupeditform.php:178
 #: actions/showgroup.php:284 lib/groupeditform.php:184
 msgid "Aliases"
-msgstr ""
+msgstr "Aliasen"
 
 #: actions/showgroup.php:323 actions/showgroup.php:328
 #, php-format
@@ -6627,34 +6647,37 @@ msgstr ""
 
 #: actions/showgroup.php:474 actions/showgroup.php:482
 msgid "Admins"
-msgstr ""
+msgstr "Beheerders"
 
 #: actions/shownotice.php:101
 msgid "Not a local notice"
 msgstr "Geen lokale mededeling"
 
-#: actions/showstream.php:72
+#: actions/showstream.php:72 actions/showstream.php:73
 #, php-format
 msgid " tagged %s"
 msgstr " met het label %s"
 
-#: actions/showstream.php:121
+#: actions/showstream.php:121 actions/showstream.php:122
 #, 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
+#: actions/showstream.php:191
 #, 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
+#: actions/showstream.php:196
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
 msgstr ""
 
 #: actions/showstream.php:357 actions/showstream.php:451
+#: actions/showstream.php:198
 #, php-format
 msgid ""
 "You can try to nudge %s or [post something to his or her attention](%%%%"
@@ -6662,6 +6685,7 @@ msgid ""
 msgstr ""
 
 #: actions/showstream.php:393 actions/showstream.php:492
+#: actions/showstream.php:239
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -6808,6 +6832,7 @@ msgstr ""
 "lang."
 
 #: classes/User.php:319 classes/User.php:327 classes/User.php:334
+#: classes/User.php:333
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr ""
@@ -6815,7 +6840,7 @@ msgstr ""
 #: lib/accountsettingsaction.php:119 lib/groupnav.php:118
 #: lib/accountsettingsaction.php:120
 msgid "Design"
-msgstr ""
+msgstr "Ontwerp"
 
 #: lib/accountsettingsaction.php:120 lib/accountsettingsaction.php:121
 msgid "Design your profile"
@@ -6827,7 +6852,7 @@ msgstr ""
 
 #: lib/attachmentlist.php:87
 msgid "Attachments"
-msgstr ""
+msgstr "Bijlagen"
 
 #: lib/attachmentlist.php:265
 msgid "Author"
@@ -6911,10 +6936,12 @@ msgid "Save design"
 msgstr "Ontwerp opslaan"
 
 #: lib/designsettings.php:378 lib/designsettings.php:369
+#: lib/designsettings.php:372
 msgid "Bad default color settings: "
 msgstr ""
 
 #: lib/designsettings.php:474 lib/designsettings.php:465
+#: lib/designsettings.php:468
 msgid "Design defaults restored."
 msgstr ""
 
@@ -7008,11 +7035,11 @@ msgstr ""
 
 #: lib/noticeform.php:154 lib/noticeform.php:180
 msgid "Attach"
-msgstr ""
+msgstr "Toevoegen"
 
 #: lib/noticeform.php:158 lib/noticeform.php:184
 msgid "Attach a file"
-msgstr ""
+msgstr "Bestand toevoegen"
 
 #: lib/noticelist.php:436 lib/noticelist.php:478
 msgid "in context"
@@ -7020,7 +7047,7 @@ msgstr "in context"
 
 #: lib/profileaction.php:177
 msgid "User ID"
-msgstr ""
+msgstr "Gebruikers-ID"
 
 #: lib/searchaction.php:156 lib/searchaction.php:162
 msgid "Search help"
@@ -7048,9 +7075,8 @@ 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."
+msgstr "Deze pagina bestaat niet"
 
 #: actions/apidirectmessage.php:89
 #, php-format
@@ -7058,244 +7084,240 @@ msgid "Direct messages from %s"
 msgstr ""
 
 #: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
-#, fuzzy, php-format
+#, php-format
 msgid "That's too long. Max message size is %d chars."
-msgstr "Dit is te lang. De maximale lengte is 140 tekens."
+msgstr "Dat is te lang. De maximale berichtlengte is %d 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."
+msgstr ""
+"Het is niet mogelijk deze gebruiker niet langer te volgende: de gebruiker is "
+"niet aangetroffen."
 
 #: actions/apifriendshipsdestroy.php:120
 msgid "You cannot unfollow yourself!"
 msgstr ""
 
 #: actions/apigroupcreate.php:261
-#, fuzzy, php-format
+#, php-format
 msgid "Description is too long (max %d chars)."
-msgstr "de beschrijving is te lang (maximaal 140 tekens)."
+msgstr "De beschrijving is te lang. Gebruik maximaal %d tekens."
 
 #: actions/apigroupjoin.php:110
-#, fuzzy
 msgid "You are already a member of that group."
-msgstr "U bent al lid van deze groep"
+msgstr "U bent al lid van die groep."
 
 #: actions/apigroupjoin.php:138
-#, fuzzy, php-format
+#, 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"
+msgstr "Het was niet mogelijk 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"
+msgstr "U bent geen lid van deze groep."
 
 #: actions/apigroupleave.php:124
-#, fuzzy, php-format
+#, php-format
 msgid "Could not remove user %s to group %s."
-msgstr "De gebruiker %s kon niet uit de groet %s verwijderd worden"
+msgstr "Het was niet mogelijk gebruiker %s uit de group %s te verwijderen."
 
 #: actions/apigrouplist.php:95
-#, fuzzy, php-format
+#, php-format
 msgid "%s's groups"
-msgstr "%s groepen"
+msgstr "Groepen van %s"
 
 #: actions/apigrouplist.php:103
-#, fuzzy, php-format
+#, php-format
 msgid "Groups %s is a member of on %s."
-msgstr "%s is van geen enkele groep lid."
+msgstr "Groepen waarvan %s lid is op %s."
 
 #: actions/apigrouplistall.php:94
-#, fuzzy, php-format
+#, php-format
 msgid "groups on %s"
-msgstr "Groepshandelingen"
+msgstr "groepen op %s"
 
 #: actions/apistatusesshow.php:138
-#, fuzzy
 msgid "Status deleted."
-msgstr "De avatar is verwijderd."
+msgstr "De status is verwijderd."
 
 #: actions/apistatusesupdate.php:132
+#: actions/apiaccountupdateprofileimage.php:99
 msgid "Unable to handle that much POST data!"
 msgstr ""
 
 #: actions/apistatusesupdate.php:145 actions/newnotice.php:155
-#: scripts/maildaemon.php:71
-#, fuzzy, php-format
+#: scripts/maildaemon.php:71 actions/apistatusesupdate.php:152
+#, 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."
+msgstr "Dat is te lang. De maximale mededelingslengte is 140 tekens."
 
 #: actions/apistatusesupdate.php:209 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:216
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
+"De maximale mededelingenlengte is %d tekens, inclusief de URL voor de "
+"bijlage."
 
 #: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
-#, fuzzy
 msgid "Unsupported format."
-msgstr "Niet ondersteund beeldbestandsformaat."
+msgstr "Niet-ondersteund bestandsformaat."
 
 #: actions/bookmarklet.php:50
-#, fuzzy
 msgid "Post to "
-msgstr "Foto"
+msgstr "Verzenden naar "
 
 #: actions/editgroup.php:201 actions/newgroup.php:145
-#, fuzzy, php-format
+#, php-format
 msgid "description is too long (max %d chars)."
-msgstr "de beschrijving is te lang (maximaal 140 tekens)."
+msgstr "de beschrijving is te lang (maximaal %d tekens)"
 
 #: actions/favoritesrss.php:115
-#, fuzzy, php-format
+#, php-format
 msgid "Updates favored by %1$s on %2$s!"
-msgstr "Updates van %1$s op %2$s."
+msgstr "Updates op de favorietenlijst 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."
+msgstr "De gebruiker waarnaar wordt geluisterd bestaat niet."
 
 #: actions/finishremotesubscribe.php:106
-#, fuzzy
 msgid "You are not authorized."
-msgstr "Niet geautoriseerd."
+msgstr "U hebt niet de juiste toegangsrechten."
 
 #: 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."
+"Het was niet mogelijk het verzoektoken te converteren naar een toegangstoken."
 
 #: actions/finishremotesubscribe.php:114
-#, fuzzy
 msgid "Remote service uses unknown version of OMB protocol."
-msgstr "Onbekende versie van het OMB-protocol."
+msgstr ""
+"De diensten op afstand gebruiken een onbekende versie van het OMB-protocol."
 
 #: actions/getfile.php:75
-#, fuzzy
 msgid "No such file."
-msgstr "De mededeling bestaat niet."
+msgstr "Het bestand bestaat niet."
 
 #: actions/getfile.php:79
-#, fuzzy
 msgid "Cannot read file."
-msgstr "Het bestand is zoekgeraakt."
+msgstr "Het bestand kon niet gelezen worden."
 
 #: actions/grouprss.php:133
-#, fuzzy, php-format
+#, php-format
 msgid "Updates from members of %1$s on %2$s!"
-msgstr "Updates van %1$s op %2$s."
+msgstr "Updates voor leden van %1$s op %2$s."
 
 #: actions/imsettings.php:89
-#, fuzzy
 msgid "IM is not available."
-msgstr "Deze pagina is niet beschikbaar in een "
+msgstr "IM is niet beschikbaar."
 
-#: actions/login.php:259
-#, fuzzy, php-format
+#: actions/login.php:259 actions/login.php:286
+#, 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%%)."
+"gebruikersnaam? [Registreer een nieuwe gebruiker](%%action.register%%)."
 
 #: actions/noticesearchrss.php:89
-#, fuzzy, php-format
+#, php-format
 msgid "Updates with \"%s\""
-msgstr "Updates met het label %1$s op %2$s!"
+msgstr "Updates met \"%s\""
 
 #: actions/noticesearchrss.php:91
-#, fuzzy, php-format
+#, php-format
 msgid "Updates matching search term \"%1$s\" on %2$s!"
-msgstr "Alle updates die overeenkomen met de zoekterm \"%s\""
+msgstr "Updates die overeenkomen met de zoekterm \"%1$s\" op %2$s."
 
 #: actions/oembed.php:157
-#, fuzzy
 msgid "content type "
-msgstr "Inhoud"
+msgstr "inhoudstype "
 
 #: actions/oembed.php:160
 msgid "Only "
-msgstr ""
+msgstr "Alleen "
 
 #: actions/postnotice.php:90
 #, php-format
 msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
 msgstr ""
+"De mededelingenlicentie \"%s\" is niet compatibel met de licentie \"%s\" van "
+"deze site."
 
 #: actions/profilesettings.php:122 actions/register.php:454
-#, fuzzy, php-format
+#: actions/register.php:460
+#, php-format
 msgid "Describe yourself and your interests in %d chars"
-msgstr "Beschrijf uzelf en uw interesses in 140 tekens"
+msgstr "Geef een beschrijving van uzelf en uw interesses in %d tekens"
 
 #: actions/profilesettings.php:125 actions/register.php:457
-#, fuzzy
+#: actions/register.php:463
 msgid "Describe yourself and your interests"
-msgstr "Beschrijf uzelf en uw "
+msgstr "Beschrijf uzelf en uw interesses"
 
 #: actions/profilesettings.php:221 actions/register.php:217
-#, fuzzy, php-format
+#: actions/register.php:223
+#, php-format
 msgid "Bio is too long (max %d chars)."
-msgstr "De beschrijving is te lang (maximaal 140 tekens)."
+msgstr "De beschrijving is te lang (maximaal %d tekens)."
 
-#: actions/register.php:336
+#: actions/register.php:336 actions/register.php:342
 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)."
+msgstr ""
+"De URL voor het profiel is niet geldig (het is geen YADIS-document of er is "
+"geen of ongeldige XRDS gedefinieerd)."
 
 #: 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
+#, php-format
 msgid "Replies feed for %s (RSS 1.0)"
-msgstr "Mededelingenfeed voor %s (RSS 1.0)"
+msgstr "Antwoordenfeed voor %s (RSS 1.0)"
 
 #: actions/replies.php:151
-#, fuzzy, php-format
+#, php-format
 msgid "Replies feed for %s (RSS 2.0)"
-msgstr "Mededelingenfeed voor %s (RSS 2.0)"
+msgstr "Antwoordenfeed voor %s (RSS 2.0)"
 
 #: actions/replies.php:158
-#, fuzzy, php-format
+#, php-format
 msgid "Replies feed for %s (Atom)"
-msgstr "Mededelingenfeed voor %s (Atom)"
+msgstr "Antwoordenfeed voor %s (Atom)"
 
 #: actions/repliesrss.php:72
-#, fuzzy, php-format
+#, php-format
 msgid "Replies to %1$s on %2$s!"
-msgstr "Updates van %1$s op %2$s."
+msgstr "Antwoorden aan %1$s op %2$s."
 
 #: actions/showfavorites.php:170
-#, fuzzy, php-format
+#, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
-msgstr "Feed voor vrienden van %s (RSS 1.0)"
+msgstr "Favorietenfeed van %s (RSS 1.0)"
 
 #: actions/showfavorites.php:177
-#, fuzzy, php-format
+#, php-format
 msgid "Feed for favorites of %s (RSS 2.0)"
-msgstr "Feed voor vrienden van %s (RSS 2.0)"
+msgstr "Favorietenfeed van %s (RSS 2.0)"
 
 #: actions/showfavorites.php:184
-#, fuzzy, php-format
+#, php-format
 msgid "Feed for favorites of %s (Atom)"
-msgstr "Feed voor vrienden van %s (Atom)"
+msgstr "Favorietenfeed van %s (Atom)"
 
 #: actions/showfavorites.php:211
 #, php-format
@@ -7306,24 +7328,22 @@ msgid ""
 msgstr ""
 
 #: actions/showgroup.php:345
-#, fuzzy, php-format
+#, php-format
 msgid "FOAF for %s group"
-msgstr "Vriend van een vriend (FOAF) voor %s"
+msgstr "Vriend van een vriend voor de groep %s"
 
 #: actions/shownotice.php:90
-#, fuzzy
 msgid "Notice deleted."
-msgstr "De mededeling is verzonden"
+msgstr "Deze mededeling is verwijderd."
 
 #: actions/smssettings.php:91
-#, fuzzy
 msgid "SMS is not available."
-msgstr "Deze pagina is niet beschikbaar in een "
+msgstr "SMS is niet beschikbaar."
 
 #: actions/tag.php:92
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
-msgstr "Mededelingenfeed voor label %s (RSS 1.0)"
+msgstr "Mededelingenfeed voor label %s (RSS 2.0)"
 
 #: actions/updateprofile.php:62 actions/userauthorization.php:330
 #, php-format
@@ -7331,38 +7351,35 @@ msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%
 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\""
+"Controleer alstublieft deze details om er zeker van te zijn dat u zich wilt "
+"abonneren op de mededelingen van deze gebruiker. Als u zojuist niet hebt "
+"aangegeven dat u zich op de mededelingen van een gebruiker wilt abonneren, "
+"klik dan op \"Afwijzen\"."
 
 #: 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."
+"Het abonnement is afgewezen, maar er is geen callback-URL doorgegeven. "
+"Controleer de instructies van de site voor informatie over het volledig "
+"afwijzen van een abonnement. Uw abonnementstoken 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 ""
-"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."
+"Het abonnement is afgewezen, maar er is geen callback-URL doorgegeven. "
+"Controleer de instructies van de site voor informatie over het volledig "
+"afwijzen van een abonnement."
 
 #: actions/userauthorization.php:296
 #, php-format
@@ -7390,40 +7407,36 @@ msgid "Avatar URL ‘%s’ is not valid."
 msgstr ""
 
 #: actions/userauthorization.php:343
-#, fuzzy, php-format
+#, 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
+#, php-format
 msgid "Wrong image type for avatar URL ‘%s’."
-msgstr "Het beelbestandstype voor \"'%s\" is onjuist"
+msgstr "Er staat een verkeerd afbeeldingsttype op de avatar-URL \"%s\"."
 
 #: lib/action.php:435
-#, fuzzy
 msgid "Connect to services"
-msgstr "Het was niet mogelijk om door te verwijzen naar de server: %s"
+msgstr "Met diensten verbinden"
 
 #: lib/action.php:785
-#, fuzzy
 msgid "Site content license"
-msgstr "Licentie van de StatusNet-software"
+msgstr "Licentie voor siteinhoud"
 
 #: lib/command.php:88
-#, fuzzy, php-format
+#, 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."
+msgstr "De gebruiker %s is niet aangetroffen"
 
 #: lib/command.php:92
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
 #: lib/command.php:99
-#, fuzzy, php-format
+#, php-format
 msgid "Nudge sent to %s"
-msgstr "De por is verzonden"
+msgstr "De por naar %s is verzonden"
 
 #: lib/command.php:152 lib/command.php:400
 msgid "Notice with that id does not exist"
@@ -7433,6 +7446,8 @@ msgstr ""
 #, php-format
 msgid "Message too long - maximum is %d characters, you sent %d"
 msgstr ""
+"Het bericht te is lang. De maximale lengte is %d tekens. De lengte van uw "
+"bericht was %d"
 
 #: lib/command.php:431
 #, php-format
@@ -7440,54 +7455,17 @@ msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr ""
 
 #: lib/command.php:439
-#, fuzzy, php-format
+#, php-format
 msgid "Reply to %s sent"
-msgstr "Op deze mededeling antwoorden"
+msgstr "Het antwoord aan %s is verzonden"
 
 #: 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 ""
+msgstr "Er is een fout opgetreden bij het opslaan van de mededeling."
 
 #: lib/common.php:191
-#, fuzzy
 msgid "No configuration file found. "
-msgstr "Geen bevestigingscode."
+msgstr "Er is geen instellingenbestand aangetroffen. "
 
 #: lib/common.php:192
 msgid "I looked for configuration files in the following places: "
@@ -7498,34 +7476,31 @@ 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"
+msgstr "Naar het installatieprogramma gaan."
 
 #: lib/galleryaction.php:139
-#, fuzzy
 msgid "Select tag to filter"
-msgstr "Selecteer een provider"
+msgstr "Selecteer een label om op te filteren"
 
 #: lib/groupeditform.php:168
-#, fuzzy
 msgid "Describe the group or topic"
-msgstr "Beschrijf de groep of het onderwerp in maximaal 140 karakters"
+msgstr "Beschrijf de groep of het onderwerp"
 
 #: lib/groupeditform.php:170
-#, fuzzy, php-format
+#, php-format
 msgid "Describe the group or topic in %d characters"
-msgstr "Beschrijf de groep of het onderwerp in maximaal 140 karakters"
+msgstr "Beschrijf de groep of het onderwerp in %d tekens"
 
 #: lib/jabber.php:192
-#, fuzzy, php-format
+#, php-format
 msgid "notice id: %s"
-msgstr "Geen mededelings-ID"
+msgstr "mededelingennummer: %s"
 
 #: lib/mail.php:554
-#, fuzzy, php-format
+#, php-format
 msgid "%s (@%s) added your notice as a favorite"
-msgstr "%1$s heeft zojuist uw kennisgeving van %2$s toevoegd"
+msgstr "%s (@%s) heeft uw mededeling als favoriet toegevoegd"
 
 #: lib/mail.php:556
 #, php-format
@@ -7551,7 +7526,7 @@ msgstr ""
 #: lib/mail.php:611
 #, php-format
 msgid "%s (@%s) sent a notice to your attention"
-msgstr ""
+msgstr "%s (@%s) heeft u een mededeling gestuurd"
 
 #: lib/mail.php:613
 #, php-format
@@ -7569,20 +7544,72 @@ msgid ""
 msgstr ""
 
 #: lib/mailbox.php:227 lib/noticelist.php:424
-#, fuzzy
 msgid "from"
-msgstr " van "
+msgstr "van"
 
 #: lib/mediafile.php:179 lib/mediafile.php:216
 msgid "File exceeds user's quota!"
-msgstr ""
+msgstr "Met dit bestand wordt het quotum van de gebruiker overschreden!"
 
 #: 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."
+msgstr "Het was niet mogelijk het MIME-type van het bestand te bepalen!"
 
 #: lib/oauthstore.php:345
-#, fuzzy
 msgid "Duplicate notice"
-msgstr "Mededeling verwijderen"
+msgstr "Kennisgeving van duplicaat"
+
+#: actions/login.php:110 actions/login.php:120
+msgid "Invalid or expired token."
+msgstr "Het token is ongeldig of verlopen."
+
+#: lib/command.php:597
+#, php-format
+msgid "Could not create login token for %s"
+msgstr "Het was niet mogelijk een aanmeldtoken aan te maken voor %s"
+
+#: lib/command.php:602
+#, php-format
+msgid "This link is useable only once, and is good for only 2 minutes: %s"
+msgstr ""
+
+#: lib/imagefile.php:75
+#, php-format
+msgid "That file is too big. The maximum file size is %s."
+msgstr "Dat bestand is te groot. De maximale bestandsgrootte is %s."
+
+#: lib/command.php:613
+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"
+"login - Get a link to login to the web interface\n"
+"drop <group> - leave group\n"
+"stats - get your stats\n"
+"stop - same as 'off'\n"
+"quit - same as 'off'\n"
+"sub <nickname> - same as 'follow'\n"
+"unsub <nickname> - same as 'leave'\n"
+"last <nickname> - same as 'get'\n"
+"on <nickname> - not yet implemented.\n"
+"off <nickname> - not yet implemented.\n"
+"nudge <nickname> - remind a user to update.\n"
+"invite <phone number> - not yet implemented.\n"
+"track <word> - not yet implemented.\n"
+"untrack <word> - not yet implemented.\n"
+"track off - not yet implemented.\n"
+"untrack all - not yet implemented.\n"
+"tracks - not yet implemented.\n"
+"tracking - not yet implemented.\n"
+msgstr ""
diff --git a/locale/nn/LC_MESSAGES/statusnet.mo b/locale/nn/LC_MESSAGES/statusnet.mo
index a5727e1f6..29d03bd3b 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 0c9f7d7f4..c9e7c4063 100644
--- a/locale/nn/LC_MESSAGES/statusnet.po
+++ b/locale/nn/LC_MESSAGES/statusnet.po
@@ -5,12 +5,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-06 13:16+0000\n"
-"PO-Revision-Date: 2009-11-06 15:44:10+0000\n"
+"POT-Creation-Date: 2009-11-08 11:53+0000\n"
+"PO-Revision-Date: 2009-11-08 11:56:54+0000\n"
 "Language-Team: Norwegian Nynorsk\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r58648); Translate extension (2009-08-03)\n"
+"X-Generator: MediaWiki 1.16alpha(r58760); 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"
@@ -196,7 +196,7 @@ msgid "%s updates from everyone!"
 msgstr "%s oppdateringar frå alle saman!"
 
 #: ../actions/register.php:213 actions/register.php:497
-#: actions/register.php:545 actions/register.php:555
+#: actions/register.php:545 actions/register.php:555 actions/register.php:561
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -235,6 +235,7 @@ msgstr ""
 
 #: ../actions/register.php:152 actions/register.php:166
 #: actions/register.php:368 actions/register.php:414 actions/register.php:418
+#: actions/register.php:424
 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. "
@@ -253,6 +254,7 @@ 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:419 actions/register.php:423
+#: actions/register.php:429
 msgid "6 or more characters. Required."
 msgstr "6 eller fleire teikn. Kravd."
 
@@ -431,7 +433,7 @@ msgstr "Alle oppdateringer frå søket «%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
+#: actions/login.php:79 actions/register.php:137
 msgid "Already logged in."
 msgstr "Allereie logga inn."
 
@@ -454,7 +456,7 @@ msgstr "Autoriser tinging"
 #: ../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
+#: actions/register.php:473 actions/login.php:253 actions/register.php:479
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Logg inn automatisk i framtidi (ikkje for delte maskiner)."
 
@@ -477,6 +479,7 @@ msgstr "Brukarbilete"
 
 #: ../actions/avatar.php:113 actions/profilesettings.php:350
 #: actions/avatarsettings.php:395 actions/avatarsettings.php:346
+#: actions/avatarsettings.php:360
 msgid "Avatar updated."
 msgstr "Lasta opp brukarbilete."
 
@@ -512,7 +515,7 @@ msgstr "Før »"
 #: 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
+#: actions/register.php:459 actions/register.php:465
 msgid "Bio"
 msgstr "Om meg"
 
@@ -541,6 +544,7 @@ msgstr "Kan ikkje lesa brukarbilete-URL «%s»"
 #: actions/passwordsettings.php:169 actions/recoverpassword.php:347
 #: actions/passwordsettings.php:174 actions/recoverpassword.php:365
 #: actions/passwordsettings.php:180 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:185
 msgid "Can't save new password."
 msgstr "Klarar ikkje lagra nytt passord."
 
@@ -603,6 +607,7 @@ msgstr "Endra profilinnstillingane dine"
 #: actions/recoverpassword.php:236 actions/register.php:422
 #: actions/passwordsettings.php:111 actions/recoverpassword.php:239
 #: actions/register.php:426 actions/smssettings.php:134
+#: actions/register.php:432
 msgid "Confirm"
 msgstr "Godta"
 
@@ -632,7 +637,7 @@ msgid "Confirmation code not found."
 msgstr "Fann ikkje stadfestingskode."
 
 #: ../actions/register.php:202 actions/register.php:473
-#: actions/register.php:521 actions/register.php:531
+#: actions/register.php:521 actions/register.php:531 actions/register.php:537
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -869,6 +874,7 @@ 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
+#: classes/Notice.php:1120
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Databasefeil, kan ikkje lagra svar: %s"
@@ -891,7 +897,8 @@ msgstr "Skriv om deg og interessene dine med 140 teikn"
 #: 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
+#: lib/accountsettingsaction.php:117 actions/register.php:437
+#: actions/register.php:441
 msgid "Email"
 msgstr "Epost"
 
@@ -906,7 +913,7 @@ 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
+#: actions/register.php:200 actions/register.php:206 actions/register.php:212
 msgid "Email address already exists."
 msgstr "Epostadressa finst allereie."
 
@@ -992,7 +999,7 @@ msgstr "Feil ved lagring av brukar"
 
 #: ../actions/password.php:80 actions/profilesettings.php:399
 #: actions/passwordsettings.php:164 actions/passwordsettings.php:169
-#: actions/passwordsettings.php:175
+#: actions/passwordsettings.php:175 actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "Feil ved lagring av brukar; fungerer ikkje."
 
@@ -1004,6 +1011,7 @@ msgstr "Feil ved lagring av brukar; fungerer ikkje."
 #: actions/login.php:120 actions/recoverpassword.php:372
 #: actions/register.php:235 actions/login.php:122
 #: actions/recoverpassword.php:375 actions/register.php:242
+#: actions/login.php:149 actions/register.php:248
 msgid "Error setting user."
 msgstr "Feil ved å setja brukar."
 
@@ -1035,6 +1043,7 @@ msgstr "OSS"
 
 #: ../actions/avatar.php:115 actions/profilesettings.php:352
 #: actions/avatarsettings.php:397 actions/avatarsettings.php:349
+#: actions/avatarsettings.php:363
 msgid "Failed updating avatar."
 msgstr "Feil ved oppdatering av brukarbilete."
 
@@ -1069,6 +1078,7 @@ msgid "Find people on this site"
 msgstr "Finn folk på denne sida"
 
 #: ../actions/login.php:122 actions/login.php:247 actions/login.php:255
+#: actions/login.php:282
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -1086,6 +1096,7 @@ msgstr ""
 #: actions/showstream.php:220 lib/groupeditform.php:157
 #: actions/profilesettings.php:111 actions/register.php:441
 #: actions/showgroup.php:247 actions/showstream.php:267
+#: actions/register.php:447 lib/userprofile.php:149
 msgid "Full name"
 msgstr "Fullt namn"
 
@@ -1099,7 +1110,7 @@ msgstr "Fullt namn"
 #: 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
+#: actions/register.php:214 actions/register.php:220
 msgid "Full name is too long (max 255 chars)."
 msgstr "Ditt fulle namn er for langt (maksimalt 255 teikn)."
 
@@ -1120,7 +1131,7 @@ msgstr "Heim"
 #: 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
+#: actions/register.php:446 actions/register.php:452
 msgid "Homepage"
 msgstr "Heimeside"
 
@@ -1132,7 +1143,7 @@ msgstr "Heimeside"
 #: 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
+#: actions/register.php:211 actions/register.php:217
 msgid "Homepage is not a valid URL."
 msgstr "Heimesida er ikkje ei gyldig internettadresse."
 
@@ -1204,7 +1215,7 @@ msgstr "Det gamle passordet stemmer ikkje"
 
 #: ../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
+#: actions/facebookhome.php:129 actions/login.php:116 actions/login.php:143
 msgid "Incorrect username or password."
 msgstr "Feil brukarnamn eller passord"
 
@@ -1284,6 +1295,7 @@ msgstr "Ugyldig storleik."
 #: 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
+#: actions/register.php:243 actions/register.php:264
 msgid "Invalid username or password."
 msgstr "Ugyldig brukarnamn eller passord."
 
@@ -1360,7 +1372,7 @@ msgstr "Språk er for langt (maksimalt 50 teikn)."
 #: 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
+#: lib/profilelist.php:218 actions/register.php:470 lib/userprofile.php:164
 msgid "Location"
 msgstr "Plassering"
 
@@ -1374,7 +1386,7 @@ msgstr "Plassering"
 #: 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
+#: actions/register.php:221 actions/register.php:227
 msgid "Location is too long (max 255 chars)."
 msgstr "Plassering er for lang (maksimalt 255 teikn)."
 
@@ -1388,6 +1400,7 @@ msgstr "Plassering er for lang (maksimalt 255 teikn)."
 #: 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
+#: actions/login.php:204 actions/login.php:257
 #, php-format
 msgid "Login"
 msgstr "Logg inn"
@@ -1416,12 +1429,13 @@ msgstr "Logg ut"
 
 #: ../actions/register.php:166 actions/register.php:180
 #: actions/register.php:393 actions/register.php:439 actions/register.php:443
+#: actions/register.php:449
 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 actions/login.php:228 lib/facebookaction.php:325
-#: lib/facebookaction.php:327 actions/login.php:236
+#: lib/facebookaction.php:327 actions/login.php:236 actions/login.php:263
 msgid "Lost or forgotten password?"
 msgstr "Mista eller gløymd passord?"
 
@@ -1463,7 +1477,7 @@ 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:487
+#: actions/register.php:477 actions/register.php:487 actions/register.php:493
 msgid "My text and files are available under "
 msgstr "Teksten og filene mine er tilgjengeleg under "
 
@@ -1521,7 +1535,8 @@ msgstr "Lagra det nye passordet. Du er logga inn."
 #: 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
+#: actions/showgroup.php:236 actions/showstream.php:249 actions/login.php:246
+#: actions/register.php:423 lib/userprofile.php:131
 msgid "Nickname"
 msgstr "Kallenamn"
 
@@ -1535,7 +1550,7 @@ msgstr "Kallenamn"
 #: 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
+#: actions/register.php:202 actions/register.php:208
 msgid "Nickname already in use. Try another one."
 msgstr "Kallenamnet er allereie i bruk. Prøv eit anna."
 
@@ -1551,7 +1566,7 @@ msgstr "Kallenamnet er allereie i bruk. Prøv eit anna."
 #: 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
+#: actions/register.php:199 actions/register.php:205
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr "Kallenamn må berre ha små bokstavar og nummer, ingen mellomrom."
 
@@ -1790,7 +1805,8 @@ msgstr "Ikkje ein registrert brukar."
 #: 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
+#: lib/api.php:954 lib/api.php:982 lib/api.php:1092 lib/api.php:963
+#: lib/api.php:991 lib/api.php:1101
 msgid "Not a supported data format."
 msgstr "Ikkje eit støtta dataformat."
 
@@ -1811,7 +1827,7 @@ 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
+#: actions/register.php:189 actions/register.php:195 actions/register.php:201
 msgid "Not a valid email address."
 msgstr "Ikkje ei gyldig epostadresse."
 
@@ -1823,7 +1839,7 @@ msgstr "Ikkje ei gyldig epostadresse."
 #: 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
+#: actions/register.php:204 actions/register.php:210
 msgid "Not a valid nickname."
 msgstr "Ikkje eit gyldig brukarnamn."
 
@@ -1862,6 +1878,7 @@ msgstr "Venta ikkje dette svaret!"
 #: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
 #: actions/twitapistatuses.php:309 actions/twitapistatuses.php:327
 #: actions/twitapistatuses.php:284 actions/apistatusesupdate.php:186
+#: actions/apistatusesupdate.php:193
 msgid "Not found"
 msgstr "Fann ikkje"
 
@@ -2008,7 +2025,8 @@ msgstr "Hallvegs opplasta."
 #: 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
+#: lib/accountsettingsaction.php:114 actions/login.php:249
+#: actions/register.php:428
 msgid "Password"
 msgstr "Passord"
 
@@ -2037,6 +2055,7 @@ msgstr "Passord opphenting etterspurt"
 #: actions/passwordsettings.php:173 actions/recoverpassword.php:200
 #: actions/passwordsettings.php:178 actions/recoverpassword.php:208
 #: actions/passwordsettings.php:184 actions/recoverpassword.php:211
+#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "Lagra passord."
 
@@ -2045,6 +2064,7 @@ msgstr "Lagra passord."
 #: actions/passwordsettings.php:145 actions/register.php:183
 #: actions/passwordsettings.php:150 actions/register.php:220
 #: actions/passwordsettings.php:156 actions/register.php:227
+#: actions/register.php:233
 msgid "Passwords don't match."
 msgstr "Passorda var ikkje like."
 
@@ -2207,19 +2227,19 @@ msgstr "Hent fram passord for ukjend brukar."
 #: 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
+#: lib/logingroupnav.php:85 actions/register.php:114 actions/register.php:502
 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
+#: actions/register.php:129 actions/register.php:135
 msgid "Registration not allowed."
 msgstr "Registrering ikkje tillatt."
 
 #: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67 actions/register.php:106
+#: actions/register.php:67 actions/register.php:106 actions/register.php:112
 msgid "Registration successful"
 msgstr "Registreringa gikk bra"
 
@@ -2233,6 +2253,7 @@ msgstr "Avslå"
 #: 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
+#: actions/login.php:252 actions/register.php:477
 msgid "Remember me"
 msgstr "Hugs meg"
 
@@ -2331,6 +2352,7 @@ msgstr "Samme passord som over"
 
 #: ../actions/register.php:156 actions/register.php:170
 #: actions/register.php:377 actions/register.php:423 actions/register.php:427
+#: actions/register.php:433
 msgid "Same as password above. Required."
 msgstr "Samme som passord over. Påkrevd."
 
@@ -2492,6 +2514,7 @@ msgstr "Fann ikkje lagra OpenID"
 #: actions/remotesubscribe.php:113 actions/showstream.php:376
 #: lib/subscribeform.php:139 actions/showstream.php:345
 #: actions/remotesubscribe.php:137 actions/showstream.php:439
+#: lib/userprofile.php:321
 msgid "Subscribe"
 msgstr "Ting"
 
@@ -2538,6 +2561,7 @@ msgstr "Systemfeil ved opplasting av fil."
 #: actions/profilesettings.php:123 actions/showstream.php:255
 #: lib/subscriptionlist.php:106 lib/subscriptionlist.php:108
 #: actions/profilesettings.php:138 actions/showstream.php:327
+#: lib/userprofile.php:209
 msgid "Tags"
 msgstr "Merkelappar"
 
@@ -2757,6 +2781,7 @@ msgstr "Dette krev anten ein POST eller DELETE."
 #: actions/apifriendshipsdestroy.php:91 actions/apigroupcreate.php:104
 #: actions/apigroupjoin.php:91 actions/apigroupleave.php:91
 #: actions/apistatusesupdate.php:109
+#: actions/apiaccountupdateprofileimage.php:84
 msgid "This method requires a POST."
 msgstr "Dette krev ein POST."
 
@@ -2791,7 +2816,7 @@ msgstr ""
 
 #: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
 #: actions/twitapifriendships.php:132 actions/twitapifriendships.php:139
-#: actions/apifriendshipsexists.php:103
+#: actions/apifriendshipsexists.php:103 actions/apifriendshipsexists.php:94
 msgid "Two user ids or screen_names must be supplied."
 msgstr "To brukar IDer eller kallenamn er naudsynte."
 
@@ -2799,7 +2824,7 @@ msgstr "To brukar IDer eller kallenamn er naudsynte."
 #: 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
+#: actions/register.php:448 actions/register.php:454
 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."
 
@@ -2821,6 +2846,7 @@ msgstr "URL til profilsida di på ei anna kompatibel mikrobloggingteneste."
 #: actions/twittersettings.php:322 lib/designsettings.php:301
 #: actions/emailsettings.php:255 actions/grouplogo.php:319
 #: actions/imsettings.php:220 actions/smssettings.php:248
+#: actions/avatarsettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "Uventa skjemasending."
 
@@ -2933,7 +2959,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
+#: actions/register.php:436 actions/register.php:438 actions/register.php:442
 msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
 "Blir berre brukt for uppdateringar, viktige meldingar og for gløymde passord"
@@ -2962,7 +2988,8 @@ msgstr "Brukaren du lyttar til eksisterer ikkje."
 #: 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
+#: actions/apiusershow.php:108 actions/apiaccountupdateprofileimage.php:124
+#: actions/apiaccountupdateprofileimage.php:130
 msgid "User has no profile."
 msgstr "Brukaren har inga profil."
 
@@ -2991,7 +3018,7 @@ msgstr "Kva skjer, %s?"
 #: 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
+#: actions/register.php:466 actions/register.php:472
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Kvar er du, t.d. «By, Fylke (eller Region), Land»"
 
@@ -3095,7 +3122,7 @@ 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/register.php:149
-#: actions/register.php:186 actions/register.php:192
+#: actions/register.php:186 actions/register.php:192 actions/register.php:198
 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."
 
@@ -3169,56 +3196,56 @@ msgstr ""
 "brukar kontoen. Velikehold dine OpenID herfra."
 
 #: ../lib/util.php:943 lib/util.php:992 lib/util.php:945 lib/util.php:756
-#: lib/util.php:770 lib/util.php:816
+#: lib/util.php:770 lib/util.php:816 lib/util.php:844
 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:768
-#: lib/util.php:782 lib/util.php:828
+#: lib/util.php:782 lib/util.php:828 lib/util.php:856
 #, 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:764
-#: lib/util.php:778 lib/util.php:824
+#: lib/util.php:778 lib/util.php:824 lib/util.php:852
 #, 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:760
-#: lib/util.php:774 lib/util.php:820
+#: lib/util.php:774 lib/util.php:820 lib/util.php:848
 #, 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:772
-#: lib/util.php:786 lib/util.php:832
+#: lib/util.php:786 lib/util.php:832 lib/util.php:860
 #, 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:766
-#: lib/util.php:780 lib/util.php:826
+#: lib/util.php:780 lib/util.php:826 lib/util.php:854
 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:758
-#: lib/util.php:772 lib/util.php:818
+#: lib/util.php:772 lib/util.php:818 lib/util.php:846
 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:770
-#: lib/util.php:784 lib/util.php:830
+#: lib/util.php:784 lib/util.php:830 lib/util.php:858
 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:774
-#: lib/util.php:788 lib/util.php:834
+#: lib/util.php:788 lib/util.php:834 lib/util.php:862
 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:762
-#: lib/util.php:776 lib/util.php:822
+#: lib/util.php:776 lib/util.php:822 lib/util.php:850
 msgid "about an hour ago"
 msgstr "omtrent ein time sidan"
 
@@ -3287,7 +3314,9 @@ msgstr "« Etter"
 #: 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
+#: actions/userauthorization.php:52 actions/login.php:131
+#: actions/register.php:165 actions/avatarsettings.php:265
+#: lib/designsettings.php:294
 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."
 
@@ -3513,6 +3542,7 @@ 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
+#: actions/register.php:230
 msgid "Password must be 6 or more characters."
 msgstr "Passord må være minst 6 teikn."
 
@@ -4063,13 +4093,13 @@ 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
+#: actions/avatarsettings.php:308 actions/avatarsettings.php:322
 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
+#: actions/grouplogo.php:377 actions/avatarsettings.php:337
 msgid "Lost our file data."
 msgstr "Fant ikkje igjen fil data."
 
@@ -4525,7 +4555,7 @@ msgid "%s left group %s"
 msgstr "%s forlot %s gruppa"
 
 #: actions/login.php:225 lib/facebookaction.php:304 actions/login.php:208
-#: actions/login.php:216
+#: actions/login.php:216 actions/login.php:243
 msgid "Login to site"
 msgstr "Logg inn "
 
@@ -4706,7 +4736,8 @@ msgstr "Emne sky"
 
 #: 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
+#: actions/register.php:398 actions/register.php:85 actions/register.php:189
+#: actions/register.php:404
 msgid "Sorry, only invited people can register."
 msgstr "Beklage, men kun inviterte kan registrere seg."
 
@@ -4788,7 +4819,7 @@ msgstr "Gruppe profil"
 #: 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
+#: lib/profilelist.php:230 lib/userprofile.php:177
 msgid "URL"
 msgstr "URL"
 
@@ -4799,7 +4830,7 @@ msgstr "URL"
 #: 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
+#: lib/profilelist.php:245 lib/userprofile.php:194
 msgid "Note"
 msgstr "Merknad"
 
@@ -4848,6 +4879,7 @@ msgid "Only the sender and recipient "
 msgstr "Berre sendaren og mottakaren"
 
 #: actions/showstream.php:73 actions/showstream.php:78
+#: actions/showstream.php:79
 #, php-format
 msgid "%s, page %d"
 msgstr "%s, side %d"
@@ -4858,28 +4890,29 @@ msgstr " sin profil"
 
 #: actions/showstream.php:236 actions/tagother.php:77
 #: actions/showstream.php:220 actions/showstream.php:185
-#: actions/showstream.php:193
+#: actions/showstream.php:193 lib/userprofile.php:75
 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
+#: actions/showstream.php:220 lib/userprofile.php:102
 msgid "Photo"
 msgstr "Bilete"
 
 #: actions/showstream.php:317 actions/showstream.php:309
 #: actions/showstream.php:274 actions/showstream.php:354
+#: lib/userprofile.php:236
 msgid "User actions"
 msgstr "Brukarverkty"
 
 #: actions/showstream.php:342 actions/showstream.php:307
-#: actions/showstream.php:390
+#: actions/showstream.php:390 lib/userprofile.php:272
 msgid "Send a direct message to this user"
 msgstr "Send ei direktemelding til denne brukaren"
 
 #: actions/showstream.php:343 actions/showstream.php:308
-#: actions/showstream.php:391
+#: actions/showstream.php:391 lib/userprofile.php:273
 msgid "Message"
 msgstr "Melding"
 
@@ -5583,7 +5616,7 @@ msgstr "%s med vener"
 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
+#: actions/avatarsettings.php:373 actions/avatarsettings.php:387
 #, fuzzy
 msgid "Avatar deleted."
 msgstr "Lasta opp brukarbilete."
@@ -5720,10 +5753,12 @@ msgid ""
 msgstr ""
 
 #: actions/register.php:432 actions/register.php:479 actions/register.php:489
+#: actions/register.php:495
 msgid "Creative Commons Attribution 3.0"
 msgstr ""
 
 #: actions/register.php:433 actions/register.php:480 actions/register.php:490
+#: actions/register.php:496
 #, fuzzy
 msgid ""
 " except this private data: password, email address, IM address, and phone "
@@ -5760,44 +5795,48 @@ msgid "%s's profile"
 msgstr " sin profil"
 
 #: actions/showstream.php:163 actions/showstream.php:128
+#: actions/showstream.php:129
 #, fuzzy, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "Notisstraum for %s"
 
 #: actions/showstream.php:170 actions/showstream.php:135
+#: actions/showstream.php:136
 #, fuzzy, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "Notisstraum for %s"
 
 #: actions/showstream.php:177 actions/showstream.php:142
+#: actions/showstream.php:143
 #, fuzzy, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "Notisstraum for %s"
 
 #: actions/showstream.php:182 actions/showstream.php:147
+#: actions/showstream.php:148
 #, fuzzy, php-format
 msgid "FOAF for %s"
 msgstr "Utboks for %s"
 
 #: actions/showstream.php:237 actions/showstream.php:202
-#: actions/showstream.php:234
+#: actions/showstream.php:234 lib/userprofile.php:116
 #, fuzzy
 msgid "Edit Avatar"
 msgstr "Brukarbilete"
 
 #: actions/showstream.php:316 actions/showstream.php:281
-#: actions/showstream.php:366
+#: actions/showstream.php:366 lib/userprofile.php:248
 #, fuzzy
 msgid "Edit profile settings"
 msgstr "Profilinnstillingar"
 
 #: actions/showstream.php:317 actions/showstream.php:282
-#: actions/showstream.php:367
+#: actions/showstream.php:367 lib/userprofile.php:249
 msgid "Edit"
 msgstr ""
 
 #: actions/showstream.php:542 actions/showstream.php:388
-#: actions/showstream.php:487
+#: actions/showstream.php:487 actions/showstream.php:234
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5842,6 +5881,9 @@ msgstr ""
 #: actions/apistatusesupdate.php:125 actions/apisubscriptions.php:87
 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#: actions/apiaccountupdateprofileimage.php:91
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apistatusesupdate.php:139
 #, fuzzy
 msgid "No such user!"
 msgstr "Ingen slik brukar"
@@ -5901,36 +5943,6 @@ msgid ""
 "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 ""
@@ -6099,6 +6111,7 @@ 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
+#: actions/showstream.php:202
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -6280,7 +6293,8 @@ 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
+#: lib/designsettings.php:461 lib/designsettings.php:434
+#: lib/designsettings.php:464
 #, fuzzy
 msgid "Couldn't update your design."
 msgstr "Kan ikkje oppdatera brukar."
@@ -6376,7 +6390,9 @@ msgid "Message sent"
 msgstr "Melding"
 
 #: actions/newnotice.php:93 lib/designsettings.php:281
-#: actions/newnotice.php:94
+#: actions/newnotice.php:94 actions/apiaccountupdateprofileimage.php:97
+#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254
+#: lib/designsettings.php:283
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s bytes) due to its "
@@ -6546,7 +6562,7 @@ msgstr "Du har blitt identifisert. Skriv inn eit nytt passord under her."
 msgid "Password recover"
 msgstr "Passord opphenting etterspurt"
 
-#: actions/register.php:86
+#: actions/register.php:86 actions/register.php:92
 #, fuzzy
 msgid "Sorry, invalid invitation code."
 msgstr "Feil med stadfestingskode."
@@ -6648,28 +6664,31 @@ msgstr "Administrator"
 msgid "Not a local notice"
 msgstr "Ikkje ein lokal brukar."
 
-#: actions/showstream.php:72
+#: actions/showstream.php:72 actions/showstream.php:73
 #, fuzzy, php-format
 msgid " tagged %s"
 msgstr "Notisar merka med %s"
 
-#: actions/showstream.php:121
+#: actions/showstream.php:121 actions/showstream.php:122
 #, 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
+#: actions/showstream.php:191
 #, 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
+#: actions/showstream.php:196
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
 msgstr ""
 
 #: actions/showstream.php:357 actions/showstream.php:451
+#: actions/showstream.php:198
 #, php-format
 msgid ""
 "You can try to nudge %s or [post something to his or her attention](%%%%"
@@ -6677,6 +6696,7 @@ msgid ""
 msgstr ""
 
 #: actions/showstream.php:393 actions/showstream.php:492
+#: actions/showstream.php:239
 #, fuzzy, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -6829,6 +6849,7 @@ 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
+#: classes/User.php:333
 #, fuzzy, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "Melding til %1$s på %2$s"
@@ -6939,10 +6960,12 @@ msgid "Save design"
 msgstr ""
 
 #: lib/designsettings.php:378 lib/designsettings.php:369
+#: lib/designsettings.php:372
 msgid "Bad default color settings: "
 msgstr ""
 
 #: lib/designsettings.php:474 lib/designsettings.php:465
+#: lib/designsettings.php:468
 msgid "Design defaults restored."
 msgstr ""
 
@@ -7149,16 +7172,18 @@ msgid "Status deleted."
 msgstr "Lasta opp brukarbilete."
 
 #: actions/apistatusesupdate.php:132
+#: actions/apiaccountupdateprofileimage.php:99
 msgid "Unable to handle that much POST data!"
 msgstr ""
 
 #: actions/apistatusesupdate.php:145 actions/newnotice.php:155
-#: scripts/maildaemon.php:71
+#: scripts/maildaemon.php:71 actions/apistatusesupdate.php:152
 #, 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
+#: actions/apistatusesupdate.php:216
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
@@ -7223,7 +7248,7 @@ msgstr "Oppdateringar frå %1$s på %2$s!"
 msgid "IM is not available."
 msgstr "Denne sida er ikkje tilgjengleg i eit"
 
-#: actions/login.php:259
+#: actions/login.php:259 actions/login.php:286
 #, fuzzy, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -7258,21 +7283,24 @@ msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
 msgstr ""
 
 #: actions/profilesettings.php:122 actions/register.php:454
+#: actions/register.php:460
 #, 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
+#: actions/register.php:463
 #, fuzzy
 msgid "Describe yourself and your interests"
 msgstr "Skildra deg sjølv og din"
 
 #: actions/profilesettings.php:221 actions/register.php:217
+#: actions/register.php:223
 #, fuzzy, php-format
 msgid "Bio is too long (max %d chars)."
 msgstr "«Om meg» er for lang (maks 140 "
 
-#: actions/register.php:336
+#: actions/register.php:336 actions/register.php:342
 msgid ""
 "With this form you can create  a new account. You can then post notices and "
 "link up to friends and colleagues. "
@@ -7305,7 +7333,7 @@ msgid "Replies feed for %s (RSS 2.0)"
 msgstr "Notisstraum for %s"
 
 #: actions/replies.php:158
-#, fuzzy, php-format
+#, php-format
 msgid "Replies feed for %s (Atom)"
 msgstr "Notisstraum for %s"
 
@@ -7315,17 +7343,17 @@ msgid "Replies to %1$s on %2$s!"
 msgstr "Melding til %1$s på %2$s"
 
 #: actions/showfavorites.php:170
-#, fuzzy, php-format
+#, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
 msgstr "Straum for vener av %s"
 
 #: actions/showfavorites.php:177
-#, fuzzy, php-format
+#, php-format
 msgid "Feed for favorites of %s (RSS 2.0)"
 msgstr "Straum for vener av %s"
 
 #: actions/showfavorites.php:184
-#, fuzzy, php-format
+#, php-format
 msgid "Feed for favorites of %s (Atom)"
 msgstr "Straum for vener av %s"
 
@@ -7338,7 +7366,7 @@ msgid ""
 msgstr ""
 
 #: actions/showgroup.php:345
-#, fuzzy, php-format
+#, php-format
 msgid "FOAF for %s group"
 msgstr "Utboks for %s"
 
@@ -7476,41 +7504,6 @@ msgstr "Svar på denne notisen"
 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. "
@@ -7545,7 +7538,7 @@ msgid "Describe the group or topic in %d characters"
 msgstr "Beskriv gruppa eller emnet med 140 teikn"
 
 #: lib/jabber.php:192
-#, fuzzy, php-format
+#, php-format
 msgid "notice id: %s"
 msgstr "Ny notis"
 
@@ -7605,7 +7598,6 @@ 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."
 
@@ -7613,3 +7605,59 @@ msgstr "Kan ikkje hente offentleg straum."
 #, fuzzy
 msgid "Duplicate notice"
 msgstr "Slett notis"
+
+#: actions/login.php:110 actions/login.php:120
+#, fuzzy
+msgid "Invalid or expired token."
+msgstr "Ugyldig notisinnhald"
+
+#: lib/command.php:597
+#, fuzzy, php-format
+msgid "Could not create login token for %s"
+msgstr "Kunne ikkje laga OpenID-form: %s"
+
+#: lib/command.php:602
+#, php-format
+msgid "This link is useable only once, and is good for only 2 minutes: %s"
+msgstr ""
+
+#: lib/imagefile.php:75
+#, fuzzy, php-format
+msgid "That file is too big. The maximum file size is %s."
+msgstr "Du kan lasta opp ein logo for gruppa."
+
+#: lib/command.php:613
+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"
+"login - Get a link to login to the web interface\n"
+"drop <group> - leave group\n"
+"stats - get your stats\n"
+"stop - same as 'off'\n"
+"quit - same as 'off'\n"
+"sub <nickname> - same as 'follow'\n"
+"unsub <nickname> - same as 'leave'\n"
+"last <nickname> - same as 'get'\n"
+"on <nickname> - not yet implemented.\n"
+"off <nickname> - not yet implemented.\n"
+"nudge <nickname> - remind a user to update.\n"
+"invite <phone number> - not yet implemented.\n"
+"track <word> - not yet implemented.\n"
+"untrack <word> - not yet implemented.\n"
+"track off - not yet implemented.\n"
+"untrack all - not yet implemented.\n"
+"tracks - not yet implemented.\n"
+"tracking - not yet implemented.\n"
+msgstr ""
diff --git a/locale/pl/LC_MESSAGES/statusnet.mo b/locale/pl/LC_MESSAGES/statusnet.mo
index 5e13dd9a7..903a0f383 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 3fbee78c8..078a33b6a 100644
--- a/locale/pl/LC_MESSAGES/statusnet.po
+++ b/locale/pl/LC_MESSAGES/statusnet.po
@@ -5,12 +5,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-06 13:16+0000\n"
-"PO-Revision-Date: 2009-11-06 15:44:18+0000\n"
+"POT-Creation-Date: 2009-11-08 11:53+0000\n"
+"PO-Revision-Date: 2009-11-08 11:57:00+0000\n"
 "Language-Team: Polish\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r58648); Translate extension (2009-08-03)\n"
+"X-Generator: MediaWiki 1.16alpha(r58760); 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"
@@ -201,7 +201,7 @@ 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:555
+#: actions/register.php:545 actions/register.php:555 actions/register.php:561
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -240,6 +240,7 @@ 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:418
+#: actions/register.php:424
 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."
@@ -257,6 +258,7 @@ 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:423
+#: actions/register.php:429
 msgid "6 or more characters. Required."
 msgstr "6 lub więcej znaków. Wymagane."
 
@@ -437,7 +439,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
+#: actions/login.php:79 actions/register.php:137
 msgid "Already logged in."
 msgstr "Jesteś już zalogowany."
 
@@ -460,7 +462,7 @@ 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/login.php:226
-#: actions/register.php:473
+#: actions/register.php:473 actions/login.php:253 actions/register.php:479
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Automatyczne logowanie. Nie użyj na komputerach używanych przez wiele osób!"
@@ -485,6 +487,7 @@ msgstr "Awatar"
 
 #: ../actions/avatar.php:113 actions/profilesettings.php:350
 #: actions/avatarsettings.php:395 actions/avatarsettings.php:346
+#: actions/avatarsettings.php:360
 msgid "Avatar updated."
 msgstr "Zaktualizowano awatar."
 
@@ -522,7 +525,7 @@ msgstr "Wcześniej »"
 #: 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
+#: actions/register.php:459 actions/register.php:465
 msgid "Bio"
 msgstr "O mnie"
 
@@ -551,6 +554,7 @@ msgstr "Nie można odczytać adresu URL awatara \"%s\""
 #: actions/passwordsettings.php:169 actions/recoverpassword.php:347
 #: actions/passwordsettings.php:174 actions/recoverpassword.php:365
 #: actions/passwordsettings.php:180 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:185
 msgid "Can't save new password."
 msgstr "Nie można zapisać nowego hasła."
 
@@ -613,6 +617,7 @@ msgstr "Zmień ustawienia profilu"
 #: actions/recoverpassword.php:236 actions/register.php:422
 #: actions/passwordsettings.php:111 actions/recoverpassword.php:239
 #: actions/register.php:426 actions/smssettings.php:134
+#: actions/register.php:432
 msgid "Confirm"
 msgstr "Potwierdź"
 
@@ -642,7 +647,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:531
+#: actions/register.php:521 actions/register.php:531 actions/register.php:537
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -882,6 +887,7 @@ 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:1117
+#: classes/Notice.php:1120
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Błąd bazy danych podczas wprowadzania odpowiedzi: %s"
@@ -904,7 +910,8 @@ msgstr "Opisz się i swoje zainteresowania w 140 znakach"
 #: 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
+#: lib/accountsettingsaction.php:117 actions/register.php:437
+#: actions/register.php:441
 msgid "Email"
 msgstr "E-mail"
 
@@ -919,7 +926,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:206
+#: actions/register.php:200 actions/register.php:206 actions/register.php:212
 msgid "Email address already exists."
 msgstr "Adres e-mail już istnieje."
 
@@ -1005,7 +1012,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
+#: actions/passwordsettings.php:175 actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "Błąd podczas zapisywania użytkownika; nieprawidłowy."
 
@@ -1017,6 +1024,7 @@ msgstr "Błąd podczas zapisywania użytkownika; nieprawidłowy."
 #: actions/login.php:120 actions/recoverpassword.php:372
 #: actions/register.php:235 actions/login.php:122
 #: actions/recoverpassword.php:375 actions/register.php:242
+#: actions/login.php:149 actions/register.php:248
 msgid "Error setting user."
 msgstr "Błąd podczas ustawiania użytkownika."
 
@@ -1048,6 +1056,7 @@ msgstr "FAQ"
 
 #: ../actions/avatar.php:115 actions/profilesettings.php:352
 #: actions/avatarsettings.php:397 actions/avatarsettings.php:349
+#: actions/avatarsettings.php:363
 msgid "Failed updating avatar."
 msgstr "Zaktualizowanie awatara nie powiodło się."
 
@@ -1082,6 +1091,7 @@ msgid "Find people on this site"
 msgstr "Znajdź osoby na tej stronie"
 
 #: ../actions/login.php:122 actions/login.php:247 actions/login.php:255
+#: actions/login.php:282
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -1099,6 +1109,7 @@ msgstr ""
 #: actions/showstream.php:220 lib/groupeditform.php:157
 #: actions/profilesettings.php:111 actions/register.php:441
 #: actions/showgroup.php:247 actions/showstream.php:267
+#: actions/register.php:447 lib/userprofile.php:149
 msgid "Full name"
 msgstr "Imię i nazwisko"
 
@@ -1112,7 +1123,7 @@ msgstr "Imię i nazwisko"
 #: 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
+#: actions/register.php:214 actions/register.php:220
 msgid "Full name is too long (max 255 chars)."
 msgstr "Imię i nazwisko jest za długie (maksymalnie 255 znaków)."
 
@@ -1133,7 +1144,7 @@ msgstr "Strona główna"
 #: 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
+#: actions/register.php:446 actions/register.php:452
 msgid "Homepage"
 msgstr "Strona domowa"
 
@@ -1145,7 +1156,7 @@ msgstr "Strona domowa"
 #: 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
+#: actions/register.php:211 actions/register.php:217
 msgid "Homepage is not a valid URL."
 msgstr "Strona domowa nie jest prawidłowym adresem URL."
 
@@ -1217,7 +1228,7 @@ 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/login.php:116
+#: actions/facebookhome.php:129 actions/login.php:116 actions/login.php:143
 msgid "Incorrect username or password."
 msgstr "Niepoprawna nazwa użytkownika lub hasło."
 
@@ -1297,6 +1308,7 @@ msgstr "Nieprawidłowy rozmiar."
 #: 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
+#: actions/register.php:243 actions/register.php:264
 msgid "Invalid username or password."
 msgstr "Nieprawidłowa nazwa użytkownika lub hasło."
 
@@ -1374,7 +1386,7 @@ msgstr "Język jest za długi (maksymalnie 50 znaków)."
 #: 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
+#: lib/profilelist.php:218 actions/register.php:470 lib/userprofile.php:164
 msgid "Location"
 msgstr "Położenie"
 
@@ -1388,7 +1400,7 @@ msgstr "Położenie"
 #: 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
+#: actions/register.php:221 actions/register.php:227
 msgid "Location is too long (max 255 chars)."
 msgstr "Położenie jest za długie (maksymalnie 255 znaków)."
 
@@ -1402,6 +1414,7 @@ msgstr "Położenie jest za długie (maksymalnie 255 znaków)."
 #: 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
+#: actions/login.php:204 actions/login.php:257
 #, php-format
 msgid "Login"
 msgstr "Zaloguj się"
@@ -1430,12 +1443,13 @@ msgstr "Wyloguj się"
 
 #: ../actions/register.php:166 actions/register.php:180
 #: actions/register.php:393 actions/register.php:439 actions/register.php:443
+#: actions/register.php:449
 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 actions/login.php:236
+#: lib/facebookaction.php:327 actions/login.php:236 actions/login.php:263
 msgid "Lost or forgotten password?"
 msgstr "Zgubione lub zapomniane hasło?"
 
@@ -1478,7 +1492,7 @@ 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:487
+#: actions/register.php:477 actions/register.php:487 actions/register.php:493
 msgid "My text and files are available under "
 msgstr "Moje teksty i pliki są dostępne na "
 
@@ -1536,7 +1550,8 @@ msgstr "Pomyślnie zapisano nowe hasło. Jesteś teraz zalogowany."
 #: 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
+#: actions/showgroup.php:236 actions/showstream.php:249 actions/login.php:246
+#: actions/register.php:423 lib/userprofile.php:131
 msgid "Nickname"
 msgstr "Pseudonim"
 
@@ -1550,7 +1565,7 @@ msgstr "Pseudonim"
 #: 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
+#: actions/register.php:202 actions/register.php:208
 msgid "Nickname already in use. Try another one."
 msgstr "Pseudonim jest już używany. Spróbuj innego."
 
@@ -1566,7 +1581,7 @@ msgstr "Pseudonim jest już używany. Spróbuj innego."
 #: 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
+#: actions/register.php:199 actions/register.php:205
 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."
 
@@ -1805,7 +1820,8 @@ msgstr "To nie jest zarejestrowany użytkownik."
 #: 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
+#: lib/api.php:954 lib/api.php:982 lib/api.php:1092 lib/api.php:963
+#: lib/api.php:991 lib/api.php:1101
 msgid "Not a supported data format."
 msgstr "To nie jest obsługiwany format danych."
 
@@ -1826,7 +1842,7 @@ 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:195
+#: actions/register.php:189 actions/register.php:195 actions/register.php:201
 msgid "Not a valid email address."
 msgstr "To nie jest prawidłowy adres e-mail."
 
@@ -1838,7 +1854,7 @@ msgstr "To nie jest prawidłowy adres e-mail."
 #: 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
+#: actions/register.php:204 actions/register.php:210
 msgid "Not a valid nickname."
 msgstr "To nie jest prawidłowy pseudonim."
 
@@ -1877,6 +1893,7 @@ msgstr "Nieoczekiwana odpowiedź!"
 #: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
 #: actions/twitapistatuses.php:309 actions/twitapistatuses.php:327
 #: actions/twitapistatuses.php:284 actions/apistatusesupdate.php:186
+#: actions/apistatusesupdate.php:193
 msgid "Not found"
 msgstr "Nie znaleziono"
 
@@ -2023,7 +2040,8 @@ msgstr "Częściowo wysłano."
 #: 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
+#: lib/accountsettingsaction.php:114 actions/login.php:249
+#: actions/register.php:428
 msgid "Password"
 msgstr "Hasło"
 
@@ -2052,6 +2070,7 @@ msgstr "Zażądano przywracania hasła"
 #: actions/passwordsettings.php:173 actions/recoverpassword.php:200
 #: actions/passwordsettings.php:178 actions/recoverpassword.php:208
 #: actions/passwordsettings.php:184 actions/recoverpassword.php:211
+#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "Zapisano hasło."
 
@@ -2060,6 +2079,7 @@ msgstr "Zapisano hasło."
 #: actions/passwordsettings.php:145 actions/register.php:183
 #: actions/passwordsettings.php:150 actions/register.php:220
 #: actions/passwordsettings.php:156 actions/register.php:227
+#: actions/register.php:233
 msgid "Passwords don't match."
 msgstr "Hasła nie pasują do siebie."
 
@@ -2222,19 +2242,19 @@ msgstr "Kod przywracania dla nieznanego użytkownika."
 #: 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
+#: lib/logingroupnav.php:85 actions/register.php:114 actions/register.php:502
 msgid "Register"
 msgstr "Zarejestruj się"
 
 #: ../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
+#: actions/register.php:129 actions/register.php:135
 msgid "Registration not allowed."
 msgstr "Rejestracja nie jest dozwolona."
 
 #: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67 actions/register.php:106
+#: actions/register.php:67 actions/register.php:106 actions/register.php:112
 msgid "Registration successful"
 msgstr "Rejestracja powiodła się"
 
@@ -2248,6 +2268,7 @@ msgstr "Odrzuć"
 #: 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
+#: actions/login.php:252 actions/register.php:477
 msgid "Remember me"
 msgstr "Zapamiętaj mnie"
 
@@ -2346,6 +2367,7 @@ 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:427
+#: actions/register.php:433
 msgid "Same as password above. Required."
 msgstr "Takie samo jak powyższe hasło. Wymagane."
 
@@ -2509,6 +2531,7 @@ msgstr "Nie znaleziono przechowywanego identyfikatora OpenID."
 #: actions/remotesubscribe.php:113 actions/showstream.php:376
 #: lib/subscribeform.php:139 actions/showstream.php:345
 #: actions/remotesubscribe.php:137 actions/showstream.php:439
+#: lib/userprofile.php:321
 msgid "Subscribe"
 msgstr "Zasubskrybuj"
 
@@ -2555,6 +2578,7 @@ msgstr "Błąd systemu podczas wysyłania pliku."
 #: actions/profilesettings.php:123 actions/showstream.php:255
 #: lib/subscriptionlist.php:106 lib/subscriptionlist.php:108
 #: actions/profilesettings.php:138 actions/showstream.php:327
+#: lib/userprofile.php:209
 msgid "Tags"
 msgstr "Znaczniki"
 
@@ -2774,6 +2798,7 @@ msgstr "Ta metoda wymaga POST lub DELETE."
 #: actions/apifriendshipsdestroy.php:91 actions/apigroupcreate.php:104
 #: actions/apigroupjoin.php:91 actions/apigroupleave.php:91
 #: actions/apistatusesupdate.php:109
+#: actions/apiaccountupdateprofileimage.php:84
 msgid "This method requires a POST."
 msgstr "Ta metoda wymaga POST."
 
@@ -2808,7 +2833,7 @@ msgstr ""
 
 #: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
 #: actions/twitapifriendships.php:132 actions/twitapifriendships.php:139
-#: actions/apifriendshipsexists.php:103
+#: actions/apifriendshipsexists.php:103 actions/apifriendshipsexists.php:94
 msgid "Two user ids or screen_names must be supplied."
 msgstr "Należy dostarczyć dwa identyfikatory lub nazwy użytkowników."
 
@@ -2816,7 +2841,7 @@ msgstr "Należy dostarczyć dwa identyfikatory lub nazwy użytkowników."
 #: 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
+#: actions/register.php:448 actions/register.php:454
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "Adres URL strony domowej, bloga lub profilu na innej stronie"
 
@@ -2838,6 +2863,7 @@ msgstr "Adres URL profilu na innej, zgodnej usłudze mikroblogowania"
 #: actions/twittersettings.php:322 lib/designsettings.php:301
 #: actions/emailsettings.php:255 actions/grouplogo.php:319
 #: actions/imsettings.php:220 actions/smssettings.php:248
+#: actions/avatarsettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "Nieoczekiwane wysłanie formularza."
 
@@ -2950,7 +2976,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
+#: actions/register.php:436 actions/register.php:438 actions/register.php:442
 msgid "Used only for updates, announcements, and password recovery"
 msgstr "Używane tylko do aktualizacji, ogłoszeń i przywracania hasła"
 
@@ -2978,7 +3004,8 @@ 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
+#: actions/apiusershow.php:108 actions/apiaccountupdateprofileimage.php:124
+#: actions/apiaccountupdateprofileimage.php:130
 msgid "User has no profile."
 msgstr "Użytkownik nie posiada profilu."
 
@@ -3007,7 +3034,7 @@ msgstr "Co słychać, %s?"
 #: 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
+#: actions/register.php:466 actions/register.php:472
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Gdzie jesteś, np. \"miasto, województwo (lub region), kraj\""
 
@@ -3111,7 +3138,7 @@ 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:192
+#: actions/register.php:186 actions/register.php:192 actions/register.php:198
 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."
@@ -3189,56 +3216,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:816
+#: lib/util.php:770 lib/util.php:816 lib/util.php:844
 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:828
+#: lib/util.php:782 lib/util.php:828 lib/util.php:856
 #, 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:824
+#: lib/util.php:778 lib/util.php:824 lib/util.php:852
 #, 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:820
+#: lib/util.php:774 lib/util.php:820 lib/util.php:848
 #, 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:832
+#: lib/util.php:786 lib/util.php:832 lib/util.php:860
 #, 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:826
+#: lib/util.php:780 lib/util.php:826 lib/util.php:854
 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:818
+#: lib/util.php:772 lib/util.php:818 lib/util.php:846
 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:830
+#: lib/util.php:784 lib/util.php:830 lib/util.php:858
 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:834
+#: lib/util.php:788 lib/util.php:834 lib/util.php:862
 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:822
+#: lib/util.php:776 lib/util.php:822 lib/util.php:850
 msgid "about an hour ago"
 msgstr "około godzinę temu"
 
@@ -3307,7 +3334,9 @@ msgstr "« Następne"
 #: 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
+#: actions/userauthorization.php:52 actions/login.php:131
+#: actions/register.php:165 actions/avatarsettings.php:265
+#: lib/designsettings.php:294
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Wystąpił problem z tokenem sesji. Spróbuj ponownie."
 
@@ -3532,6 +3561,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
+#: actions/register.php:230
 msgid "Password must be 6 or more characters."
 msgstr "Hasło musi mieć sześć lub więcej znaków."
 
@@ -4082,13 +4112,13 @@ msgid "There was a problem with your session token. "
 msgstr "Wystąpił problem z tokenem sesji. "
 
 #: actions/avatarsettings.php:303 actions/grouplogo.php:360
-#: actions/avatarsettings.php:308
+#: actions/avatarsettings.php:308 actions/avatarsettings.php:322
 msgid "Pick a square area of the image to be your avatar"
 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
+#: actions/grouplogo.php:377 actions/avatarsettings.php:337
 msgid "Lost our file data."
 msgstr "Utracono dane pliku."
 
@@ -4544,7 +4574,7 @@ 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
+#: actions/login.php:216 actions/login.php:243
 msgid "Login to site"
 msgstr "Zaloguj się na stronie"
 
@@ -4725,7 +4755,8 @@ 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:183
-#: actions/register.php:398
+#: actions/register.php:398 actions/register.php:85 actions/register.php:189
+#: actions/register.php:404
 msgid "Sorry, only invited people can register."
 msgstr "Przepraszamy, tylko zaproszone osoby mogą się rejestrować."
 
@@ -4807,7 +4838,7 @@ msgstr "Profil grupy"
 #: 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
+#: lib/profilelist.php:230 lib/userprofile.php:177
 msgid "URL"
 msgstr "Adres URL"
 
@@ -4818,7 +4849,7 @@ msgstr "Adres URL"
 #: 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
+#: lib/profilelist.php:245 lib/userprofile.php:194
 msgid "Note"
 msgstr "Wpis"
 
@@ -4867,6 +4898,7 @@ msgid "Only the sender and recipient "
 msgstr "Tylko nadawca i odbiorca "
 
 #: actions/showstream.php:73 actions/showstream.php:78
+#: actions/showstream.php:79
 #, php-format
 msgid "%s, page %d"
 msgstr "%s, strona %d"
@@ -4877,28 +4909,29 @@ msgstr " - profil"
 
 #: actions/showstream.php:236 actions/tagother.php:77
 #: actions/showstream.php:220 actions/showstream.php:185
-#: actions/showstream.php:193
+#: actions/showstream.php:193 lib/userprofile.php:75
 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
+#: actions/showstream.php:220 lib/userprofile.php:102
 msgid "Photo"
 msgstr "Zdjęcie"
 
 #: actions/showstream.php:317 actions/showstream.php:309
 #: actions/showstream.php:274 actions/showstream.php:354
+#: lib/userprofile.php:236
 msgid "User actions"
 msgstr "Działania użytkownika"
 
 #: actions/showstream.php:342 actions/showstream.php:307
-#: actions/showstream.php:390
+#: actions/showstream.php:390 lib/userprofile.php:272
 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
+#: actions/showstream.php:391 lib/userprofile.php:273
 msgid "Message"
 msgstr "Wiadomość"
 
@@ -5603,7 +5636,7 @@ msgstr "Ty i przyjaciele"
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr "Można wysłać swój osobisty awatar. Maksymalny rozmiar pliku to %s."
 
-#: actions/avatarsettings.php:373
+#: actions/avatarsettings.php:373 actions/avatarsettings.php:387
 msgid "Avatar deleted."
 msgstr "Usunięto awatar."
 
@@ -5751,10 +5784,12 @@ msgstr ""
 "openidlogin%%)!)"
 
 #: actions/register.php:432 actions/register.php:479 actions/register.php:489
+#: actions/register.php:495
 msgid "Creative Commons Attribution 3.0"
 msgstr "Creative Commons Uznanie Autorstwa 3.0"
 
 #: actions/register.php:433 actions/register.php:480 actions/register.php:490
+#: actions/register.php:496
 msgid ""
 " except this private data: password, email address, IM address, and phone "
 "number."
@@ -5794,42 +5829,46 @@ msgid "%s's profile"
 msgstr "Profil użytkownika %s"
 
 #: actions/showstream.php:163 actions/showstream.php:128
+#: actions/showstream.php:129
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "Kanał wpisów dla %s (RSS 1.0)"
 
 #: actions/showstream.php:170 actions/showstream.php:135
+#: actions/showstream.php:136
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "Kanał wpisów dla %s (RSS 2.0)"
 
 #: actions/showstream.php:177 actions/showstream.php:142
+#: actions/showstream.php:143
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "Kanał wpisów dla %s (Atom)"
 
 #: actions/showstream.php:182 actions/showstream.php:147
+#: actions/showstream.php:148
 #, php-format
 msgid "FOAF for %s"
 msgstr "FOAF dla %s"
 
 #: actions/showstream.php:237 actions/showstream.php:202
-#: actions/showstream.php:234
+#: actions/showstream.php:234 lib/userprofile.php:116
 msgid "Edit Avatar"
 msgstr "Edytuj awatar"
 
 #: actions/showstream.php:316 actions/showstream.php:281
-#: actions/showstream.php:366
+#: actions/showstream.php:366 lib/userprofile.php:248
 msgid "Edit profile settings"
 msgstr "Edytuj ustawienia profilu"
 
 #: actions/showstream.php:317 actions/showstream.php:282
-#: actions/showstream.php:367
+#: actions/showstream.php:367 lib/userprofile.php:249
 msgid "Edit"
 msgstr "Edytuj"
 
 #: actions/showstream.php:542 actions/showstream.php:388
-#: actions/showstream.php:487
+#: actions/showstream.php:487 actions/showstream.php:234
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5890,6 +5929,9 @@ msgstr ""
 #: actions/apistatusesupdate.php:125 actions/apisubscriptions.php:87
 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#: actions/apiaccountupdateprofileimage.php:91
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apistatusesupdate.php:139
 msgid "No such user!"
 msgstr "Nie ma takiego użytkownika!"
 
@@ -5947,62 +5989,6 @@ msgstr ""
 "Subskrybenci: %2$s\n"
 "Wpisy: %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 ""
-"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/dberroraction.php:60
 msgid "Database error"
 msgstr "Błąd bazy danych"
@@ -6244,6 +6230,7 @@ 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
+#: actions/showstream.php:202
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -6419,7 +6406,8 @@ 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
+#: lib/designsettings.php:461 lib/designsettings.php:434
+#: lib/designsettings.php:464
 msgid "Couldn't update your design."
 msgstr "Nie można zaktualizować wyglądu."
 
@@ -6511,7 +6499,9 @@ msgid "Message sent"
 msgstr "Wysłano wiadomość"
 
 #: actions/newnotice.php:93 lib/designsettings.php:281
-#: actions/newnotice.php:94
+#: actions/newnotice.php:94 actions/apiaccountupdateprofileimage.php:97
+#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254
+#: lib/designsettings.php:283
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s bytes) due to its "
@@ -6692,7 +6682,7 @@ msgstr "Zostałeś zidentyfikowany. Podaj poniżej nowe hasło. "
 msgid "Password recover"
 msgstr "Przywrócenie hasła"
 
-#: actions/register.php:86
+#: actions/register.php:86 actions/register.php:92
 msgid "Sorry, invalid invitation code."
 msgstr "Przepraszamy, nieprawidłowy kod zaproszenia."
 
@@ -6806,23 +6796,25 @@ msgstr "Administratorzy"
 msgid "Not a local notice"
 msgstr "Nie jest lokalnym wpisem"
 
-#: actions/showstream.php:72
+#: actions/showstream.php:72 actions/showstream.php:73
 #, php-format
 msgid " tagged %s"
 msgstr " ze znacznikiem %s"
 
-#: actions/showstream.php:121
+#: actions/showstream.php:121 actions/showstream.php:122
 #, php-format
 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:444
+#: actions/showstream.php:191
 #, 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:449
+#: actions/showstream.php:196
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -6831,6 +6823,7 @@ msgstr ""
 "teraz jest dobry czas, aby zacząć. :)"
 
 #: actions/showstream.php:357 actions/showstream.php:451
+#: actions/showstream.php:198
 #, php-format
 msgid ""
 "You can try to nudge %s or [post something to his or her attention](%%%%"
@@ -6840,6 +6833,7 @@ msgstr ""
 "uwagi](%%%%action.newnotice%%%%?status_textarea=%s)."
 
 #: actions/showstream.php:393 actions/showstream.php:492
+#: actions/showstream.php:239
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -7000,6 +6994,7 @@ msgid "Problem saving notice. Too long."
 msgstr "Problem podczas zapisywania wpisu. Za długi."
 
 #: classes/User.php:319 classes/User.php:327 classes/User.php:334
+#: classes/User.php:333
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "Witaj w %1$s, @%2$s!"
@@ -7103,10 +7098,12 @@ msgid "Save design"
 msgstr "Zapisz wygląd"
 
 #: lib/designsettings.php:378 lib/designsettings.php:369
+#: lib/designsettings.php:372
 msgid "Bad default color settings: "
 msgstr "Błędne domyślne ustawienia koloru: "
 
 #: lib/designsettings.php:474 lib/designsettings.php:465
+#: lib/designsettings.php:468
 msgid "Design defaults restored."
 msgstr "Przywrócono domyślny wygląd."
 
@@ -7354,16 +7351,18 @@ msgid "Status deleted."
 msgstr "Usunięto awatar."
 
 #: actions/apistatusesupdate.php:132
+#: actions/apiaccountupdateprofileimage.php:99
 msgid "Unable to handle that much POST data!"
 msgstr ""
 
 #: actions/apistatusesupdate.php:145 actions/newnotice.php:155
-#: scripts/maildaemon.php:71
+#: scripts/maildaemon.php:71 actions/apistatusesupdate.php:152
 #, 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
+#: actions/apistatusesupdate.php:216
 #, 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."
@@ -7428,7 +7427,7 @@ msgstr "Aktualizacje od %1$s na %2$s!"
 msgid "IM is not available."
 msgstr "Ta strona nie jest dostępna w "
 
-#: actions/login.php:259
+#: actions/login.php:259 actions/login.php:286
 #, fuzzy, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -7463,21 +7462,24 @@ msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
 msgstr ""
 
 #: actions/profilesettings.php:122 actions/register.php:454
+#: actions/register.php:460
 #, 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
+#: actions/register.php:463
 #, fuzzy
 msgid "Describe yourself and your interests"
 msgstr "Opisz się i swoje "
 
 #: actions/profilesettings.php:221 actions/register.php:217
+#: actions/register.php:223
 #, 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
+#: actions/register.php:336 actions/register.php:342
 #, fuzzy
 msgid ""
 "With this form you can create  a new account. You can then post notices and "
@@ -7689,68 +7691,6 @@ msgstr "Odpowiedz na ten wpis"
 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. "
@@ -7869,3 +7809,202 @@ msgstr "Nie można określić użytkownika źródłowego."
 #, fuzzy
 msgid "Duplicate notice"
 msgstr "Usuń wpis"
+
+#: actions/login.php:110 actions/login.php:120
+#, fuzzy
+msgid "Invalid or expired token."
+msgstr "Nieprawidłowa zawartość wpisu"
+
+#: lib/command.php:597
+#, fuzzy, php-format
+msgid "Could not create login token for %s"
+msgstr "Nie można utworzyć formularza OpenID: %s"
+
+#: lib/command.php:602
+#, php-format
+msgid "This link is useable only once, and is good for only 2 minutes: %s"
+msgstr ""
+
+#: lib/imagefile.php:75
+#, fuzzy, php-format
+msgid "That file is too big. The maximum file size is %s."
+msgstr "Ten plik jest za duży. Maksymalny rozmiar pliku to %d."
+
+#: lib/command.php:613
+#, 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"
+"login - Get a link to login to the web interface\n"
+"drop <group> - leave group\n"
+"stats - get your stats\n"
+"stop - same as 'off'\n"
+"quit - same as 'off'\n"
+"sub <nickname> - same as 'follow'\n"
+"unsub <nickname> - same as 'leave'\n"
+"last <nickname> - same as 'get'\n"
+"on <nickname> - not yet implemented.\n"
+"off <nickname> - not yet implemented.\n"
+"nudge <nickname> - remind a user to update.\n"
+"invite <phone number> - not yet implemented.\n"
+"track <word> - not yet implemented.\n"
+"untrack <word> - not yet implemented.\n"
+"track off - not yet implemented.\n"
+"untrack all - not yet implemented.\n"
+"tracks - not yet implemented.\n"
+"tracking - not yet implemented.\n"
+msgstr ""
+"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"
+
+#~ 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 ""
+#~ "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"
+
+#, 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"
diff --git a/locale/pt/LC_MESSAGES/statusnet.mo b/locale/pt/LC_MESSAGES/statusnet.mo
index a2086783a..b858cc158 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 076e71545..f7714b71e 100644
--- a/locale/pt/LC_MESSAGES/statusnet.po
+++ b/locale/pt/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-06 13:16+0000\n"
-"PO-Revision-Date: 2009-11-06 15:44:22+0000\n"
+"POT-Creation-Date: 2009-11-08 11:53+0000\n"
+"PO-Revision-Date: 2009-11-08 11:57:03+0000\n"
 "Language-Team: Portuguese\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r58648); Translate extension (2009-08-03)\n"
+"X-Generator: MediaWiki 1.16alpha(r58760); 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"
@@ -205,7 +205,7 @@ msgid "%s updates from everyone!"
 msgstr "%s actualizações de todos!"
 
 #: ../actions/register.php:213 actions/register.php:497
-#: actions/register.php:545 actions/register.php:555
+#: actions/register.php:545 actions/register.php:555 actions/register.php:561
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -243,6 +243,7 @@ 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
+#: actions/register.php:424
 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."
 
@@ -259,6 +260,7 @@ 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:419 actions/register.php:423
+#: actions/register.php:429
 msgid "6 or more characters. Required."
 msgstr "6 ou mais caracteres. Obrigatório."
 
@@ -439,7 +441,7 @@ msgstr "Todas as actualizações com o termo \"%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
+#: actions/login.php:79 actions/register.php:137
 msgid "Already logged in."
 msgstr "Login já efectuado."
 
@@ -462,7 +464,7 @@ msgstr "Autorizar subscrição"
 #: ../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
+#: actions/register.php:473 actions/login.php:253 actions/register.php:479
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Efectuar login automático; não utilizar em computadores de uso partilhado!"
@@ -487,6 +489,7 @@ msgstr "Avatar"
 
 #: ../actions/avatar.php:113 actions/profilesettings.php:350
 #: actions/avatarsettings.php:395 actions/avatarsettings.php:346
+#: actions/avatarsettings.php:360
 msgid "Avatar updated."
 msgstr "Avatar actualizado."
 
@@ -523,7 +526,7 @@ msgstr "Antes »"
 #: 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
+#: actions/register.php:459 actions/register.php:465
 msgid "Bio"
 msgstr "Bio"
 
@@ -552,6 +555,7 @@ msgstr "Não é possível ler o URL do avatar '%s'"
 #: actions/passwordsettings.php:169 actions/recoverpassword.php:347
 #: actions/passwordsettings.php:174 actions/recoverpassword.php:365
 #: actions/passwordsettings.php:180 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:185
 msgid "Can't save new password."
 msgstr "Não é possível guardar a nova password."
 
@@ -614,6 +618,7 @@ msgstr "Modificar as suas definições de perfil"
 #: actions/recoverpassword.php:236 actions/register.php:422
 #: actions/passwordsettings.php:111 actions/recoverpassword.php:239
 #: actions/register.php:426 actions/smssettings.php:134
+#: actions/register.php:432
 msgid "Confirm"
 msgstr "Confirmar"
 
@@ -643,7 +648,7 @@ msgid "Confirmation code not found."
 msgstr "Código de confirmação não encontrado"
 
 #: ../actions/register.php:202 actions/register.php:473
-#: actions/register.php:521 actions/register.php:531
+#: actions/register.php:521 actions/register.php:531 actions/register.php:537
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -882,6 +887,7 @@ 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
+#: classes/Notice.php:1120
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Ocorreu um erro na base de dados ao inserir a resposta: %s"
@@ -904,7 +910,8 @@ msgstr "Descreva-se e aos seus interesses em 140 caracteres"
 #: 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
+#: lib/accountsettingsaction.php:117 actions/register.php:437
+#: actions/register.php:441
 msgid "Email"
 msgstr "Email"
 
@@ -919,7 +926,7 @@ 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
+#: actions/register.php:200 actions/register.php:206 actions/register.php:212
 msgid "Email address already exists."
 msgstr "Endereço de Email já existe."
 
@@ -1005,7 +1012,7 @@ msgstr "Erro ao guardar o utilizador."
 
 #: ../actions/password.php:80 actions/profilesettings.php:399
 #: actions/passwordsettings.php:164 actions/passwordsettings.php:169
-#: actions/passwordsettings.php:175
+#: actions/passwordsettings.php:175 actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "Erro ao guardar utilizador; inválido."
 
@@ -1017,6 +1024,7 @@ msgstr "Erro ao guardar utilizador; inválido."
 #: actions/login.php:120 actions/recoverpassword.php:372
 #: actions/register.php:235 actions/login.php:122
 #: actions/recoverpassword.php:375 actions/register.php:242
+#: actions/login.php:149 actions/register.php:248
 msgid "Error setting user."
 msgstr "Erro ao configurar utilizador."
 
@@ -1048,6 +1056,7 @@ msgstr "FAQ"
 
 #: ../actions/avatar.php:115 actions/profilesettings.php:352
 #: actions/avatarsettings.php:397 actions/avatarsettings.php:349
+#: actions/avatarsettings.php:363
 msgid "Failed updating avatar."
 msgstr "Falha ao actualizar avatar."
 
@@ -1082,6 +1091,7 @@ msgid "Find people on this site"
 msgstr "Encontrar pessoas neste site"
 
 #: ../actions/login.php:122 actions/login.php:247 actions/login.php:255
+#: actions/login.php:282
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -1099,6 +1109,7 @@ msgstr ""
 #: actions/showstream.php:220 lib/groupeditform.php:157
 #: actions/profilesettings.php:111 actions/register.php:441
 #: actions/showgroup.php:247 actions/showstream.php:267
+#: actions/register.php:447 lib/userprofile.php:149
 msgid "Full name"
 msgstr "Nome Completo"
 
@@ -1112,7 +1123,7 @@ msgstr "Nome Completo"
 #: 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
+#: actions/register.php:214 actions/register.php:220
 msgid "Full name is too long (max 255 chars)."
 msgstr "Nome completo é demasiado longo (máx. 255 caracteres)."
 
@@ -1133,7 +1144,7 @@ msgstr "Início"
 #: 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
+#: actions/register.php:446 actions/register.php:452
 msgid "Homepage"
 msgstr "Página Principal"
 
@@ -1145,7 +1156,7 @@ msgstr "Página Principal"
 #: 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
+#: actions/register.php:211 actions/register.php:217
 msgid "Homepage is not a valid URL."
 msgstr "A Homepage inserida não é um URL válido."
 
@@ -1218,7 +1229,7 @@ msgstr "Palavra-passe antiga incorrecta"
 
 #: ../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
+#: actions/facebookhome.php:129 actions/login.php:116 actions/login.php:143
 msgid "Incorrect username or password."
 msgstr "Nome de utilizador ou palavra-passe incorrecta"
 
@@ -1298,6 +1309,7 @@ msgstr "Tamanho inválido."
 #: 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
+#: actions/register.php:243 actions/register.php:264
 msgid "Invalid username or password."
 msgstr "Nome de utilizador ou palavra-passe inválido."
 
@@ -1369,7 +1381,7 @@ msgstr "Linguagem introduzida é muito longa (máx. 50 caracteres)."
 #: 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
+#: lib/profilelist.php:218 actions/register.php:470 lib/userprofile.php:164
 msgid "Location"
 msgstr "Localidade"
 
@@ -1383,7 +1395,7 @@ msgstr "Localidade"
 #: 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
+#: actions/register.php:221 actions/register.php:227
 msgid "Location is too long (max 255 chars)."
 msgstr "Localidade é muito longa (máx. 255 caracteres)."
 
@@ -1397,6 +1409,7 @@ msgstr "Localidade é muito longa (máx. 255 caracteres)."
 #: 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
+#: actions/login.php:204 actions/login.php:257
 #, php-format
 msgid "Login"
 msgstr "Entrar"
@@ -1425,12 +1438,13 @@ msgstr "Sair"
 
 #: ../actions/register.php:166 actions/register.php:180
 #: actions/register.php:393 actions/register.php:439 actions/register.php:443
+#: actions/register.php:449
 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 actions/login.php:236
+#: lib/facebookaction.php:327 actions/login.php:236 actions/login.php:263
 msgid "Lost or forgotten password?"
 msgstr "Perdeu ou esqueceu-se da palavra-passe?"
 
@@ -1470,7 +1484,7 @@ 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:487
+#: actions/register.php:477 actions/register.php:487 actions/register.php:493
 msgid "My text and files are available under "
 msgstr ""
 
@@ -1528,7 +1542,8 @@ msgstr "Nova palavra-passe foi guardada com sucesso. Está agora conectado."
 #: 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
+#: actions/showgroup.php:236 actions/showstream.php:249 actions/login.php:246
+#: actions/register.php:423 lib/userprofile.php:131
 msgid "Nickname"
 msgstr "Alcunha"
 
@@ -1542,7 +1557,7 @@ msgstr "Alcunha"
 #: 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
+#: actions/register.php:202 actions/register.php:208
 msgid "Nickname already in use. Try another one."
 msgstr "Alcunha já em uso. Tente outra diferente."
 
@@ -1558,7 +1573,7 @@ msgstr "Alcunha já em uso. Tente outra diferente."
 #: 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
+#: actions/register.php:199 actions/register.php:205
 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."
 
@@ -1797,7 +1812,8 @@ msgstr ""
 #: 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
+#: lib/api.php:954 lib/api.php:982 lib/api.php:1092 lib/api.php:963
+#: lib/api.php:991 lib/api.php:1101
 msgid "Not a supported data format."
 msgstr ""
 
@@ -1818,7 +1834,7 @@ 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
+#: actions/register.php:189 actions/register.php:195 actions/register.php:201
 msgid "Not a valid email address."
 msgstr ""
 
@@ -1830,7 +1846,7 @@ msgstr ""
 #: 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
+#: actions/register.php:204 actions/register.php:210
 msgid "Not a valid nickname."
 msgstr ""
 
@@ -1869,6 +1885,7 @@ msgstr ""
 #: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
 #: actions/twitapistatuses.php:309 actions/twitapistatuses.php:327
 #: actions/twitapistatuses.php:284 actions/apistatusesupdate.php:186
+#: actions/apistatusesupdate.php:193
 msgid "Not found"
 msgstr ""
 
@@ -2015,7 +2032,8 @@ msgstr ""
 #: 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
+#: lib/accountsettingsaction.php:114 actions/login.php:249
+#: actions/register.php:428
 msgid "Password"
 msgstr ""
 
@@ -2044,6 +2062,7 @@ msgstr ""
 #: actions/passwordsettings.php:173 actions/recoverpassword.php:200
 #: actions/passwordsettings.php:178 actions/recoverpassword.php:208
 #: actions/passwordsettings.php:184 actions/recoverpassword.php:211
+#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr ""
 
@@ -2052,6 +2071,7 @@ msgstr ""
 #: actions/passwordsettings.php:145 actions/register.php:183
 #: actions/passwordsettings.php:150 actions/register.php:220
 #: actions/passwordsettings.php:156 actions/register.php:227
+#: actions/register.php:233
 msgid "Passwords don't match."
 msgstr ""
 
@@ -2212,19 +2232,19 @@ msgstr ""
 #: 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
+#: lib/logingroupnav.php:85 actions/register.php:114 actions/register.php:502
 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
+#: actions/register.php:129 actions/register.php:135
 msgid "Registration not allowed."
 msgstr ""
 
 #: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67 actions/register.php:106
+#: actions/register.php:67 actions/register.php:106 actions/register.php:112
 msgid "Registration successful"
 msgstr ""
 
@@ -2238,6 +2258,7 @@ msgstr ""
 #: 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
+#: actions/login.php:252 actions/register.php:477
 msgid "Remember me"
 msgstr ""
 
@@ -2334,6 +2355,7 @@ msgstr ""
 
 #: ../actions/register.php:156 actions/register.php:170
 #: actions/register.php:377 actions/register.php:423 actions/register.php:427
+#: actions/register.php:433
 msgid "Same as password above. Required."
 msgstr ""
 
@@ -2489,6 +2511,7 @@ msgstr ""
 #: actions/remotesubscribe.php:113 actions/showstream.php:376
 #: lib/subscribeform.php:139 actions/showstream.php:345
 #: actions/remotesubscribe.php:137 actions/showstream.php:439
+#: lib/userprofile.php:321
 msgid "Subscribe"
 msgstr ""
 
@@ -2535,6 +2558,7 @@ msgstr ""
 #: actions/profilesettings.php:123 actions/showstream.php:255
 #: lib/subscriptionlist.php:106 lib/subscriptionlist.php:108
 #: actions/profilesettings.php:138 actions/showstream.php:327
+#: lib/userprofile.php:209
 msgid "Tags"
 msgstr ""
 
@@ -2743,6 +2767,7 @@ msgstr ""
 #: actions/apifriendshipsdestroy.php:91 actions/apigroupcreate.php:104
 #: actions/apigroupjoin.php:91 actions/apigroupleave.php:91
 #: actions/apistatusesupdate.php:109
+#: actions/apiaccountupdateprofileimage.php:84
 msgid "This method requires a POST."
 msgstr ""
 
@@ -2773,7 +2798,7 @@ msgstr ""
 
 #: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
 #: actions/twitapifriendships.php:132 actions/twitapifriendships.php:139
-#: actions/apifriendshipsexists.php:103
+#: actions/apifriendshipsexists.php:103 actions/apifriendshipsexists.php:94
 msgid "Two user ids or screen_names must be supplied."
 msgstr ""
 
@@ -2781,7 +2806,7 @@ msgstr ""
 #: 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
+#: actions/register.php:448 actions/register.php:454
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr ""
 
@@ -2803,6 +2828,7 @@ msgstr ""
 #: actions/twittersettings.php:322 lib/designsettings.php:301
 #: actions/emailsettings.php:255 actions/grouplogo.php:319
 #: actions/imsettings.php:220 actions/smssettings.php:248
+#: actions/avatarsettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr ""
 
@@ -2907,7 +2933,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
+#: actions/register.php:436 actions/register.php:438 actions/register.php:442
 msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
 
@@ -2935,7 +2961,8 @@ 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
+#: actions/apiusershow.php:108 actions/apiaccountupdateprofileimage.php:124
+#: actions/apiaccountupdateprofileimage.php:130
 msgid "User has no profile."
 msgstr ""
 
@@ -2964,7 +2991,7 @@ msgstr ""
 #: 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
+#: actions/register.php:466 actions/register.php:472
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr ""
 
@@ -3060,7 +3087,7 @@ 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:192
+#: actions/register.php:186 actions/register.php:192 actions/register.php:198
 msgid "You can't register if you don't agree to the license."
 msgstr ""
 
@@ -3123,56 +3150,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:816
+#: lib/util.php:770 lib/util.php:816 lib/util.php:844
 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:828
+#: lib/util.php:782 lib/util.php:828 lib/util.php:856
 #, 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:824
+#: lib/util.php:778 lib/util.php:824 lib/util.php:852
 #, 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:820
+#: lib/util.php:774 lib/util.php:820 lib/util.php:848
 #, 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:832
+#: lib/util.php:786 lib/util.php:832 lib/util.php:860
 #, 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:826
+#: lib/util.php:780 lib/util.php:826 lib/util.php:854
 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:818
+#: lib/util.php:772 lib/util.php:818 lib/util.php:846
 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:830
+#: lib/util.php:784 lib/util.php:830 lib/util.php:858
 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:834
+#: lib/util.php:788 lib/util.php:834 lib/util.php:862
 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:822
+#: lib/util.php:776 lib/util.php:822 lib/util.php:850
 msgid "about an hour ago"
 msgstr ""
 
@@ -3241,7 +3268,9 @@ msgstr ""
 #: 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
+#: actions/userauthorization.php:52 actions/login.php:131
+#: actions/register.php:165 actions/avatarsettings.php:265
+#: lib/designsettings.php:294
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
@@ -3461,6 +3490,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
+#: actions/register.php:230
 msgid "Password must be 6 or more characters."
 msgstr ""
 
@@ -3999,13 +4029,13 @@ msgid "There was a problem with your session token. "
 msgstr ""
 
 #: actions/avatarsettings.php:303 actions/grouplogo.php:360
-#: actions/avatarsettings.php:308
+#: actions/avatarsettings.php:308 actions/avatarsettings.php:322
 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
+#: actions/grouplogo.php:377 actions/avatarsettings.php:337
 msgid "Lost our file data."
 msgstr ""
 
@@ -4468,7 +4498,7 @@ msgid "%s left group %s"
 msgstr ""
 
 #: actions/login.php:225 lib/facebookaction.php:304 actions/login.php:208
-#: actions/login.php:216
+#: actions/login.php:216 actions/login.php:243
 msgid "Login to site"
 msgstr ""
 
@@ -4647,7 +4677,8 @@ 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
+#: actions/register.php:398 actions/register.php:85 actions/register.php:189
+#: actions/register.php:404
 msgid "Sorry, only invited people can register."
 msgstr ""
 
@@ -4733,7 +4764,7 @@ msgstr ""
 #: 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
+#: lib/profilelist.php:230 lib/userprofile.php:177
 msgid "URL"
 msgstr ""
 
@@ -4744,7 +4775,7 @@ msgstr ""
 #: 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
+#: lib/profilelist.php:245 lib/userprofile.php:194
 msgid "Note"
 msgstr ""
 
@@ -4791,6 +4822,7 @@ msgid "Only the sender and recipient "
 msgstr ""
 
 #: actions/showstream.php:73 actions/showstream.php:78
+#: actions/showstream.php:79
 #, php-format
 msgid "%s, page %d"
 msgstr ""
@@ -4801,28 +4833,29 @@ msgstr ""
 
 #: actions/showstream.php:236 actions/tagother.php:77
 #: actions/showstream.php:220 actions/showstream.php:185
-#: actions/showstream.php:193
+#: actions/showstream.php:193 lib/userprofile.php:75
 msgid "User profile"
 msgstr ""
 
 #: actions/showstream.php:240 actions/tagother.php:81
 #: actions/showstream.php:224 actions/showstream.php:189
-#: actions/showstream.php:220
+#: actions/showstream.php:220 lib/userprofile.php:102
 msgid "Photo"
 msgstr ""
 
 #: actions/showstream.php:317 actions/showstream.php:309
 #: actions/showstream.php:274 actions/showstream.php:354
+#: lib/userprofile.php:236
 msgid "User actions"
 msgstr ""
 
 #: actions/showstream.php:342 actions/showstream.php:307
-#: actions/showstream.php:390
+#: actions/showstream.php:390 lib/userprofile.php:272
 msgid "Send a direct message to this user"
 msgstr ""
 
 #: actions/showstream.php:343 actions/showstream.php:308
-#: actions/showstream.php:391
+#: actions/showstream.php:391 lib/userprofile.php:273
 msgid "Message"
 msgstr ""
 
@@ -5525,7 +5558,7 @@ msgstr "%s e amigos"
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr ""
 
-#: actions/avatarsettings.php:373
+#: actions/avatarsettings.php:373 actions/avatarsettings.php:387
 #, fuzzy
 msgid "Avatar deleted."
 msgstr "Avatar actualizado."
@@ -5652,10 +5685,12 @@ msgid ""
 msgstr ""
 
 #: actions/register.php:432 actions/register.php:479 actions/register.php:489
+#: actions/register.php:495
 msgid "Creative Commons Attribution 3.0"
 msgstr ""
 
 #: actions/register.php:433 actions/register.php:480 actions/register.php:490
+#: actions/register.php:496
 #, fuzzy
 msgid ""
 " except this private data: password, email address, IM address, and phone "
@@ -5691,44 +5726,48 @@ msgid "%s's profile"
 msgstr ""
 
 #: actions/showstream.php:163 actions/showstream.php:128
+#: actions/showstream.php:129
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr ""
 
 #: actions/showstream.php:170 actions/showstream.php:135
+#: actions/showstream.php:136
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr ""
 
 #: actions/showstream.php:177 actions/showstream.php:142
+#: actions/showstream.php:143
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr ""
 
 #: actions/showstream.php:182 actions/showstream.php:147
+#: actions/showstream.php:148
 #, 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
+#: actions/showstream.php:234 lib/userprofile.php:116
 #, fuzzy
 msgid "Edit Avatar"
 msgstr "Avatar"
 
 #: actions/showstream.php:316 actions/showstream.php:281
-#: actions/showstream.php:366
+#: actions/showstream.php:366 lib/userprofile.php:248
 #, 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
+#: actions/showstream.php:367 lib/userprofile.php:249
 msgid "Edit"
 msgstr ""
 
 #: actions/showstream.php:542 actions/showstream.php:388
-#: actions/showstream.php:487
+#: actions/showstream.php:487 actions/showstream.php:234
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5774,6 +5813,9 @@ msgstr ""
 #: actions/apistatusesupdate.php:125 actions/apisubscriptions.php:87
 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#: actions/apiaccountupdateprofileimage.php:91
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apistatusesupdate.php:139
 msgid "No such user!"
 msgstr ""
 
@@ -5821,36 +5863,6 @@ msgid ""
 "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 ""
@@ -6020,6 +6032,7 @@ 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
+#: actions/showstream.php:202
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -6191,7 +6204,8 @@ 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
+#: lib/designsettings.php:461 lib/designsettings.php:434
+#: lib/designsettings.php:464
 #, fuzzy
 msgid "Couldn't update your design."
 msgstr "Não foi possível actualizar o utilizador."
@@ -6282,7 +6296,9 @@ msgid "Message sent"
 msgstr ""
 
 #: actions/newnotice.php:93 lib/designsettings.php:281
-#: actions/newnotice.php:94
+#: actions/newnotice.php:94 actions/apiaccountupdateprofileimage.php:97
+#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254
+#: lib/designsettings.php:283
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s bytes) due to its "
@@ -6446,7 +6462,7 @@ msgstr ""
 msgid "Password recover"
 msgstr ""
 
-#: actions/register.php:86
+#: actions/register.php:86 actions/register.php:92
 #, fuzzy
 msgid "Sorry, invalid invitation code."
 msgstr "Erro no código de confirmação."
@@ -6544,28 +6560,31 @@ msgstr ""
 msgid "Not a local notice"
 msgstr ""
 
-#: actions/showstream.php:72
+#: actions/showstream.php:72 actions/showstream.php:73
 #, php-format
 msgid " tagged %s"
 msgstr ""
 
-#: actions/showstream.php:121
+#: actions/showstream.php:121 actions/showstream.php:122
 #, php-format
 msgid "Notice feed for %s tagged %s (RSS 1.0)"
 msgstr ""
 
 #: actions/showstream.php:350 actions/showstream.php:444
+#: actions/showstream.php:191
 #, 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
+#: actions/showstream.php:196
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
 msgstr ""
 
 #: actions/showstream.php:357 actions/showstream.php:451
+#: actions/showstream.php:198
 #, php-format
 msgid ""
 "You can try to nudge %s or [post something to his or her attention](%%%%"
@@ -6573,6 +6592,7 @@ msgid ""
 msgstr ""
 
 #: actions/showstream.php:393 actions/showstream.php:492
+#: actions/showstream.php:239
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -6717,6 +6737,7 @@ msgid "Problem saving notice. Too long."
 msgstr ""
 
 #: classes/User.php:319 classes/User.php:327 classes/User.php:334
+#: classes/User.php:333
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr ""
@@ -6823,10 +6844,12 @@ msgid "Save design"
 msgstr ""
 
 #: lib/designsettings.php:378 lib/designsettings.php:369
+#: lib/designsettings.php:372
 msgid "Bad default color settings: "
 msgstr ""
 
 #: lib/designsettings.php:474 lib/designsettings.php:465
+#: lib/designsettings.php:468
 msgid "Design defaults restored."
 msgstr ""
 
@@ -7027,16 +7050,18 @@ msgid "Status deleted."
 msgstr "Avatar actualizado."
 
 #: actions/apistatusesupdate.php:132
+#: actions/apiaccountupdateprofileimage.php:99
 msgid "Unable to handle that much POST data!"
 msgstr ""
 
 #: actions/apistatusesupdate.php:145 actions/newnotice.php:155
-#: scripts/maildaemon.php:71
+#: scripts/maildaemon.php:71 actions/apistatusesupdate.php:152
 #, php-format
 msgid "That's too long. Max notice size is %d chars."
 msgstr ""
 
 #: actions/apistatusesupdate.php:209 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:216
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
@@ -7095,7 +7120,7 @@ msgstr ""
 msgid "IM is not available."
 msgstr ""
 
-#: actions/login.php:259
+#: actions/login.php:259 actions/login.php:286
 #, fuzzy, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -7130,21 +7155,24 @@ msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
 msgstr ""
 
 #: actions/profilesettings.php:122 actions/register.php:454
+#: actions/register.php:460
 #, 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
+#: actions/register.php:463
 #, 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
+#: actions/register.php:223
 #, fuzzy, php-format
 msgid "Bio is too long (max %d chars)."
 msgstr "Bio é demasiada extensa (máx 140 car)."
 
-#: actions/register.php:336
+#: actions/register.php:336 actions/register.php:342
 msgid ""
 "With this form you can create  a new account. You can then post notices and "
 "link up to friends and colleagues. "
@@ -7213,7 +7241,6 @@ msgid "FOAF for %s group"
 msgstr "Feed para a tag %s"
 
 #: actions/shownotice.php:90
-#, fuzzy
 msgid "Notice deleted."
 msgstr "Avatar actualizado."
 
@@ -7336,41 +7363,6 @@ msgstr "Não é possível remover a mensagem."
 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. "
@@ -7470,3 +7462,59 @@ msgstr "Não foi possível actualizar o utilizador."
 #, fuzzy
 msgid "Duplicate notice"
 msgstr "Apagar mensagem"
+
+#: actions/login.php:110 actions/login.php:120
+#, fuzzy
+msgid "Invalid or expired token."
+msgstr "Conteúdo da mensagem inválido"
+
+#: lib/command.php:597
+#, fuzzy, php-format
+msgid "Could not create login token for %s"
+msgstr "Não foi possível criar o formulário de OpenID: %s"
+
+#: lib/command.php:602
+#, php-format
+msgid "This link is useable only once, and is good for only 2 minutes: %s"
+msgstr ""
+
+#: lib/imagefile.php:75
+#, php-format
+msgid "That file is too big. The maximum file size is %s."
+msgstr ""
+
+#: lib/command.php:613
+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"
+"login - Get a link to login to the web interface\n"
+"drop <group> - leave group\n"
+"stats - get your stats\n"
+"stop - same as 'off'\n"
+"quit - same as 'off'\n"
+"sub <nickname> - same as 'follow'\n"
+"unsub <nickname> - same as 'leave'\n"
+"last <nickname> - same as 'get'\n"
+"on <nickname> - not yet implemented.\n"
+"off <nickname> - not yet implemented.\n"
+"nudge <nickname> - remind a user to update.\n"
+"invite <phone number> - not yet implemented.\n"
+"track <word> - not yet implemented.\n"
+"untrack <word> - not yet implemented.\n"
+"track off - not yet implemented.\n"
+"untrack all - not yet implemented.\n"
+"tracks - not yet implemented.\n"
+"tracking - not yet implemented.\n"
+msgstr ""
diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.mo b/locale/pt_BR/LC_MESSAGES/statusnet.mo
index 4cf5ea13c..a751a2de4 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 41a6d08cd..b0ac2731e 100644
--- a/locale/pt_BR/LC_MESSAGES/statusnet.po
+++ b/locale/pt_BR/LC_MESSAGES/statusnet.po
@@ -5,13 +5,14 @@
 # Frederico Goncalves Guimaraes <frederico@teia.bio.br>, 2009.
 msgid ""
 msgstr ""
-""
 "Project-Id-Version: StatusNet\n"
-"PO-Revision-Date: 2009-11-06 12:24:14+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-11-08 11:53+0000\n"
+"PO-Revision-Date: 2009-11-08 11:57:06+0000\n"
 "Language-Team: Brazilian Portuguese\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r58634); Translate extension (2009-08-03)\n"
+"X-Generator: MediaWiki 1.16alpha(r58760); 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"
@@ -25,8 +26,11 @@ 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: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."
+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
@@ -48,8 +52,60 @@ msgstr "%1$s convidou você para se juntar ao %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\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"
+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"
 
 #: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
 #: lib/mail.php:236 lib/mail.php:235
@@ -59,8 +115,20 @@ 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	%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"
+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"
 
 #: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
 #: actions/twitapistatuses.php:350 actions/twitapistatuses.php:367
@@ -135,15 +203,23 @@ msgid "%s updates from everyone!"
 msgstr "%s atualizações de todo mundo!"
 
 #: ../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.)"
+#: actions/register.php:545 actions/register.php:555 actions/register.php:561
+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/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/action.php:704
 #: lib/action.php:754 lib/action.php:769
@@ -153,7 +229,8 @@ 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
@@ -165,8 +242,10 @@ 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
+#: actions/register.php:424
 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:108
@@ -181,23 +260,38 @@ 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:419 actions/register.php:423
+#: actions/register.php:429
 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
 #: 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."
+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
@@ -347,7 +441,7 @@ msgstr "Todas as atualizações correspondentes ao termo \"%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
+#: actions/login.php:79 actions/register.php:137
 msgid "Already logged in."
 msgstr "Já está logado."
 
@@ -370,14 +464,17 @@ msgstr "Autorizar a assinatura"
 #: ../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
+#: actions/register.php:473 actions/login.php:253 actions/register.php:479
 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
 #: actions/profilesettings.php:144 actions/profilesettings.php:145
 #: actions/profilesettings.php:160
-msgid "Automatically subscribe to whoever subscribes to me (best for non-humans)"
+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
@@ -391,19 +488,29 @@ msgstr "Avatar"
 
 #: ../actions/avatar.php:113 actions/profilesettings.php:350
 #: actions/avatarsettings.php:395 actions/avatarsettings.php:346
+#: actions/avatarsettings.php:360
 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
 #: 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."
+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:123
@@ -418,7 +525,7 @@ msgstr "Anteriores »"
 #: 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
+#: actions/register.php:459 actions/register.php:465
 msgid "Bio"
 msgstr "Descrição"
 
@@ -447,6 +554,7 @@ msgstr "Não é possível ler a URL '%s' do avatar"
 #: actions/passwordsettings.php:169 actions/recoverpassword.php:347
 #: actions/passwordsettings.php:174 actions/recoverpassword.php:365
 #: actions/passwordsettings.php:180 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:185
 msgid "Can't save new password."
 msgstr "Não é possível salvar a nova senha."
 
@@ -509,6 +617,7 @@ msgstr "Alterar as suas configurações de perfil"
 #: actions/recoverpassword.php:236 actions/register.php:422
 #: actions/passwordsettings.php:111 actions/recoverpassword.php:239
 #: actions/register.php:426 actions/smssettings.php:134
+#: actions/register.php:432
 msgid "Confirm"
 msgstr "Confirmar"
 
@@ -538,10 +647,38 @@ msgid "Confirmation code not found."
 msgstr "O código de confirmação não foi encontrado."
 
 #: ../actions/register.php:202 actions/register.php:473
-#: actions/register.php:521 actions/register.php:531
+#: actions/register.php:521 actions/register.php:531 actions/register.php:537
 #, 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\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."
+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."
 
 #: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
 #: actions/finishopenidlogin.php:119 lib/action.php:330 lib/action.php:403
@@ -608,12 +745,14 @@ 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
@@ -748,6 +887,7 @@ 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
+#: classes/Notice.php:1120
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Erro no banco de dados na inserção da reposta: %s"
@@ -770,7 +910,8 @@ msgstr "Descreva a si mesmo e seus interesses em 140 caracteres."
 #: 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
+#: lib/accountsettingsaction.php:117 actions/register.php:437
+#: actions/register.php:441
 msgid "Email"
 msgstr "E-mail"
 
@@ -785,7 +926,7 @@ 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
+#: actions/register.php:200 actions/register.php:206 actions/register.php:212
 msgid "Email address already exists."
 msgstr "O endereço de e-mail já existe."
 
@@ -871,7 +1012,7 @@ msgstr "Erro ao salvar o usuário."
 
 #: ../actions/password.php:80 actions/profilesettings.php:399
 #: actions/passwordsettings.php:164 actions/passwordsettings.php:169
-#: actions/passwordsettings.php:175
+#: actions/passwordsettings.php:175 actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "Erro ao salvar usuário; inválido."
 
@@ -883,6 +1024,7 @@ msgstr "Erro ao salvar usuário; inválido."
 #: actions/login.php:120 actions/recoverpassword.php:372
 #: actions/register.php:235 actions/login.php:122
 #: actions/recoverpassword.php:375 actions/register.php:242
+#: actions/login.php:149 actions/register.php:248
 msgid "Error setting user."
 msgstr "Erro na configuração do usuário."
 
@@ -914,6 +1056,7 @@ msgstr "FAQ"
 
 #: ../actions/avatar.php:115 actions/profilesettings.php:352
 #: actions/avatarsettings.php:397 actions/avatarsettings.php:349
+#: actions/avatarsettings.php:363
 msgid "Failed updating avatar."
 msgstr "Não foi possível atualizar o avatar."
 
@@ -948,8 +1091,13 @@ msgid "Find people on this site"
 msgstr "Procure por pessoas neste site"
 
 #: ../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/login.php:282
+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
@@ -961,6 +1109,7 @@ msgstr "Por razões de segurança, por favor, digite novamente seu nome de usuá
 #: actions/showstream.php:220 lib/groupeditform.php:157
 #: actions/profilesettings.php:111 actions/register.php:441
 #: actions/showgroup.php:247 actions/showstream.php:267
+#: actions/register.php:447 lib/userprofile.php:149
 msgid "Full name"
 msgstr "Nome completo"
 
@@ -974,7 +1123,7 @@ msgstr "Nome completo"
 #: 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
+#: actions/register.php:214 actions/register.php:220
 msgid "Full name is too long (max 255 chars)."
 msgstr "O nome completo é muito extenso (máx. 255 caracteres)"
 
@@ -995,7 +1144,7 @@ msgstr "Início"
 #: 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
+#: actions/register.php:446 actions/register.php:452
 msgid "Homepage"
 msgstr "Site"
 
@@ -1007,7 +1156,7 @@ msgstr "Site"
 #: 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
+#: actions/register.php:211 actions/register.php:217
 msgid "Homepage is not a valid URL."
 msgstr "A URL do site informada não é válida."
 
@@ -1034,16 +1183,28 @@ msgstr "Configurações do IM"
 
 #: ../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 você já possui uma conta, utilize seu nome de usuário e senha para conectá-la ao seu OpenID."
+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 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\"."
+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 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."
+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
@@ -1067,14 +1228,18 @@ msgstr "A senha antiga está incorreta"
 
 #: ../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
+#: actions/facebookhome.php:129 actions/login.php:116 actions/login.php:143
 msgid "Incorrect username or password."
 msgstr "Nome de usuário e/ou senha incorreto(s)."
 
 #: ../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."
+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:120
@@ -1143,6 +1308,7 @@ msgstr "Tamanho inválido."
 #: 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
+#: actions/register.php:243 actions/register.php:264
 msgid "Invalid username or password."
 msgstr "Nome de usuário e/ou senha inválido(s)"
 
@@ -1170,8 +1336,14 @@ msgstr "Convidar novos usuários"
 #: ../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:302
@@ -1181,8 +1353,13 @@ 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:129
@@ -1209,7 +1386,7 @@ msgstr "O nome do idioma é muito extenso (máx. 50 caracteres)."
 #: 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
+#: lib/profilelist.php:218 actions/register.php:470 lib/userprofile.php:164
 msgid "Location"
 msgstr "Localização"
 
@@ -1223,7 +1400,7 @@ msgstr "Localização"
 #: 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
+#: actions/register.php:221 actions/register.php:227
 msgid "Location is too long (max 255 chars)."
 msgstr "A localização é muito extensa (máx. 255 caracteres)."
 
@@ -1237,6 +1414,7 @@ msgstr "A localização é muito extensa (máx. 255 caracteres)."
 #: 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
+#: actions/login.php:204 actions/login.php:257
 #, php-format
 msgid "Login"
 msgstr "Logar"
@@ -1249,8 +1427,14 @@ msgstr "Logar-se com uma conta [OpenID](%%doc.openid%%)."
 
 #: ../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/action.php:409
 #: lib/action.php:435 lib/action.php:445
@@ -1259,12 +1443,13 @@ msgstr "Sair"
 
 #: ../actions/register.php:166 actions/register.php:180
 #: actions/register.php:393 actions/register.php:439 actions/register.php:443
+#: actions/register.php:449
 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 actions/login.php:228 lib/facebookaction.php:325
-#: lib/facebookaction.php:327 actions/login.php:236
+#: lib/facebookaction.php:327 actions/login.php:236 actions/login.php:263
 msgid "Lost or forgotten password?"
 msgstr "Perdeu ou esqueceu sua senha?"
 
@@ -1295,14 +1480,19 @@ msgstr "Microblog por %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 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
+#: actions/register.php:477 actions/register.php:487 actions/register.php:493
 msgid "My text and files are available under "
 msgstr "Meus textos e arquivos estão disponíveis sob "
 
@@ -1323,7 +1513,8 @@ msgstr "Novo endereço de e-mail para postar para %s"
 #: 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:98
@@ -1346,7 +1537,8 @@ msgstr "Nova senha"
 #: ../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
@@ -1360,7 +1552,8 @@ msgstr "A nova senha foi salva com sucesso. A partir de agora você já está lo
 #: 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
+#: actions/showgroup.php:236 actions/showstream.php:249 actions/login.php:246
+#: actions/register.php:423 lib/userprofile.php:131
 msgid "Nickname"
 msgstr "Apelido"
 
@@ -1374,7 +1567,7 @@ msgstr "Apelido"
 #: 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
+#: actions/register.php:202 actions/register.php:208
 msgid "Nickname already in use. Try another one."
 msgstr "Este apelido já está em uso. Tente outro."
 
@@ -1390,9 +1583,11 @@ msgstr "Este apelido já está em uso. Tente outro."
 #: 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
+#: actions/register.php:199 actions/register.php:205
 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:226
@@ -1607,7 +1802,9 @@ msgstr "Usuário não encontrado."
 #: 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!"
@@ -1629,7 +1826,8 @@ msgstr "Não é um usuário registrado."
 #: 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
+#: lib/api.php:954 lib/api.php:982 lib/api.php:1092 lib/api.php:963
+#: lib/api.php:991 lib/api.php:1101
 msgid "Not a supported data format."
 msgstr "Formato de dados não suportado."
 
@@ -1650,7 +1848,7 @@ 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
+#: actions/register.php:189 actions/register.php:195 actions/register.php:201
 msgid "Not a valid email address."
 msgstr "Não é um endereço de e-mail válido."
 
@@ -1662,7 +1860,7 @@ msgstr "Não é um endereço de e-mail válido."
 #: 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
+#: actions/register.php:204 actions/register.php:210
 msgid "Not a valid nickname."
 msgstr "Não é um apelido válido."
 
@@ -1701,6 +1899,7 @@ msgstr "Não esperava por esta resposta!"
 #: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
 #: actions/twitapistatuses.php:309 actions/twitapistatuses.php:327
 #: actions/twitapistatuses.php:284 actions/apistatusesupdate.php:186
+#: actions/apistatusesupdate.php:193
 msgid "Not found"
 msgstr "Não encontrado"
 
@@ -1847,7 +2046,8 @@ msgstr "Envio parcial."
 #: 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
+#: lib/accountsettingsaction.php:114 actions/login.php:249
+#: actions/register.php:428
 msgid "Password"
 msgstr "Senha"
 
@@ -1876,6 +2076,7 @@ msgstr "Foi solicitada a recuperação da senha"
 #: actions/passwordsettings.php:173 actions/recoverpassword.php:200
 #: actions/passwordsettings.php:178 actions/recoverpassword.php:208
 #: actions/passwordsettings.php:184 actions/recoverpassword.php:211
+#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "A senha foi salva."
 
@@ -1884,6 +2085,7 @@ msgstr "A senha foi salva."
 #: actions/passwordsettings.php:145 actions/register.php:183
 #: actions/passwordsettings.php:150 actions/register.php:220
 #: actions/passwordsettings.php:156 actions/register.php:227
+#: actions/register.php:233
 msgid "Passwords don't match."
 msgstr "As senhas não coincidem."
 
@@ -1918,8 +2120,14 @@ 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:148
@@ -2041,19 +2249,19 @@ msgstr "Código de recuperação para usuário desconhecido."
 #: 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
+#: lib/logingroupnav.php:85 actions/register.php:114 actions/register.php:502
 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
+#: actions/register.php:129 actions/register.php:135
 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:106
+#: actions/register.php:67 actions/register.php:106 actions/register.php:112
 msgid "Registration successful"
 msgstr "Registro realizado com sucesso"
 
@@ -2067,6 +2275,7 @@ msgstr "Recusar"
 #: 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
+#: actions/login.php:252 actions/register.php:477
 msgid "Remember me"
 msgstr "Lembrar neste computador"
 
@@ -2102,8 +2311,12 @@ msgid "Remove OpenID"
 msgstr "Remover 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 "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."
+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
@@ -2161,6 +2374,7 @@ msgstr "Igual à senha acima"
 
 #: ../actions/register.php:156 actions/register.php:170
 #: actions/register.php:377 actions/register.php:423 actions/register.php:427
+#: actions/register.php:433
 msgid "Same as password above. Required."
 msgstr "Igual à senha acima. Obrigatório."
 
@@ -2199,13 +2413,22 @@ msgstr "Procurar no fluxo de mensagens"
 #: ../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 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: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:469
@@ -2240,13 +2463,19 @@ msgstr "Envie-me as mensagens 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 "Envie-me mensagens via SMS. Eu compreendo que isso pode gerar cobranças exorbitantes da minha operadora."
+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
@@ -2310,6 +2539,7 @@ msgstr "O OpenID armazenado não foi encontrado."
 #: actions/remotesubscribe.php:113 actions/showstream.php:376
 #: lib/subscribeform.php:139 actions/showstream.php:345
 #: actions/remotesubscribe.php:137 actions/showstream.php:439
+#: lib/userprofile.php:321
 msgid "Subscribe"
 msgstr "Assinar"
 
@@ -2356,6 +2586,7 @@ msgstr "Erro no sistema durante o envio do arquivo."
 #: actions/profilesettings.php:123 actions/showstream.php:255
 #: lib/subscriptionlist.php:106 lib/subscriptionlist.php:108
 #: actions/profilesettings.php:138 actions/showstream.php:327
+#: lib/userprofile.php:209
 msgid "Tags"
 msgstr "Tags"
 
@@ -2478,13 +2709,25 @@ msgstr "O endereço foi removido."
 
 #: ../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 é:"
+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 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."
+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
@@ -2510,7 +2753,8 @@ msgstr "Estas são as pessoas cujas mensagens você acompanha."
 
 #: ../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:"
+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:97
@@ -2518,14 +2762,24 @@ 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 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."
+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: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
@@ -2552,6 +2806,7 @@ msgstr "Este método requer POSTAGEM ou EXCLUSÃO."
 #: actions/apifriendshipsdestroy.php:91 actions/apigroupcreate.php:104
 #: actions/apigroupjoin.php:91 actions/apigroupleave.php:91
 #: actions/apistatusesupdate.php:109
+#: actions/apiaccountupdateprofileimage.php:84
 msgid "This method requires a POST."
 msgstr "Este método requer um POST."
 
@@ -2574,12 +2829,19 @@ msgstr "O fuso horário não foi selecionado."
 #: ../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:139
-#: actions/apifriendshipsexists.php:103
+#: actions/apifriendshipsexists.php:103 actions/apifriendshipsexists.php:94
 msgid "Two user ids or screen_names must be supplied."
 msgstr "Duas IDs de usuário ou screen_names devem ser informados."
 
@@ -2587,7 +2849,7 @@ msgstr "Duas IDs de usuário ou screen_names devem ser informados."
 #: 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
+#: actions/register.php:448 actions/register.php:454
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "URL do seu site, blog ou perfil em outro site"
 
@@ -2609,6 +2871,7 @@ msgstr "URL do seu perfil em outro serviço de microblogagem compatível"
 #: actions/twittersettings.php:322 lib/designsettings.php:301
 #: actions/emailsettings.php:255 actions/grouplogo.php:319
 #: actions/imsettings.php:220 actions/smssettings.php:248
+#: actions/avatarsettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "Submissão inesperada de formulário."
 
@@ -2629,8 +2892,12 @@ 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
@@ -2691,8 +2958,16 @@ 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"
@@ -2700,13 +2975,16 @@ msgstr "Envie uma nova imagem para o seu 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 "Use esse formulário para convidar seus amigos e colegas para usar este serviço."
+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:382
 #: actions/register.php:386 actions/register.php:428 actions/register.php:432
-#: actions/register.php:436
+#: actions/register.php:436 actions/register.php:438 actions/register.php:442
 msgid "Used only for updates, announcements, and password recovery"
 msgstr "Usado apenas para atualizações, anúncios e recuperações de senha"
 
@@ -2734,7 +3012,8 @@ msgstr "O usuário que está está sendo acompanhado não existe."
 #: 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
+#: actions/apiusershow.php:108 actions/apiaccountupdateprofileimage.php:124
+#: actions/apiaccountupdateprofileimage.php:130
 msgid "User has no profile."
 msgstr "O usuário não tem perfil."
 
@@ -2763,7 +3042,7 @@ msgstr "E aí, %s?"
 #: 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
+#: actions/register.php:466 actions/register.php:472
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Onde você está, ex: \"cidade, estado (ou região), país\""
 
@@ -2794,8 +3073,12 @@ 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
@@ -2827,19 +3110,29 @@ 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 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\"."
+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 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ê."
+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
@@ -2852,7 +3145,7 @@ 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/register.php:149
-#: actions/register.php:186 actions/register.php:192
+#: actions/register.php:186 actions/register.php:192 actions/register.php:198
 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."
 
@@ -2863,8 +3156,24 @@ msgstr "Você não nos enviou esse perfil"
 
 #: ../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\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"
+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"
 
 #: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
 #: actions/twitapistatuses.php:463 actions/twitapistatuses.php:486
@@ -2880,8 +3189,12 @@ 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
 #: 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!"
+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:158
 msgid "You've been identified. Enter a  new password below. "
@@ -2899,60 +3212,64 @@ msgstr "Seu apelido neste servidor, ou seu e-mail registrado."
 
 #: ../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:756
-#: lib/util.php:770 lib/util.php:816
+#: lib/util.php:770 lib/util.php:816 lib/util.php:844
 msgid "a few seconds ago"
 msgstr "segundos atrás"
 
 #: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957 lib/util.php:768
-#: lib/util.php:782 lib/util.php:828
+#: lib/util.php:782 lib/util.php:828 lib/util.php:856
 #, 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:764
-#: lib/util.php:778 lib/util.php:824
+#: lib/util.php:778 lib/util.php:824 lib/util.php:852
 #, 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:760
-#: lib/util.php:774 lib/util.php:820
+#: lib/util.php:774 lib/util.php:820 lib/util.php:848
 #, 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:772
-#: lib/util.php:786 lib/util.php:832
+#: lib/util.php:786 lib/util.php:832 lib/util.php:860
 #, 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:766
-#: lib/util.php:780 lib/util.php:826
+#: lib/util.php:780 lib/util.php:826 lib/util.php:854
 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:758
-#: lib/util.php:772 lib/util.php:818
+#: lib/util.php:772 lib/util.php:818 lib/util.php:846
 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:770
-#: lib/util.php:784 lib/util.php:830
+#: lib/util.php:784 lib/util.php:830 lib/util.php:858
 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:774
-#: lib/util.php:788 lib/util.php:834
+#: lib/util.php:788 lib/util.php:834 lib/util.php:862
 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:762
-#: lib/util.php:776 lib/util.php:822
+#: lib/util.php:776 lib/util.php:822 lib/util.php:850
 msgid "about an hour ago"
 msgstr "1 hora atrás"
 
@@ -3021,9 +3338,12 @@ msgstr "« Posteriores"
 #: 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
+#: actions/userauthorization.php:52 actions/login.php:131
+#: actions/register.php:165 actions/avatarsettings.php:265
+#: lib/designsettings.php:294
 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!"
@@ -3041,7 +3361,9 @@ msgstr "Tornar favorita"
 #: 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
@@ -3092,12 +3414,18 @@ 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
@@ -3139,8 +3467,11 @@ msgstr "Você não pode enviar uma mensagem para esse usuário."
 #: 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."
+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:114
@@ -3186,12 +3517,17 @@ 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 "
@@ -3237,13 +3573,18 @@ 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
+#: actions/register.php:230
 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 "
@@ -3339,7 +3680,9 @@ msgstr "O usuário destinatário não foi encontrado."
 #: 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
@@ -3366,12 +3709,19 @@ 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
@@ -3418,8 +3768,12 @@ msgstr "Assinar meus amigos do Twitter aqui."
 
 #: 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 (_)."
+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
@@ -3553,7 +3907,8 @@ msgstr "Sobre: %s"
 #: 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 lib/command.php:245
 #: actions/newmessage.php:182 lib/command.php:238 actions/newmessage.php:185
@@ -3634,8 +3989,12 @@ 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:509
 #, php-format
@@ -3644,8 +4003,12 @@ 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:91
 msgid "Only the user can read their own mailboxes."
@@ -3764,13 +4127,13 @@ 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
+#: actions/avatarsettings.php:308 actions/avatarsettings.php:322
 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
+#: actions/grouplogo.php:377 actions/avatarsettings.php:337
 msgid "Lost our file data."
 msgstr "Nossos dados do arquivo foi perdido."
 
@@ -3834,6 +4197,13 @@ msgstr "Adicionar aos favoritos"
 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
+#: 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
@@ -3916,7 +4286,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:109
 msgid "Server error - couldn't get user!"
@@ -4002,7 +4374,9 @@ 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."
@@ -4010,7 +4384,8 @@ 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."
@@ -4064,16 +4439,29 @@ 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:96
 msgid "That user has blocked you from subscribing."
 msgstr "Esse usuário bloqueou o seu pedido de assinatura."
 
+#: 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 "Logo do grupo"
 
+#: 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
@@ -4086,6 +4474,36 @@ msgstr "O avatar foi atualizado."
 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 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/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
 #: actions/usergroups.php:125 actions/groups.php:107 lib/groupeditform.php:122
 #, fuzzy
@@ -4093,9 +4511,12 @@ msgid "Create a new group"
 msgstr "Criar uma nova conta"
 
 #: actions/groupsearch.php:57
-#, 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. "
+#, 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. "
 
 #: actions/groupsearch.php:63 actions/groupsearch.php:58
 #, fuzzy
@@ -4107,20 +4528,26 @@ 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
-#, php-format, fuzzy
+#, fuzzy, php-format
 msgid "A confirmation code was sent "
 msgstr "Nenhum código de confirmação."
 
 #: 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:90 lib/command.php:217
 #, fuzzy
@@ -4128,19 +4555,24 @@ msgid "You are already a member of that group"
 msgstr "Você já está assinando esses usuários:"
 
 #: actions/joingroup.php:128 actions/joingroup.php:133 lib/command.php:234
-#, php-format, fuzzy
+#, fuzzy, php-format
 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 actions/joingroup.php:140 lib/command.php:239
-#, php-format, fuzzy
+#, fuzzy, php-format
 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: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/groupblock.php:86
 #: actions/groupunblock.php:86 actions/makeadmin.php:86
@@ -4168,14 +4600,29 @@ msgstr "Não foi possível atualizar o registro do usuário."
 
 #: actions/leavegroup.php:138 actions/leavegroup.php:132
 #: actions/leavegroup.php:127 lib/command.php:284
-#, php-format, fuzzy
+#, fuzzy, php-format
 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 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 actions/login.php:243
+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:110
 #, fuzzy
 msgid "Use this form to create a new group."
@@ -4215,8 +4662,11 @@ 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"
@@ -4295,8 +4745,11 @@ msgstr "Perfil desconhecido"
 
 #: 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"
+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
@@ -4317,7 +4770,7 @@ msgstr "Não foi possível salvar as etiquetas."
 
 #: actions/public.php:107 actions/public.php:110 actions/public.php:118
 #: actions/public.php:129
-#, php-format, fuzzy
+#, fuzzy, php-format
 msgid "Public timeline, page %d"
 msgstr "Mensagens públicas"
 
@@ -4328,17 +4781,31 @@ 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 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
+#: actions/register.php:398 actions/register.php:85 actions/register.php:189
+#: actions/register.php:404
 msgid "Sorry, only invited people can register."
 msgstr "Desculpe, somente convidados podem se registrar."
 
@@ -4380,12 +4847,16 @@ 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
-#, php-format, fuzzy
+#, fuzzy, php-format
 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
@@ -4398,21 +4869,42 @@ msgstr "Esse é um perfil local! Autentique-se para assinar."
 
 #: actions/replies.php:118 actions/replies.php:120 actions/replies.php:119
 #: actions/replies.php:127
-#, php-format, fuzzy
+#, fuzzy, php-format
 msgid "Replies to %s, page %d"
 msgstr "Respostas para %s"
 
 #: actions/showfavorites.php:79
-#, php-format, fuzzy
+#, fuzzy, php-format
 msgid "%s favorite notices, page %d"
 msgstr "Mensagens favoritas de %s"
 
+#: 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 "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
+#: 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 lib/userprofile.php:177
+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
@@ -4420,7 +4912,7 @@ msgstr "Esse perfil não existe."
 #: 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
+#: lib/profilelist.php:245 lib/userprofile.php:194
 #, fuzzy
 msgid "Note"
 msgstr "Mensagens"
@@ -4432,7 +4924,7 @@ msgid "Group actions"
 msgstr "Outras opções"
 
 #: actions/showgroup.php:323 actions/showgroup.php:304
-#, php-format, fuzzy
+#, fuzzy, php-format
 msgid "Notice feed for %s group"
 msgstr "Mensagens de %s"
 
@@ -4454,10 +4946,19 @@ msgstr "Membro desde"
 msgid "(None)"
 msgstr "(nenhum)"
 
+#: 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, 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)"
+#, 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)"
 
 #: actions/showmessage.php:98
 #, fuzzy
@@ -4465,7 +4966,8 @@ msgid "Only the sender and recipient "
 msgstr "Apenas o remetente e o destinatário podem ler essa mensagem."
 
 #: actions/showstream.php:73 actions/showstream.php:78
-#, php-format, fuzzy
+#: actions/showstream.php:79
+#, fuzzy, php-format
 msgid "%s, page %d"
 msgstr "Recebidas por %s - pág. %d"
 
@@ -4476,25 +4978,32 @@ msgstr "Perfil"
 
 #: actions/showstream.php:236 actions/tagother.php:77
 #: actions/showstream.php:220 actions/showstream.php:185
-#: actions/showstream.php:193
+#: actions/showstream.php:193 lib/userprofile.php:75
 #, fuzzy
 msgid "User profile"
 msgstr "O usuário não tem perfil."
 
+#: actions/showstream.php:240 actions/tagother.php:81
+#: actions/showstream.php:224 actions/showstream.php:189
+#: actions/showstream.php:220 lib/userprofile.php:102
+msgid "Photo"
+msgstr ""
+
 #: actions/showstream.php:317 actions/showstream.php:309
 #: actions/showstream.php:274 actions/showstream.php:354
+#: lib/userprofile.php:236
 #, fuzzy
 msgid "User actions"
 msgstr "Outras opções"
 
 #: actions/showstream.php:342 actions/showstream.php:307
-#: actions/showstream.php:390
+#: actions/showstream.php:390 lib/userprofile.php:272
 #, 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:308
-#: actions/showstream.php:391
+#: actions/showstream.php:391 lib/userprofile.php:273
 #, fuzzy
 msgid "Message"
 msgstr "Nova mensagem"
@@ -4504,10 +5013,18 @@ msgstr "Nova mensagem"
 msgid "All subscribers"
 msgstr "Assinantes"
 
+#: actions/showstream.php:533 lib/profileaction.php:235
+msgid "All groups"
+msgstr ""
+
 #: actions/showstream.php:542
-#, 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)"
+#, 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)"
 
 #: actions/smssettings.php:128
 #, fuzzy
@@ -4546,17 +5063,22 @@ msgid "Subscribed"
 msgstr "Assinado"
 
 #: actions/subscribers.php:50
-#, php-format, fuzzy
+#, fuzzy, php-format
 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
-#, php-format, fuzzy
+#, fuzzy, php-format
 msgid "These are the people who "
 msgstr "Estas são as pessoas que acompanham as mensagens de %s."
 
@@ -4576,7 +5098,7 @@ msgid "These are the people whose notices "
 msgstr "Estas são as pessoas cujas mensagens %s acompanha."
 
 #: actions/subscriptions.php:69
-#, php-format, fuzzy
+#, fuzzy, php-format
 msgid "These are the people whose "
 msgstr "Estas são as pessoas que acompanham as mensagens de %s."
 
@@ -4586,10 +5108,15 @@ msgid "Jabber"
 msgstr "Jabber"
 
 #: actions/tag.php:43 actions/tag.php:51 actions/tag.php:59 actions/tag.php:68
-#, php-format, fuzzy
+#, fuzzy, php-format
 msgid "Notices tagged with %s, page %d"
 msgstr "Mensagens etiquetadas com %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 "Você não está autenticado"
@@ -4609,15 +5136,21 @@ msgid "Tag user"
 msgstr "Etiquetas"
 
 #: 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"
+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 actions/tagother.php:193
-msgid "You can only tag people you are subscribed to or who are subscribed to you."
+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:200
@@ -4626,7 +5159,9 @@ msgstr "Não foi possível salvar as etiquetas."
 
 #: 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."
@@ -4654,7 +5189,9 @@ 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:122
 msgid "Twitter user name"
@@ -4712,8 +5249,11 @@ msgstr "Problema no salvamento da mensagem. Usuário desconhecido."
 
 #: 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."
+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:145 classes/Notice.php:161
 #: classes/Notice.php:202
@@ -4792,6 +5332,10 @@ msgstr "Ajuda"
 msgid "Site notice"
 msgstr "Nova mensagem"
 
+#: 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"
@@ -4802,6 +5346,11 @@ msgstr "Nova mensagem"
 msgid "Secondary site navigation"
 msgstr "Navegação pelas assinaturas"
 
+#: 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 "
@@ -4888,7 +5437,8 @@ msgstr "Descreva o grupo ou tópico em 140 caracteres."
 
 #: 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\""
+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
@@ -4952,8 +5502,12 @@ 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
@@ -4972,8 +5526,12 @@ msgstr "Site: %s\n"
 
 #: 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:462
 #, php-format
@@ -5141,17 +5699,17 @@ msgid "Unsubscribe from this user"
 msgstr "Cancelar a assinatura deste usuário"
 
 #: actions/all.php:77 actions/all.php:59 actions/all.php:99
-#, php-format, fuzzy
+#, 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
-#, php-format, fuzzy
+#, 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
-#, php-format, fuzzy
+#, fuzzy, php-format
 msgid "Feed for friends of %s (Atom)"
 msgstr "Feed para os amigos de %s"
 
@@ -5161,44 +5719,96 @@ msgid "You and friends"
 msgstr "%s e amigos"
 
 #: actions/avatarsettings.php:78
-#, php-format, fuzzy
+#, fuzzy, php-format
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr "Você pode enviar seu avatar pessoal."
 
-#: actions/avatarsettings.php:373
+#: actions/avatarsettings.php:373 actions/avatarsettings.php:387
 #, fuzzy
 msgid "Avatar deleted."
 msgstr "O avatar foi atualizado."
 
+#: 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 "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/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."
+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/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
 #, 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
+#, fuzzy, php-format
 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."
+#, 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 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/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
@@ -5206,14 +5816,18 @@ 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
+#, fuzzy, php-format
 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."
+#, 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, 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
@@ -5230,10 +5844,37 @@ msgstr "Feed de mensagens públicas"
 msgid "Public Stream Feed (Atom)"
 msgstr "Feed de mensagens públicas"
 
+#: 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
+#: actions/register.php:495
+msgid "Creative Commons Attribution 3.0"
+msgstr ""
+
 #: actions/register.php:433 actions/register.php:480 actions/register.php:490
+#: actions/register.php:496
 #, 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."
+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
@@ -5241,52 +5882,105 @@ msgstr " exceto estes dados privados: senha, endereço de e-mail, endereço de I
 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
 #, fuzzy
 msgid "Your profile"
 msgstr "Esse perfil não existe."
 
 #: actions/showstream.php:149
-#, php-format, fuzzy
+#, fuzzy, php-format
 msgid "%s's profile"
 msgstr "Perfil"
 
 #: actions/showstream.php:163 actions/showstream.php:128
-#, php-format, fuzzy
+#: actions/showstream.php:129
+#, fuzzy, php-format
 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
+#: actions/showstream.php:136
+#, fuzzy, php-format
 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
+#: actions/showstream.php:143
+#, fuzzy, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "Feed de mensagens de %s"
 
 #: actions/showstream.php:182 actions/showstream.php:147
-#, php-format, fuzzy
+#: actions/showstream.php:148
+#, fuzzy, php-format
 msgid "FOAF for %s"
 msgstr "Envidas para %s"
 
 #: actions/showstream.php:237 actions/showstream.php:202
-#: actions/showstream.php:234
+#: actions/showstream.php:234 lib/userprofile.php:116
 #, fuzzy
 msgid "Edit Avatar"
 msgstr "Avatar"
 
 #: actions/showstream.php:316 actions/showstream.php:281
-#: actions/showstream.php:366
+#: actions/showstream.php:366 lib/userprofile.php:248
 #, fuzzy
 msgid "Edit profile settings"
 msgstr "Configurações do perfil"
 
+#: actions/showstream.php:317 actions/showstream.php:282
+#: actions/showstream.php:367 lib/userprofile.php:249
+msgid "Edit"
+msgstr ""
+
+#: actions/showstream.php:542 actions/showstream.php:388
+#: actions/showstream.php:487 actions/showstream.php:234
+#, 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 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 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/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
@@ -5297,24 +5991,37 @@ msgstr "Um código de confirmação foi enviado para o número de telefone que v
 #: actions/apistatusesupdate.php:125 actions/apisubscriptions.php:87
 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#: actions/apiaccountupdateprofileimage.php:91
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apistatusesupdate.php:139
 #, 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, "
+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
+#, fuzzy, php-format
 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\"."
+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
@@ -5323,8 +6030,12 @@ 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."
+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
@@ -5336,21 +6047,189 @@ msgstr "Conectar por IM, SMS, Twitter"
 msgid "Badge"
 msgstr "Chamar a atenção"
 
+#: 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/dberroraction.php:60
+msgid "Database error"
+msgstr ""
+
 #: 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? "
+#, 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 a Aplicação do Facebook %s você precisa autenticar-se"
 
+#: 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, 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"
+#, 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 agora está acompanhando suas mensagens em %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"Cordialmente,\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 "Procurar"
 
+#: 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
+#: actions/showstream.php:202
+#, 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."
@@ -5367,15 +6246,19 @@ msgid "Block this user from this group"
 msgstr "Bloquear usuário"
 
 #: actions/blockedfromgroup.php:90
-#, php-format, fuzzy
+#, fuzzy, php-format
 msgid "%s blocked profiles"
 msgstr "O usuário não tem perfil."
 
 #: actions/blockedfromgroup.php:93
-#, php-format, fuzzy
+#, fuzzy, php-format
 msgid "%s blocked profiles, page %d"
 msgstr "%s e amigos, página %d"
 
+#: 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"
@@ -5391,26 +6274,56 @@ msgstr "Código de confirmação"
 msgid "Do not delete this notice"
 msgstr "Não é possível excluir esta 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
-#, php-format, fuzzy
+#, 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
-#, php-format, fuzzy
+#, fuzzy, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "Este apelido já está em uso. Tente 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 "Não foi possível criar a favorita."
 
+#: 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"
@@ -5421,6 +6334,14 @@ msgstr "Nova mensagem"
 msgid "No notice"
 msgstr "Nova mensagem"
 
+#: 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."
@@ -5432,6 +6353,10 @@ msgstr "Não é um apelido válido."
 msgid "No group specified."
 msgstr "Não foi especificado nenhum 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."
@@ -5448,6 +6373,18 @@ msgstr "Você não está assinando esse perfil."
 msgid "Block user from group"
 msgstr "Bloquear usuário"
 
+#: 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."
@@ -5458,10 +6395,17 @@ msgstr "Você deve estar logado para criar um grupo."
 msgid "Group design"
 msgstr "Outras opções"
 
+#: 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
+#: lib/designsettings.php:461 lib/designsettings.php:434
+#: lib/designsettings.php:464
 #, fuzzy
 msgid "Couldn't update your design."
 msgstr "Não foi possível atualizar o usuário."
@@ -5490,46 +6434,234 @@ msgstr "Você deve ser o administrador do grupo para editá-lo"
 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 "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 usuário bloqueou você."
 
+#: 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 "Nova mensagem"
 
+#: actions/newnotice.php:93 lib/designsettings.php:281
+#: actions/newnotice.php:94 actions/apiaccountupdateprofileimage.php:97
+#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254
+#: lib/designsettings.php:283
+#, php-format
+msgid ""
+"The server was unable to handle that much POST data (%s bytes) due to its "
+"current configuration."
+msgstr ""
+
+#: 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, 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."
+#, 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 ""
+"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:110 actions/othersettings.php:117
+msgid "Shorten URLs with"
+msgstr ""
 
 #: actions/othersettings.php:115 actions/othersettings.php:122
 #, fuzzy
 msgid "View profile designs"
 msgstr "Configurações do 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
-#, 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)"
+#, 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 ""
+"Este é %%site.name%%, um serviço de [micro-blogging](http://pt.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 você esqueceu ou perdeu sua senha, você pode receber uma nova no endereço de e-mail que armazenou em sua conta."
+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
@@ -5541,7 +6673,7 @@ msgstr "Você foi identificado. Informe uma nova senha abaixo."
 msgid "Password recover"
 msgstr "Foi solicitada a recuperação da senha"
 
-#: actions/register.php:86
+#: actions/register.php:86 actions/register.php:92
 #, fuzzy
 msgid "Sorry, invalid invitation code."
 msgstr "Erro com o código de confirmação."
@@ -5551,30 +6683,87 @@ msgstr "Erro com o código de confirmação."
 msgid "Subscribe to a remote user"
 msgstr "Assinar este usuário"
 
+#: 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, fuzzy
+#, fuzzy, php-format
 msgid "%s's favorite notices, page %d"
 msgstr "Mensagens favoritas 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
-#, php-format, fuzzy
+#, fuzzy, php-format
 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
+#, fuzzy, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "Mensagens de %s"
 
 #: actions/showgroup.php:337 actions/showgroup.php:340
-#, php-format, fuzzy
+#, fuzzy, php-format
 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)"
+#, 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 ""
+"Este é %%site.name%%, um serviço de [micro-blogging](http://pt.wikipedia.org/"
+"wiki/Microblogging)"
 
 #: actions/showgroup.php:474 actions/showgroup.php:482
 #, fuzzy
@@ -5586,34 +6775,89 @@ msgstr "Admin"
 msgid "Not a local notice"
 msgstr "Não é um usuário local."
 
-#: actions/showstream.php:72
-#, php-format, fuzzy
+#: actions/showstream.php:72 actions/showstream.php:73
+#, fuzzy, php-format
 msgid " tagged %s"
 msgstr "Mensagens etiquetadas com %s"
 
-#: actions/showstream.php:121
-#, php-format, fuzzy
+#: actions/showstream.php:121 actions/showstream.php:122
+#, fuzzy, php-format
 msgid "Notice feed for %s tagged %s (RSS 1.0)"
 msgstr "Mensagens de %s"
 
+#: actions/showstream.php:350 actions/showstream.php:444
+#: actions/showstream.php:191
+#, 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
+#: actions/showstream.php:196
+msgid ""
+"Seen anything interesting recently? You haven't posted any notices yet, now "
+"would be a good time to start :)"
+msgstr ""
+
+#: actions/showstream.php:357 actions/showstream.php:451
+#: actions/showstream.php:198
+#, 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, 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/showstream.php:239
+#, 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 ""
+"Este é %%site.name%%, um serviço de [micro-blogging](http://pt.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
-#, php-format, fuzzy
+#, fuzzy, php-format
 msgid "%s is not listening to anyone."
 msgstr "%1$s agora está acompanhando "
 
 #: actions/tag.php:77 actions/tag.php:86
-#, php-format, fuzzy
+#, fuzzy, php-format
 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
+#, fuzzy, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr "Feed de mensagens de %s"
 
@@ -5644,16 +6888,24 @@ 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
+#, fuzzy, php-format
 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
+#, fuzzy, php-format
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Atualizações de %1$s no %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"
@@ -5664,41 +6916,128 @@ msgstr "%s assinaturas"
 msgid "Profile design"
 msgstr "Configurações do 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
-#, php-format, fuzzy
+#, fuzzy, php-format
 msgid "%s is not a member of any group."
 msgstr "Você não está assinando esse perfil."
 
+#: 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 ao salvar a mensagem."
 
-#: classes/User.php:319 classes/User.php:327
-#, php-format, fuzzy
+#: classes/User.php:319 classes/User.php:327 classes/User.php:334
+#: classes/User.php:333
+#, fuzzy, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "Mensagem para %1$s no %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 usuário não tem 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 "Enviar"
 
+#: 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 "Altere a sua senha"
 
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr ""
+
 #: lib/designsettings.php:191
 #, fuzzy
 msgid "Content"
@@ -5714,21 +7053,129 @@ msgstr "Procurar"
 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
+#: lib/designsettings.php:372
+msgid "Bad default color settings: "
+msgstr ""
+
+#: lib/designsettings.php:474 lib/designsettings.php:465
+#: lib/designsettings.php:468
+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
-#, php-format, fuzzy
+#, fuzzy, php-format
 msgid "%s blocked users"
 msgstr "Bloquear usuário"
 
 #: lib/groupnav.php:119
-#, php-format, fuzzy
+#, fuzzy, php-format
 msgid "Add or edit %s design"
 msgstr "Adicionar ou editar 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"
@@ -5744,11 +7191,26 @@ msgstr "Usuário"
 msgid "Search help"
 msgstr "Procurar"
 
+#: 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, fuzzy
+#, fuzzy, php-format
 msgid "%s is not a valid color!"
 msgstr "A URL do site informada não é válida."
 
+#: 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
@@ -5756,12 +7218,12 @@ msgid "No such page"
 msgstr "Essa etiqueta não existe."
 
 #: actions/apidirectmessage.php:89
-#, php-format, fuzzy
+#, fuzzy, php-format
 msgid "Direct messages from %s"
 msgstr "Mensagem direta para %s"
 
 #: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
-#, php-format, fuzzy
+#, fuzzy, php-format
 msgid "That's too long. Max message size is %d chars."
 msgstr "Muito extenso. O tamanho máximo das mensagens é 140 caracteres."
 
@@ -5770,8 +7232,12 @@ msgstr "Muito extenso. O tamanho máximo das mensagens é 140 caracteres."
 msgid "Could not unfollow user: User not found."
 msgstr "Não é possível seguir o usuário: Usuário não encontrado."
 
+#: actions/apifriendshipsdestroy.php:120
+msgid "You cannot unfollow yourself!"
+msgstr ""
+
 #: actions/apigroupcreate.php:261
-#, php-format, fuzzy
+#, fuzzy, php-format
 msgid "Description is too long (max %d chars)."
 msgstr "descrição muito extensa (máximo 140 caracteres)."
 
@@ -5781,7 +7247,7 @@ msgid "You are already a member of that group."
 msgstr "Você já está assinando esses usuários:"
 
 #: actions/apigroupjoin.php:138
-#, php-format, fuzzy
+#, fuzzy, php-format
 msgid "Could not join user %s to group %s."
 msgstr "Não é possível acompanhar o usuário: Usuário não encontrado."
 
@@ -5791,43 +7257,62 @@ msgid "You are not a member of this group."
 msgstr "Você não está assinando esse perfil."
 
 #: actions/apigroupleave.php:124
-#, php-format, fuzzy
+#, fuzzy, php-format
 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
+#, fuzzy, php-format
 msgid "%s's groups"
 msgstr "Grupos de %s"
 
 #: actions/apigrouplist.php:103
-#, php-format, fuzzy
+#, fuzzy, php-format
 msgid "Groups %s is a member of on %s."
 msgstr "O grupo %s é membro de"
 
 #: actions/apigrouplistall.php:94
-#, php-format, fuzzy
+#, fuzzy, php-format
 msgid "groups on %s"
 msgstr "Outras opções"
 
+#: actions/apistatusesshow.php:138
+msgid "Status deleted."
+msgstr ""
+
+#: actions/apistatusesupdate.php:132
+#: actions/apiaccountupdateprofileimage.php:99
+msgid "Unable to handle that much POST data!"
+msgstr ""
+
 #: actions/apistatusesupdate.php:145 actions/newnotice.php:155
-#: scripts/maildaemon.php:71
-#, php-format, fuzzy
+#: scripts/maildaemon.php:71 actions/apistatusesupdate.php:152
+#, fuzzy, php-format
 msgid "That's too long. Max notice size is %d chars."
 msgstr "Está muito extenso. O tamanho máximo é de 140 caracteres."
 
+#: actions/apistatusesupdate.php:209 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:216
+#, 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 imagem não suportado."
 
+#: actions/bookmarklet.php:50
+msgid "Post to "
+msgstr ""
+
 #: actions/editgroup.php:201 actions/newgroup.php:145
-#, php-format, fuzzy
+#, fuzzy, php-format
 msgid "description is too long (max %d chars)."
 msgstr "descrição muito extensa (máximo 140 caracteres)."
 
 #: actions/favoritesrss.php:115
-#, php-format, fuzzy
+#, fuzzy, php-format
 msgid "Updates favored by %1$s on %2$s!"
 msgstr "Atualizações de %1$s no %2$s!"
 
@@ -5844,7 +7329,8 @@ 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."
+msgstr ""
+"Não foi possível converter os tokens de requisição para tokens de acesso."
 
 #: actions/finishremotesubscribe.php:114
 #, fuzzy
@@ -5862,7 +7348,7 @@ msgid "Cannot read file."
 msgstr "Nosso arquivo foi perdido."
 
 #: actions/grouprss.php:133
-#, php-format, fuzzy
+#, fuzzy, php-format
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "Atualizações de %1$s no %2$s!"
 
@@ -5871,34 +7357,67 @@ msgstr "Atualizações de %1$s no %2$s!"
 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/login.php:259 actions/login.php:286
+#, fuzzy, php-format
+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:89
+#, php-format
+msgid "Updates with \"%s\""
+msgstr ""
 
 #: actions/noticesearchrss.php:91
-#, php-format, fuzzy
+#, fuzzy, php-format
 msgid "Updates matching search term \"%1$s\" on %2$s!"
 msgstr "Todas as atualizações correspondentes ao termo \"%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
-#, php-format, fuzzy
+#: actions/register.php:460
+#, fuzzy, php-format
 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
+#: actions/register.php:463
 #, 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
+#: actions/register.php:223
+#, fuzzy, php-format
 msgid "Bio is too long (max %d chars)."
 msgstr "Descrição muito extensa (máximo 140 caracteres)."
 
+#: actions/register.php:336 actions/register.php:342
+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)."
+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
@@ -5911,33 +7430,51 @@ msgstr "Esse é um perfil local! Autentique-se para assinar."
 msgid "Couldn’t get a request token."
 msgstr "Não foi possível obter um token de requisição."
 
+#: 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, fuzzy
+#, fuzzy, php-format
 msgid "Replies feed for %s (Atom)"
 msgstr "Mensagens de %s"
 
 #: actions/repliesrss.php:72
-#, php-format, fuzzy
+#, fuzzy, php-format
 msgid "Replies to %1$s on %2$s!"
 msgstr "Mensagem para %1$s no %2$s"
 
 #: actions/showfavorites.php:170
-#, php-format, fuzzy
+#, fuzzy, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
 msgstr "Feed para favoritas de %s"
 
 #: actions/showfavorites.php:177
-#, php-format, fuzzy
+#, fuzzy, php-format
 msgid "Feed for favorites of %s (RSS 2.0)"
 msgstr "Feed para favoritas de %s"
 
 #: actions/showfavorites.php:184
-#, php-format, fuzzy
+#, fuzzy, php-format
 msgid "Feed for favorites of %s (Atom)"
 msgstr "Feed para favoritas 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
-#, php-format, fuzzy
+#, fuzzy, php-format
 msgid "FOAF for %s group"
 msgstr "Mensagens de %s"
 
@@ -5952,32 +7489,80 @@ msgid "SMS is not available."
 msgstr "Esta página não está disponível em um "
 
 #: actions/tag.php:92
-#, php-format, fuzzy
+#, fuzzy, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr "Feed de mensagens 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, 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 “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 é:"
+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."
+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: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, fuzzy
+#, fuzzy, php-format
 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
+#, fuzzy, php-format
 msgid "Wrong image type for avatar URL ‘%s’."
 msgstr "Tipo de imagem errado para '%s'"
 
@@ -5992,27 +7577,38 @@ msgid "Site content license"
 msgstr "Procure no conteúdo das mensagens"
 
 #: lib/command.php:88
-#, php-format, fuzzy
+#, fuzzy, php-format
 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."
+msgstr ""
+"Não foi possível atualizar o usuário com o endereço de e-mail confirmado."
+
+#: lib/command.php:92
+msgid "It does not make a lot of sense to nudge yourself!"
+msgstr ""
 
 #: lib/command.php:99
-#, php-format, fuzzy
+#, fuzzy, php-format
 msgid "Nudge sent to %s"
 msgstr "Chamada de atenção 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
-#, php-format, fuzzy
+#, fuzzy, php-format
 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"
+msgstr ""
+"A mensagem é muito extensa - o máximo são 140 caracteres e você enviou %d"
 
 #: lib/command.php:431
-#, php-format, fuzzy
+#, fuzzy, php-format
 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"
+msgstr ""
+"A mensagem é muito extensa - o máximo são 140 caracteres e você enviou %d"
 
 #: lib/command.php:439
-#, php-format, fuzzy
+#, fuzzy, php-format
 msgid "Reply to %s sent"
 msgstr "Responder a esta mensagem"
 
@@ -6026,6 +7622,14 @@ msgstr "Problema ao salvar a mensagem."
 msgid "No configuration file found. "
 msgstr "Nenhum código de confirmação."
 
+#: 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."
@@ -6042,25 +7646,70 @@ msgid "Describe the group or topic"
 msgstr "Descreva o grupo ou tópico em 140 caracteres."
 
 #: lib/groupeditform.php:170
-#, php-format, fuzzy
+#, fuzzy, php-format
 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
+#, fuzzy, php-format
 msgid "notice id: %s"
 msgstr "Feed de mensagens de %s"
 
 #: lib/mail.php:554
-#, php-format, fuzzy
+#, fuzzy, php-format
 msgid "%s (@%s) added your notice as a favorite"
 msgstr "%s marcaram sua mensagem como 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!"
@@ -6071,3 +7720,58 @@ msgstr "Não foi possível excluir a favorita."
 msgid "Duplicate notice"
 msgstr "Excluir a mensagem"
 
+#: actions/login.php:110 actions/login.php:120
+#, fuzzy
+msgid "Invalid or expired token."
+msgstr "O conteúdo da mensagem é inválido"
+
+#: lib/command.php:597
+#, fuzzy, php-format
+msgid "Could not create login token for %s"
+msgstr "Não foi possível criar o formulário OpenID: %s"
+
+#: lib/command.php:602
+#, php-format
+msgid "This link is useable only once, and is good for only 2 minutes: %s"
+msgstr ""
+
+#: lib/imagefile.php:75
+#, fuzzy, php-format
+msgid "That file is too big. The maximum file size is %s."
+msgstr "Você pode enviar seu avatar pessoal."
+
+#: lib/command.php:613
+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"
+"login - Get a link to login to the web interface\n"
+"drop <group> - leave group\n"
+"stats - get your stats\n"
+"stop - same as 'off'\n"
+"quit - same as 'off'\n"
+"sub <nickname> - same as 'follow'\n"
+"unsub <nickname> - same as 'leave'\n"
+"last <nickname> - same as 'get'\n"
+"on <nickname> - not yet implemented.\n"
+"off <nickname> - not yet implemented.\n"
+"nudge <nickname> - remind a user to update.\n"
+"invite <phone number> - not yet implemented.\n"
+"track <word> - not yet implemented.\n"
+"untrack <word> - not yet implemented.\n"
+"track off - not yet implemented.\n"
+"untrack all - not yet implemented.\n"
+"tracks - not yet implemented.\n"
+"tracking - not yet implemented.\n"
+msgstr ""
diff --git a/locale/ru/LC_MESSAGES/statusnet.mo b/locale/ru/LC_MESSAGES/statusnet.mo
index f5336ee74..9c0c73f01 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 309f1164a..00b54b20c 100644
--- a/locale/ru/LC_MESSAGES/statusnet.po
+++ b/locale/ru/LC_MESSAGES/statusnet.po
@@ -6,12 +6,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-06 13:16+0000\n"
-"PO-Revision-Date: 2009-11-06 15:44:29+0000\n"
+"POT-Creation-Date: 2009-11-08 11:53+0000\n"
+"PO-Revision-Date: 2009-11-08 11:57:09+0000\n"
 "Language-Team: Russian\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r58648); Translate extension (2009-08-03)\n"
+"X-Generator: MediaWiki 1.16alpha(r58760); 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"
@@ -196,7 +196,7 @@ msgid "%s updates from everyone!"
 msgstr "%s обновлен для всех!"
 
 #: ../actions/register.php:213 actions/register.php:497
-#: actions/register.php:545 actions/register.php:555
+#: actions/register.php:545 actions/register.php:555 actions/register.php:561
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -234,6 +234,7 @@ msgstr "1-64 латинских строчных буквы или цифры, �
 
 #: ../actions/register.php:152 actions/register.php:166
 #: actions/register.php:368 actions/register.php:414 actions/register.php:418
+#: actions/register.php:424
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr ""
 "1-64 латинских строчных букв или цифр, без пробелов. Обязательное поле."
@@ -251,6 +252,7 @@ msgstr "6 или более символов, и не забывайте его!
 
 #: ../actions/register.php:154 actions/register.php:168
 #: actions/register.php:373 actions/register.php:419 actions/register.php:423
+#: actions/register.php:429
 msgid "6 or more characters. Required."
 msgstr "6 или более символов. Обязательное поле."
 
@@ -431,7 +433,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
+#: actions/login.php:79 actions/register.php:137
 msgid "Already logged in."
 msgstr "Уже авторизован."
 
@@ -454,7 +456,7 @@ 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/login.php:226
-#: actions/register.php:473
+#: actions/register.php:473 actions/login.php:253 actions/register.php:479
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Автоматическии входить в дальнейшем. Не для общедоступных компьютеров!"
 
@@ -476,6 +478,7 @@ msgstr "Аватар"
 
 #: ../actions/avatar.php:113 actions/profilesettings.php:350
 #: actions/avatarsettings.php:395 actions/avatarsettings.php:346
+#: actions/avatarsettings.php:360
 msgid "Avatar updated."
 msgstr "Аватар обновлён."
 
@@ -512,7 +515,7 @@ msgstr "Ранее »"
 #: 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
+#: actions/register.php:459 actions/register.php:465
 msgid "Bio"
 msgstr "Био"
 
@@ -541,6 +544,7 @@ msgstr "Не удаётся прочитать URL аватары «%s»"
 #: actions/passwordsettings.php:169 actions/recoverpassword.php:347
 #: actions/passwordsettings.php:174 actions/recoverpassword.php:365
 #: actions/passwordsettings.php:180 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:185
 msgid "Can't save new password."
 msgstr "Не удаётся сохранить новый пароль."
 
@@ -603,6 +607,7 @@ msgstr "Изменить ваши настройки профиля"
 #: actions/recoverpassword.php:236 actions/register.php:422
 #: actions/passwordsettings.php:111 actions/recoverpassword.php:239
 #: actions/register.php:426 actions/smssettings.php:134
+#: actions/register.php:432
 msgid "Confirm"
 msgstr "Подтвердить"
 
@@ -632,7 +637,7 @@ msgid "Confirmation code not found."
 msgstr "Код подтверждения не найден."
 
 #: ../actions/register.php:202 actions/register.php:473
-#: actions/register.php:521 actions/register.php:531
+#: actions/register.php:521 actions/register.php:531 actions/register.php:537
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -875,6 +880,7 @@ 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
+#: classes/Notice.php:1120
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Ошибка баз данных при вставке ответа для %s"
@@ -897,7 +903,8 @@ msgstr "Опиши себя и свои увлечения при помощи 1
 #: 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
+#: lib/accountsettingsaction.php:117 actions/register.php:437
+#: actions/register.php:441
 msgid "Email"
 msgstr "Email"
 
@@ -912,7 +919,7 @@ msgid "Email Settings"
 msgstr "Настройка почты"
 
 #: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
-#: actions/register.php:200 actions/register.php:206
+#: actions/register.php:200 actions/register.php:206 actions/register.php:212
 msgid "Email address already exists."
 msgstr "Такой электронный адрес уже задействован."
 
@@ -998,7 +1005,7 @@ msgstr "Ошибка сохранения текущего пользовате�
 
 #: ../actions/password.php:80 actions/profilesettings.php:399
 #: actions/passwordsettings.php:164 actions/passwordsettings.php:169
-#: actions/passwordsettings.php:175
+#: actions/passwordsettings.php:175 actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "Ошибка сохранения пользователя; неверное имя."
 
@@ -1010,6 +1017,7 @@ msgstr "Ошибка сохранения пользователя; неверн
 #: actions/login.php:120 actions/recoverpassword.php:372
 #: actions/register.php:235 actions/login.php:122
 #: actions/recoverpassword.php:375 actions/register.php:242
+#: actions/login.php:149 actions/register.php:248
 msgid "Error setting user."
 msgstr "Ошибка в установках пользователя."
 
@@ -1041,6 +1049,7 @@ msgstr "ЧаВо"
 
 #: ../actions/avatar.php:115 actions/profilesettings.php:352
 #: actions/avatarsettings.php:397 actions/avatarsettings.php:349
+#: actions/avatarsettings.php:363
 msgid "Failed updating avatar."
 msgstr "Неудача при обновлении аватара."
 
@@ -1075,6 +1084,7 @@ msgid "Find people on this site"
 msgstr "Найти человека на этом сайте"
 
 #: ../actions/login.php:122 actions/login.php:247 actions/login.php:255
+#: actions/login.php:282
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -1092,6 +1102,7 @@ msgstr ""
 #: actions/showstream.php:220 lib/groupeditform.php:157
 #: actions/profilesettings.php:111 actions/register.php:441
 #: actions/showgroup.php:247 actions/showstream.php:267
+#: actions/register.php:447 lib/userprofile.php:149
 msgid "Full name"
 msgstr "Полное имя"
 
@@ -1105,7 +1116,7 @@ msgstr "Полное имя"
 #: 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
+#: actions/register.php:214 actions/register.php:220
 msgid "Full name is too long (max 255 chars)."
 msgstr "Полное имя слишком длинное (не больше 255 знаков)."
 
@@ -1126,7 +1137,7 @@ msgstr "Моё"
 #: 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
+#: actions/register.php:446 actions/register.php:452
 msgid "Homepage"
 msgstr "Главная"
 
@@ -1138,7 +1149,7 @@ msgstr "Главная"
 #: 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
+#: actions/register.php:211 actions/register.php:217
 msgid "Homepage is not a valid URL."
 msgstr "URL Главной страницы неверен."
 
@@ -1210,7 +1221,7 @@ 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/login.php:116
+#: actions/facebookhome.php:129 actions/login.php:116 actions/login.php:143
 msgid "Incorrect username or password."
 msgstr "Некорректное имя или пароль."
 
@@ -1290,6 +1301,7 @@ msgstr "Неверный размер."
 #: 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
+#: actions/register.php:243 actions/register.php:264
 msgid "Invalid username or password."
 msgstr "Неверное имя или пароль."
 
@@ -1368,7 +1380,7 @@ msgstr "Слишком длинный язык (более 50 символов).
 #: 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
+#: lib/profilelist.php:218 actions/register.php:470 lib/userprofile.php:164
 msgid "Location"
 msgstr "Месторасположение"
 
@@ -1382,7 +1394,7 @@ msgstr "Месторасположение"
 #: 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
+#: actions/register.php:221 actions/register.php:227
 msgid "Location is too long (max 255 chars)."
 msgstr "Слишком длинное месторасположение (максимум 255 знаков)."
 
@@ -1396,6 +1408,7 @@ msgstr "Слишком длинное месторасположение (мак
 #: 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
+#: actions/login.php:204 actions/login.php:257
 #, php-format
 msgid "Login"
 msgstr "Вход"
@@ -1424,12 +1437,13 @@ msgstr "Выход"
 
 #: ../actions/register.php:166 actions/register.php:180
 #: actions/register.php:393 actions/register.php:439 actions/register.php:443
+#: actions/register.php:449
 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 actions/login.php:236
+#: lib/facebookaction.php:327 actions/login.php:236 actions/login.php:263
 msgid "Lost or forgotten password?"
 msgstr "Потеряли или забыли пароль?"
 
@@ -1473,7 +1487,7 @@ 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:487
+#: actions/register.php:477 actions/register.php:487 actions/register.php:493
 msgid "My text and files are available under "
 msgstr "Мои тексты и файлы находятся под лицензией"
 
@@ -1531,7 +1545,8 @@ msgstr "Новый пароль успешно сохранён. Вы автор
 #: 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
+#: actions/showgroup.php:236 actions/showstream.php:249 actions/login.php:246
+#: actions/register.php:423 lib/userprofile.php:131
 msgid "Nickname"
 msgstr "Имя"
 
@@ -1545,7 +1560,7 @@ msgstr "Имя"
 #: 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
+#: actions/register.php:202 actions/register.php:208
 msgid "Nickname already in use. Try another one."
 msgstr "Такое имя уже используется. Попробуйте какое-нибудь другое."
 
@@ -1561,7 +1576,7 @@ msgstr "Такое имя уже используется. Попробуйте
 #: 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
+#: actions/register.php:199 actions/register.php:205
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
 "Имя должно состоять только из прописных букв и цифр и не иметь пробелов."
@@ -1801,7 +1816,8 @@ msgstr "Незарегистрированный пользователь."
 #: 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
+#: lib/api.php:954 lib/api.php:982 lib/api.php:1092 lib/api.php:963
+#: lib/api.php:991 lib/api.php:1101
 msgid "Not a supported data format."
 msgstr "Неподдерживаемый формат данных."
 
@@ -1822,7 +1838,7 @@ 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
+#: actions/register.php:189 actions/register.php:195 actions/register.php:201
 msgid "Not a valid email address."
 msgstr "Неверный электронный адрес."
 
@@ -1834,7 +1850,7 @@ msgstr "Неверный электронный адрес."
 #: 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
+#: actions/register.php:204 actions/register.php:210
 msgid "Not a valid nickname."
 msgstr "Неверное имя."
 
@@ -1873,6 +1889,7 @@ msgstr "Неожиданный ответ!"
 #: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
 #: actions/twitapistatuses.php:309 actions/twitapistatuses.php:327
 #: actions/twitapistatuses.php:284 actions/apistatusesupdate.php:186
+#: actions/apistatusesupdate.php:193
 msgid "Not found"
 msgstr "Не найдено"
 
@@ -2019,7 +2036,8 @@ msgstr "Частичная загрузка."
 #: 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
+#: lib/accountsettingsaction.php:114 actions/login.php:249
+#: actions/register.php:428
 msgid "Password"
 msgstr "Пароль"
 
@@ -2048,6 +2066,7 @@ msgstr "Запрошено восстановление пароля"
 #: actions/passwordsettings.php:173 actions/recoverpassword.php:200
 #: actions/passwordsettings.php:178 actions/recoverpassword.php:208
 #: actions/passwordsettings.php:184 actions/recoverpassword.php:211
+#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "Пароль сохранён."
 
@@ -2056,6 +2075,7 @@ msgstr "Пароль сохранён."
 #: actions/passwordsettings.php:145 actions/register.php:183
 #: actions/passwordsettings.php:150 actions/register.php:220
 #: actions/passwordsettings.php:156 actions/register.php:227
+#: actions/register.php:233
 msgid "Passwords don't match."
 msgstr "Пароли не совпадают."
 
@@ -2219,19 +2239,19 @@ msgstr "Код восстановления неизвестного польз�
 #: 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
+#: lib/logingroupnav.php:85 actions/register.php:114 actions/register.php:502
 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
+#: actions/register.php:129 actions/register.php:135
 msgid "Registration not allowed."
 msgstr "Регистрация недопустима."
 
 #: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67 actions/register.php:106
+#: actions/register.php:67 actions/register.php:106 actions/register.php:112
 msgid "Registration successful"
 msgstr "Регистрация успешна!"
 
@@ -2245,6 +2265,7 @@ msgstr "Отбросить"
 #: 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
+#: actions/login.php:252 actions/register.php:477
 msgid "Remember me"
 msgstr "Запомнить меня"
 
@@ -2343,6 +2364,7 @@ msgstr "Тот же пароль, что и выше"
 
 #: ../actions/register.php:156 actions/register.php:170
 #: actions/register.php:377 actions/register.php:423 actions/register.php:427
+#: actions/register.php:433
 msgid "Same as password above. Required."
 msgstr "Тот же пароль что и сверху. Обязательно."
 
@@ -2505,6 +2527,7 @@ msgstr "Записанный OpenID не найден."
 #: actions/remotesubscribe.php:113 actions/showstream.php:376
 #: lib/subscribeform.php:139 actions/showstream.php:345
 #: actions/remotesubscribe.php:137 actions/showstream.php:439
+#: lib/userprofile.php:321
 msgid "Subscribe"
 msgstr "Подписаться"
 
@@ -2551,6 +2574,7 @@ msgstr "Системная ошибка при загрузке файла."
 #: actions/profilesettings.php:123 actions/showstream.php:255
 #: lib/subscriptionlist.php:106 lib/subscriptionlist.php:108
 #: actions/profilesettings.php:138 actions/showstream.php:327
+#: lib/userprofile.php:209
 msgid "Tags"
 msgstr "Теги"
 
@@ -2770,6 +2794,7 @@ msgstr "Этот метод требует POST или DELETE."
 #: actions/apifriendshipsdestroy.php:91 actions/apigroupcreate.php:104
 #: actions/apigroupjoin.php:91 actions/apigroupleave.php:91
 #: actions/apistatusesupdate.php:109
+#: actions/apiaccountupdateprofileimage.php:84
 msgid "This method requires a POST."
 msgstr "Этот метод требует POST."
 
@@ -2802,7 +2827,7 @@ msgstr ""
 
 #: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
 #: actions/twitapifriendships.php:132 actions/twitapifriendships.php:139
-#: actions/apifriendshipsexists.php:103
+#: actions/apifriendshipsexists.php:103 actions/apifriendshipsexists.php:94
 msgid "Two user ids or screen_names must be supplied."
 msgstr "Надо представить два имени пользователя или кода."
 
@@ -2810,7 +2835,7 @@ msgstr "Надо представить два имени пользовател
 #: 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
+#: actions/register.php:448 actions/register.php:454
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "Адрес твоей страницы, дневника или профиля на другом портале"
 
@@ -2832,6 +2857,7 @@ msgstr "Адрес URL твоего профиля на другом подхо�
 #: actions/twittersettings.php:322 lib/designsettings.php:301
 #: actions/emailsettings.php:255 actions/grouplogo.php:319
 #: actions/imsettings.php:220 actions/smssettings.php:248
+#: actions/avatarsettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "Нетиповое подтверждение формы."
 
@@ -2942,7 +2968,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
+#: actions/register.php:436 actions/register.php:438 actions/register.php:442
 msgid "Used only for updates, announcements, and password recovery"
 msgstr "Нужна только для обновлений, осведомлений и восстановления пароля."
 
@@ -2970,7 +2996,8 @@ 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
+#: actions/apiusershow.php:108 actions/apiaccountupdateprofileimage.php:124
+#: actions/apiaccountupdateprofileimage.php:130
 msgid "User has no profile."
 msgstr "У пользователя нет профиля."
 
@@ -2999,7 +3026,7 @@ msgstr "Что нового, %s?"
 #: 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
+#: actions/register.php:466 actions/register.php:472
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Где вы находитесь, например «Город, область, страна»"
 
@@ -3105,7 +3132,7 @@ 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:192
+#: actions/register.php:186 actions/register.php:192 actions/register.php:198
 msgid "You can't register if you don't agree to the license."
 msgstr ""
 "Вы не можете зарегистрироваться, если Вы не подтверждаете лицензионного "
@@ -3185,56 +3212,56 @@ msgstr ""
 "аккаунтом OpenIDs отсюда."
 
 #: ../lib/util.php:943 lib/util.php:992 lib/util.php:945 lib/util.php:756
-#: lib/util.php:770 lib/util.php:816
+#: lib/util.php:770 lib/util.php:816 lib/util.php:844
 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:828
+#: lib/util.php:782 lib/util.php:828 lib/util.php:856
 #, php-format
 msgid "about %d days ago"
 msgstr "около %d дня(ей) назад"
 
 #: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953 lib/util.php:764
-#: lib/util.php:778 lib/util.php:824
+#: lib/util.php:778 lib/util.php:824 lib/util.php:852
 #, php-format
 msgid "about %d hours ago"
 msgstr "около %d часа(ов) назад"
 
 #: ../lib/util.php:947 lib/util.php:996 lib/util.php:949 lib/util.php:760
-#: lib/util.php:774 lib/util.php:820
+#: lib/util.php:774 lib/util.php:820 lib/util.php:848
 #, php-format
 msgid "about %d minutes ago"
 msgstr "около %d минут(ы) назад"
 
 #: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961 lib/util.php:772
-#: lib/util.php:786 lib/util.php:832
+#: lib/util.php:786 lib/util.php:832 lib/util.php:860
 #, php-format
 msgid "about %d months ago"
 msgstr "около %d месяца(ев) назад"
 
 #: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955 lib/util.php:766
-#: lib/util.php:780 lib/util.php:826
+#: lib/util.php:780 lib/util.php:826 lib/util.php:854
 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:818
+#: lib/util.php:772 lib/util.php:818 lib/util.php:846
 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:830
+#: lib/util.php:784 lib/util.php:830 lib/util.php:858
 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:834
+#: lib/util.php:788 lib/util.php:834 lib/util.php:862
 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:822
+#: lib/util.php:776 lib/util.php:822 lib/util.php:850
 msgid "about an hour ago"
 msgstr "около часа назад"
 
@@ -3303,7 +3330,9 @@ msgstr "Сюда"
 #: 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
+#: actions/userauthorization.php:52 actions/login.php:131
+#: actions/register.php:165 actions/avatarsettings.php:265
+#: lib/designsettings.php:294
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Проблема с Вашей сессией. Попробуйте ещё раз, пожалуйста."
 
@@ -3534,6 +3563,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
+#: actions/register.php:230
 msgid "Password must be 6 or more characters."
 msgstr "Пароль должен быть длиной не менее 6 символов."
 
@@ -4085,13 +4115,13 @@ msgid "There was a problem with your session token. "
 msgstr "Проблема с Вашей сессией. Попробуйте ещё раз, пожалуйста."
 
 #: actions/avatarsettings.php:303 actions/grouplogo.php:360
-#: actions/avatarsettings.php:308
+#: actions/avatarsettings.php:308 actions/avatarsettings.php:322
 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
+#: actions/grouplogo.php:377 actions/avatarsettings.php:337
 msgid "Lost our file data."
 msgstr "Потеряна информация о файле."
 
@@ -4568,7 +4598,7 @@ msgid "%s left group %s"
 msgstr "%s покинул группу %s"
 
 #: actions/login.php:225 lib/facebookaction.php:304 actions/login.php:208
-#: actions/login.php:216
+#: actions/login.php:216 actions/login.php:243
 msgid "Login to site"
 msgstr "Авторизоваться"
 
@@ -4749,7 +4779,8 @@ 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
+#: actions/register.php:398 actions/register.php:85 actions/register.php:189
+#: actions/register.php:404
 msgid "Sorry, only invited people can register."
 msgstr "Простите, регистрация только по приглашению."
 
@@ -4840,7 +4871,7 @@ msgstr "Профиль группы"
 #: 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
+#: lib/profilelist.php:230 lib/userprofile.php:177
 msgid "URL"
 msgstr "URL"
 
@@ -4851,7 +4882,7 @@ msgstr "URL"
 #: 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
+#: lib/profilelist.php:245 lib/userprofile.php:194
 msgid "Note"
 msgstr "Запись"
 
@@ -4900,6 +4931,7 @@ msgid "Only the sender and recipient "
 msgstr "Только отправитель и получатель могут читать это сообщение."
 
 #: actions/showstream.php:73 actions/showstream.php:78
+#: actions/showstream.php:79
 #, php-format
 msgid "%s, page %d"
 msgstr "Входящие для %s - страница %d"
@@ -4910,28 +4942,29 @@ msgstr "Профиль"
 
 #: actions/showstream.php:236 actions/tagother.php:77
 #: actions/showstream.php:220 actions/showstream.php:185
-#: actions/showstream.php:193
+#: actions/showstream.php:193 lib/userprofile.php:75
 msgid "User profile"
 msgstr "Профиль пользователя"
 
 #: actions/showstream.php:240 actions/tagother.php:81
 #: actions/showstream.php:224 actions/showstream.php:189
-#: actions/showstream.php:220
+#: actions/showstream.php:220 lib/userprofile.php:102
 msgid "Photo"
 msgstr "Фото"
 
 #: actions/showstream.php:317 actions/showstream.php:309
 #: actions/showstream.php:274 actions/showstream.php:354
+#: lib/userprofile.php:236
 msgid "User actions"
 msgstr "Действия пользователя"
 
 #: actions/showstream.php:342 actions/showstream.php:307
-#: actions/showstream.php:390
+#: actions/showstream.php:390 lib/userprofile.php:272
 msgid "Send a direct message to this user"
 msgstr "Послать приватное сообщение этому пользователю."
 
 #: actions/showstream.php:343 actions/showstream.php:308
-#: actions/showstream.php:391
+#: actions/showstream.php:391 lib/userprofile.php:273
 msgid "Message"
 msgstr "Сообщение"
 
@@ -5643,7 +5676,7 @@ msgstr "%s и друзья"
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr "Тут вы можете загрузить свой аватар."
 
-#: actions/avatarsettings.php:373
+#: actions/avatarsettings.php:373 actions/avatarsettings.php:387
 #, fuzzy
 msgid "Avatar deleted."
 msgstr "Аватар обновлён."
@@ -5791,10 +5824,12 @@ msgstr ""
 "action.openidlogin%%)!)"
 
 #: actions/register.php:432 actions/register.php:479 actions/register.php:489
+#: actions/register.php:495
 msgid "Creative Commons Attribution 3.0"
 msgstr ""
 
 #: actions/register.php:433 actions/register.php:480 actions/register.php:490
+#: actions/register.php:496
 #, fuzzy
 msgid ""
 " except this private data: password, email address, IM address, and phone "
@@ -5837,44 +5872,48 @@ msgid "%s's profile"
 msgstr "Профиль"
 
 #: actions/showstream.php:163 actions/showstream.php:128
+#: actions/showstream.php:129
 #, fuzzy, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "Лента записей для %s"
 
 #: actions/showstream.php:170 actions/showstream.php:135
+#: actions/showstream.php:136
 #, fuzzy, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "Лента записей для %s"
 
 #: actions/showstream.php:177 actions/showstream.php:142
+#: actions/showstream.php:143
 #, fuzzy, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "Лента записей для %s"
 
 #: actions/showstream.php:182 actions/showstream.php:147
+#: actions/showstream.php:148
 #, fuzzy, php-format
 msgid "FOAF for %s"
 msgstr "Исходящие для %s"
 
 #: actions/showstream.php:237 actions/showstream.php:202
-#: actions/showstream.php:234
+#: actions/showstream.php:234 lib/userprofile.php:116
 #, fuzzy
 msgid "Edit Avatar"
 msgstr "Аватар"
 
 #: actions/showstream.php:316 actions/showstream.php:281
-#: actions/showstream.php:366
+#: actions/showstream.php:366 lib/userprofile.php:248
 #, fuzzy
 msgid "Edit profile settings"
 msgstr "Настройки профиля"
 
 #: actions/showstream.php:317 actions/showstream.php:282
-#: actions/showstream.php:367
+#: actions/showstream.php:367 lib/userprofile.php:249
 msgid "Edit"
 msgstr ""
 
 #: actions/showstream.php:542 actions/showstream.php:388
-#: actions/showstream.php:487
+#: actions/showstream.php:487 actions/showstream.php:234
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5926,6 +5965,9 @@ msgstr ""
 #: actions/apistatusesupdate.php:125 actions/apisubscriptions.php:87
 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#: actions/apiaccountupdateprofileimage.php:91
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apistatusesupdate.php:139
 #, fuzzy
 msgid "No such user!"
 msgstr "Нет такого пользователя"
@@ -5987,36 +6029,6 @@ msgid ""
 "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 "Ошибка базы данных"
@@ -6179,6 +6191,7 @@ 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
+#: actions/showstream.php:202
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -6360,7 +6373,8 @@ 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
+#: lib/designsettings.php:461 lib/designsettings.php:434
+#: lib/designsettings.php:464
 #, fuzzy
 msgid "Couldn't update your design."
 msgstr "Не удаётся обновить пользователя."
@@ -6456,7 +6470,9 @@ msgid "Message sent"
 msgstr "Сообщение"
 
 #: actions/newnotice.php:93 lib/designsettings.php:281
-#: actions/newnotice.php:94
+#: actions/newnotice.php:94 actions/apiaccountupdateprofileimage.php:97
+#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254
+#: lib/designsettings.php:283
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s bytes) due to its "
@@ -6628,7 +6644,7 @@ msgstr "Вы идентифицированны. Введите новый па�
 msgid "Password recover"
 msgstr "Запрошено восстановление пароля"
 
-#: actions/register.php:86
+#: actions/register.php:86 actions/register.php:92
 #, fuzzy
 msgid "Sorry, invalid invitation code."
 msgstr "Ошибка, связанная с кодом подтверждения."
@@ -6732,28 +6748,31 @@ msgstr "Настройки"
 msgid "Not a local notice"
 msgstr "Не локальный пользователь."
 
-#: actions/showstream.php:72
+#: actions/showstream.php:72 actions/showstream.php:73
 #, fuzzy, php-format
 msgid " tagged %s"
 msgstr "Записи, помеченные %s"
 
-#: actions/showstream.php:121
+#: actions/showstream.php:121 actions/showstream.php:122
 #, fuzzy, php-format
 msgid "Notice feed for %s tagged %s (RSS 1.0)"
 msgstr "Лента записей от группы %s"
 
 #: actions/showstream.php:350 actions/showstream.php:444
+#: actions/showstream.php:191
 #, 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
+#: actions/showstream.php:196
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
 msgstr ""
 
 #: actions/showstream.php:357 actions/showstream.php:451
+#: actions/showstream.php:198
 #, php-format
 msgid ""
 "You can try to nudge %s or [post something to his or her attention](%%%%"
@@ -6761,6 +6780,7 @@ msgid ""
 msgstr ""
 
 #: actions/showstream.php:393 actions/showstream.php:492
+#: actions/showstream.php:239
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -6915,6 +6935,7 @@ msgid "Problem saving notice. Too long."
 msgstr "Проблемы с сохранением записи."
 
 #: classes/User.php:319 classes/User.php:327 classes/User.php:334
+#: classes/User.php:333
 #, fuzzy, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "Сообщение для %1$s на %2$s"
@@ -7025,10 +7046,12 @@ msgid "Save design"
 msgstr ""
 
 #: lib/designsettings.php:378 lib/designsettings.php:369
+#: lib/designsettings.php:372
 msgid "Bad default color settings: "
 msgstr ""
 
 #: lib/designsettings.php:474 lib/designsettings.php:465
+#: lib/designsettings.php:468
 msgid "Design defaults restored."
 msgstr ""
 
@@ -7181,7 +7204,6 @@ 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 ""
 "Не удаётся следовать за пользователем, т. к. такого пользователя не "
@@ -7237,16 +7259,18 @@ msgid "Status deleted."
 msgstr "Аватар обновлён."
 
 #: actions/apistatusesupdate.php:132
+#: actions/apiaccountupdateprofileimage.php:99
 msgid "Unable to handle that much POST data!"
 msgstr ""
 
 #: actions/apistatusesupdate.php:145 actions/newnotice.php:155
-#: scripts/maildaemon.php:71
+#: scripts/maildaemon.php:71 actions/apistatusesupdate.php:152
 #, fuzzy, php-format
 msgid "That's too long. Max notice size is %d chars."
 msgstr "Слишком длинная запись. Максимальная длина - 140 знаков."
 
 #: actions/apistatusesupdate.php:209 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:216
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
@@ -7311,7 +7335,7 @@ msgstr "Обновлено от %1$s на %2$s!"
 msgid "IM is not available."
 msgstr "Страница недоступна для того типа, который Вы задействовали."
 
-#: actions/login.php:259
+#: actions/login.php:259 actions/login.php:286
 #, fuzzy, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -7327,7 +7351,7 @@ msgid "Updates with \"%s\""
 msgstr "Обновлено от %1$s на %2$s!"
 
 #: actions/noticesearchrss.php:91
-#, fuzzy, php-format
+#, php-format
 msgid "Updates matching search term \"%1$s\" on %2$s!"
 msgstr "Все обновления, соответствующие поисковому запросу «%s»"
 
@@ -7346,22 +7370,24 @@ msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
 msgstr ""
 
 #: actions/profilesettings.php:122 actions/register.php:454
+#: actions/register.php:460
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d chars"
 msgstr "Опиши себя и свои увлечения при помощи 140 символов"
 
 #: actions/profilesettings.php:125 actions/register.php:457
+#: actions/register.php:463
 #, fuzzy
 msgid "Describe yourself and your interests"
 msgstr "Опиши себя и свои интересы при помощи 140 символов."
 
 #: actions/profilesettings.php:221 actions/register.php:217
+#: actions/register.php:223
 #, fuzzy, php-format
 msgid "Bio is too long (max %d chars)."
 msgstr "Слишком длинное био (максимум 140 символов)."
 
-#: actions/register.php:336
-#, fuzzy
+#: actions/register.php:336 actions/register.php:342
 msgid ""
 "With this form you can create  a new account. You can then post notices and "
 "link up to friends and colleagues. "
@@ -7408,12 +7434,12 @@ msgid "Replies to %1$s on %2$s!"
 msgstr "Сообщение для %1$s на %2$s"
 
 #: actions/showfavorites.php:170
-#, fuzzy, php-format
+#, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
 msgstr "Лента друзей %s (RSS 1.0)"
 
 #: actions/showfavorites.php:177
-#, fuzzy, php-format
+#, php-format
 msgid "Feed for favorites of %s (RSS 2.0)"
 msgstr "Лента друзей %s (RSS 2.0)"
 
@@ -7512,7 +7538,7 @@ msgid "Avatar URL ‘%s’ is not valid."
 msgstr ""
 
 #: actions/userauthorization.php:343
-#, fuzzy, php-format
+#, php-format
 msgid "Can’t read avatar URL ‘%s’."
 msgstr "Не удаётся прочитать URL аватары «%s»"
 
@@ -7569,41 +7595,6 @@ 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 "No configuration file found. "
@@ -7689,7 +7680,6 @@ msgid ""
 msgstr ""
 
 #: lib/mailbox.php:227 lib/noticelist.php:424
-#, fuzzy
 msgid "from"
 msgstr "от "
 
@@ -7706,3 +7696,59 @@ msgstr "Не удаётся вернуть публичный поток."
 #, fuzzy
 msgid "Duplicate notice"
 msgstr "Удалить запись"
+
+#: actions/login.php:110 actions/login.php:120
+#, fuzzy
+msgid "Invalid or expired token."
+msgstr "Неверный контент записи"
+
+#: lib/command.php:597
+#, fuzzy, php-format
+msgid "Could not create login token for %s"
+msgstr "Не удаётся создать OpenID-форму: %s "
+
+#: lib/command.php:602
+#, php-format
+msgid "This link is useable only once, and is good for only 2 minutes: %s"
+msgstr ""
+
+#: lib/imagefile.php:75
+#, fuzzy, php-format
+msgid "That file is too big. The maximum file size is %s."
+msgstr "Тут вы можете загрузить логотип для группы."
+
+#: lib/command.php:613
+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"
+"login - Get a link to login to the web interface\n"
+"drop <group> - leave group\n"
+"stats - get your stats\n"
+"stop - same as 'off'\n"
+"quit - same as 'off'\n"
+"sub <nickname> - same as 'follow'\n"
+"unsub <nickname> - same as 'leave'\n"
+"last <nickname> - same as 'get'\n"
+"on <nickname> - not yet implemented.\n"
+"off <nickname> - not yet implemented.\n"
+"nudge <nickname> - remind a user to update.\n"
+"invite <phone number> - not yet implemented.\n"
+"track <word> - not yet implemented.\n"
+"untrack <word> - not yet implemented.\n"
+"track off - not yet implemented.\n"
+"untrack all - not yet implemented.\n"
+"tracks - not yet implemented.\n"
+"tracking - not yet implemented.\n"
+msgstr ""
diff --git a/locale/statusnet.po b/locale/statusnet.po
index f79727fe8..4331b906e 100644
--- a/locale/statusnet.po
+++ b/locale/statusnet.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-06 13:16+0000\n"
+"POT-Creation-Date: 2009-11-08 11:53+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"
@@ -168,7 +168,7 @@ msgid "%s updates from everyone!"
 msgstr ""
 
 #: ../actions/register.php:213 actions/register.php:497
-#: actions/register.php:545 actions/register.php:555
+#: actions/register.php:545 actions/register.php:555 actions/register.php:561
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -188,10 +188,6 @@ msgstr ""
 msgid "**%%site.name%%** is a microblogging service. "
 msgstr ""
 
-#: ../lib/util.php:274 lib/util.php:290
-msgid ". Contributors should be attributed by full name or nickname."
-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
@@ -202,6 +198,7 @@ msgstr ""
 
 #: ../actions/register.php:152 actions/register.php:166
 #: actions/register.php:368 actions/register.php:414 actions/register.php:418
+#: actions/register.php:424
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr ""
 
@@ -218,6 +215,7 @@ msgstr ""
 
 #: ../actions/register.php:154 actions/register.php:168
 #: actions/register.php:373 actions/register.php:419 actions/register.php:423
+#: actions/register.php:429
 msgid "6 or more characters. Required."
 msgstr ""
 
@@ -390,7 +388,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
+#: actions/login.php:79 actions/register.php:137
 msgid "Already logged in."
 msgstr ""
 
@@ -413,7 +411,7 @@ 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/login.php:226
-#: actions/register.php:473
+#: actions/register.php:473 actions/login.php:253 actions/register.php:479
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 
@@ -435,6 +433,7 @@ msgstr ""
 
 #: ../actions/avatar.php:113 actions/profilesettings.php:350
 #: actions/avatarsettings.php:395 actions/avatarsettings.php:346
+#: actions/avatarsettings.php:360
 msgid "Avatar updated."
 msgstr ""
 
@@ -466,7 +465,7 @@ msgstr ""
 #: 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
+#: actions/register.php:459 actions/register.php:465
 msgid "Bio"
 msgstr ""
 
@@ -495,6 +494,7 @@ msgstr ""
 #: actions/passwordsettings.php:169 actions/recoverpassword.php:347
 #: actions/passwordsettings.php:174 actions/recoverpassword.php:365
 #: actions/passwordsettings.php:180 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:185
 msgid "Can't save new password."
 msgstr ""
 
@@ -557,6 +557,7 @@ msgstr ""
 #: actions/recoverpassword.php:236 actions/register.php:422
 #: actions/passwordsettings.php:111 actions/recoverpassword.php:239
 #: actions/register.php:426 actions/smssettings.php:134
+#: actions/register.php:432
 msgid "Confirm"
 msgstr ""
 
@@ -586,7 +587,7 @@ msgid "Confirmation code not found."
 msgstr ""
 
 #: ../actions/register.php:202 actions/register.php:473
-#: actions/register.php:521 actions/register.php:531
+#: actions/register.php:521 actions/register.php:531 actions/register.php:537
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -798,10 +799,6 @@ msgstr ""
 msgid "Current confirmed email address."
 msgstr ""
 
-#: ../actions/showstream.php:356 actions/showstream.php:367
-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
@@ -810,6 +807,7 @@ 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
+#: classes/Notice.php:1120
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr ""
@@ -832,7 +830,8 @@ msgstr ""
 #: 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
+#: lib/accountsettingsaction.php:117 actions/register.php:437
+#: actions/register.php:441
 msgid "Email"
 msgstr ""
 
@@ -847,7 +846,7 @@ msgid "Email Settings"
 msgstr ""
 
 #: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
-#: actions/register.php:200 actions/register.php:206
+#: actions/register.php:200 actions/register.php:206 actions/register.php:212
 msgid "Email address already exists."
 msgstr ""
 
@@ -933,7 +932,7 @@ msgstr ""
 
 #: ../actions/password.php:80 actions/profilesettings.php:399
 #: actions/passwordsettings.php:164 actions/passwordsettings.php:169
-#: actions/passwordsettings.php:175
+#: actions/passwordsettings.php:175 actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr ""
 
@@ -945,6 +944,7 @@ msgstr ""
 #: actions/login.php:120 actions/recoverpassword.php:372
 #: actions/register.php:235 actions/login.php:122
 #: actions/recoverpassword.php:375 actions/register.php:242
+#: actions/login.php:149 actions/register.php:248
 msgid "Error setting user."
 msgstr ""
 
@@ -976,6 +976,7 @@ msgstr ""
 
 #: ../actions/avatar.php:115 actions/profilesettings.php:352
 #: actions/avatarsettings.php:397 actions/avatarsettings.php:349
+#: actions/avatarsettings.php:363
 msgid "Failed updating avatar."
 msgstr ""
 
@@ -1010,6 +1011,7 @@ msgid "Find people on this site"
 msgstr ""
 
 #: ../actions/login.php:122 actions/login.php:247 actions/login.php:255
+#: actions/login.php:282
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -1025,6 +1027,7 @@ msgstr ""
 #: actions/showstream.php:220 lib/groupeditform.php:157
 #: actions/profilesettings.php:111 actions/register.php:441
 #: actions/showgroup.php:247 actions/showstream.php:267
+#: actions/register.php:447 lib/userprofile.php:149
 msgid "Full name"
 msgstr ""
 
@@ -1038,7 +1041,7 @@ msgstr ""
 #: 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
+#: actions/register.php:214 actions/register.php:220
 msgid "Full name is too long (max 255 chars)."
 msgstr ""
 
@@ -1059,7 +1062,7 @@ msgstr ""
 #: 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
+#: actions/register.php:446 actions/register.php:452
 msgid "Homepage"
 msgstr ""
 
@@ -1071,7 +1074,7 @@ msgstr ""
 #: 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
+#: actions/register.php:211 actions/register.php:217
 msgid "Homepage is not a valid URL."
 msgstr ""
 
@@ -1109,12 +1112,6 @@ msgid ""
 "click \"Add\"."
 msgstr ""
 
-#: ../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 ""
-
 #: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
 #: actions/emailsettings.php:68 actions/smssettings.php:76
 #: actions/emailsettings.php:127 actions/smssettings.php:140
@@ -1137,7 +1134,7 @@ 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/login.php:116
+#: actions/facebookhome.php:129 actions/login.php:116 actions/login.php:143
 msgid "Incorrect username or password."
 msgstr ""
 
@@ -1215,6 +1212,7 @@ msgstr ""
 #: 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
+#: actions/register.php:243 actions/register.php:264
 msgid "Invalid username or password."
 msgstr ""
 
@@ -1286,7 +1284,7 @@ msgstr ""
 #: 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
+#: lib/profilelist.php:218 actions/register.php:470 lib/userprofile.php:164
 msgid "Location"
 msgstr ""
 
@@ -1300,7 +1298,7 @@ msgstr ""
 #: 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
+#: actions/register.php:221 actions/register.php:227
 msgid "Location is too long (max 255 chars)."
 msgstr ""
 
@@ -1314,6 +1312,7 @@ msgstr ""
 #: 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
+#: actions/login.php:204 actions/login.php:257
 #, php-format
 msgid "Login"
 msgstr ""
@@ -1339,12 +1338,13 @@ msgstr ""
 
 #: ../actions/register.php:166 actions/register.php:180
 #: actions/register.php:393 actions/register.php:439 actions/register.php:443
+#: actions/register.php:449
 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 actions/login.php:236
+#: lib/facebookaction.php:327 actions/login.php:236 actions/login.php:263
 msgid "Lost or forgotten password?"
 msgstr ""
 
@@ -1384,7 +1384,7 @@ 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:487
+#: actions/register.php:477 actions/register.php:487 actions/register.php:493
 msgid "My text and files are available under "
 msgstr ""
 
@@ -1442,7 +1442,8 @@ msgstr ""
 #: 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
+#: actions/showgroup.php:236 actions/showstream.php:249 actions/login.php:246
+#: actions/register.php:423 lib/userprofile.php:131
 msgid "Nickname"
 msgstr ""
 
@@ -1456,7 +1457,7 @@ msgstr ""
 #: 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
+#: actions/register.php:202 actions/register.php:208
 msgid "Nickname already in use. Try another one."
 msgstr ""
 
@@ -1472,7 +1473,7 @@ msgstr ""
 #: 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
+#: actions/register.php:199 actions/register.php:205
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
 
@@ -1711,7 +1712,8 @@ msgstr ""
 #: 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
+#: lib/api.php:954 lib/api.php:982 lib/api.php:1092 lib/api.php:963
+#: lib/api.php:991 lib/api.php:1101
 msgid "Not a supported data format."
 msgstr ""
 
@@ -1732,7 +1734,7 @@ 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
+#: actions/register.php:189 actions/register.php:195 actions/register.php:201
 msgid "Not a valid email address."
 msgstr ""
 
@@ -1744,7 +1746,7 @@ msgstr ""
 #: 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
+#: actions/register.php:204 actions/register.php:210
 msgid "Not a valid nickname."
 msgstr ""
 
@@ -1783,6 +1785,7 @@ msgstr ""
 #: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
 #: actions/twitapistatuses.php:309 actions/twitapistatuses.php:327
 #: actions/twitapistatuses.php:284 actions/apistatusesupdate.php:186
+#: actions/apistatusesupdate.php:193
 msgid "Not found"
 msgstr ""
 
@@ -1929,7 +1932,8 @@ msgstr ""
 #: 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
+#: lib/accountsettingsaction.php:114 actions/login.php:249
+#: actions/register.php:428
 msgid "Password"
 msgstr ""
 
@@ -1958,6 +1962,7 @@ msgstr ""
 #: actions/passwordsettings.php:173 actions/recoverpassword.php:200
 #: actions/passwordsettings.php:178 actions/recoverpassword.php:208
 #: actions/passwordsettings.php:184 actions/recoverpassword.php:211
+#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr ""
 
@@ -1966,6 +1971,7 @@ msgstr ""
 #: actions/passwordsettings.php:145 actions/register.php:183
 #: actions/passwordsettings.php:150 actions/register.php:220
 #: actions/passwordsettings.php:156 actions/register.php:227
+#: actions/register.php:233
 msgid "Passwords don't match."
 msgstr ""
 
@@ -2126,19 +2132,19 @@ msgstr ""
 #: 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
+#: lib/logingroupnav.php:85 actions/register.php:114 actions/register.php:502
 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
+#: actions/register.php:129 actions/register.php:135
 msgid "Registration not allowed."
 msgstr ""
 
 #: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67 actions/register.php:106
+#: actions/register.php:67 actions/register.php:106 actions/register.php:112
 msgid "Registration successful"
 msgstr ""
 
@@ -2152,6 +2158,7 @@ msgstr ""
 #: 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
+#: actions/login.php:252 actions/register.php:477
 msgid "Remember me"
 msgstr ""
 
@@ -2248,6 +2255,7 @@ msgstr ""
 
 #: ../actions/register.php:156 actions/register.php:170
 #: actions/register.php:377 actions/register.php:423 actions/register.php:427
+#: actions/register.php:433
 msgid "Same as password above. Required."
 msgstr ""
 
@@ -2403,6 +2411,7 @@ msgstr ""
 #: actions/remotesubscribe.php:113 actions/showstream.php:376
 #: lib/subscribeform.php:139 actions/showstream.php:345
 #: actions/remotesubscribe.php:137 actions/showstream.php:439
+#: lib/userprofile.php:321
 msgid "Subscribe"
 msgstr ""
 
@@ -2449,6 +2458,7 @@ msgstr ""
 #: actions/profilesettings.php:123 actions/showstream.php:255
 #: lib/subscriptionlist.php:106 lib/subscriptionlist.php:108
 #: actions/profilesettings.php:138 actions/showstream.php:327
+#: lib/userprofile.php:209
 msgid "Tags"
 msgstr ""
 
@@ -2657,6 +2667,7 @@ msgstr ""
 #: actions/apifriendshipsdestroy.php:91 actions/apigroupcreate.php:104
 #: actions/apigroupjoin.php:91 actions/apigroupleave.php:91
 #: actions/apistatusesupdate.php:109
+#: actions/apiaccountupdateprofileimage.php:84
 msgid "This method requires a POST."
 msgstr ""
 
@@ -2687,7 +2698,7 @@ msgstr ""
 
 #: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
 #: actions/twitapifriendships.php:132 actions/twitapifriendships.php:139
-#: actions/apifriendshipsexists.php:103
+#: actions/apifriendshipsexists.php:103 actions/apifriendshipsexists.php:94
 msgid "Two user ids or screen_names must be supplied."
 msgstr ""
 
@@ -2695,7 +2706,7 @@ msgstr ""
 #: 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
+#: actions/register.php:448 actions/register.php:454
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr ""
 
@@ -2717,6 +2728,7 @@ msgstr ""
 #: actions/twittersettings.php:322 lib/designsettings.php:301
 #: actions/emailsettings.php:255 actions/grouplogo.php:319
 #: actions/imsettings.php:220 actions/smssettings.php:248
+#: actions/avatarsettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr ""
 
@@ -2821,7 +2833,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
+#: actions/register.php:436 actions/register.php:438 actions/register.php:442
 msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
 
@@ -2849,7 +2861,8 @@ 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
+#: actions/apiusershow.php:108 actions/apiaccountupdateprofileimage.php:124
+#: actions/apiaccountupdateprofileimage.php:130
 msgid "User has no profile."
 msgstr ""
 
@@ -2878,7 +2891,7 @@ msgstr ""
 #: 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
+#: actions/register.php:466 actions/register.php:472
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr ""
 
@@ -2974,7 +2987,7 @@ 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:192
+#: actions/register.php:186 actions/register.php:192 actions/register.php:198
 msgid "You can't register if you don't agree to the license."
 msgstr ""
 
@@ -3037,56 +3050,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:816
+#: lib/util.php:770 lib/util.php:816 lib/util.php:844
 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:828
+#: lib/util.php:782 lib/util.php:828 lib/util.php:856
 #, 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:824
+#: lib/util.php:778 lib/util.php:824 lib/util.php:852
 #, 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:820
+#: lib/util.php:774 lib/util.php:820 lib/util.php:848
 #, 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:832
+#: lib/util.php:786 lib/util.php:832 lib/util.php:860
 #, 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:826
+#: lib/util.php:780 lib/util.php:826 lib/util.php:854
 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:818
+#: lib/util.php:772 lib/util.php:818 lib/util.php:846
 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:830
+#: lib/util.php:784 lib/util.php:830 lib/util.php:858
 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:834
+#: lib/util.php:788 lib/util.php:834 lib/util.php:862
 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:822
+#: lib/util.php:776 lib/util.php:822 lib/util.php:850
 msgid "about an hour ago"
 msgstr ""
 
@@ -3155,7 +3168,9 @@ msgstr ""
 #: 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
+#: actions/userauthorization.php:52 actions/login.php:131
+#: actions/register.php:165 actions/avatarsettings.php:265
+#: lib/designsettings.php:294
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
@@ -3375,6 +3390,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
+#: actions/register.php:230
 msgid "Password must be 6 or more characters."
 msgstr ""
 
@@ -3913,13 +3929,13 @@ msgid "There was a problem with your session token. "
 msgstr ""
 
 #: actions/avatarsettings.php:303 actions/grouplogo.php:360
-#: actions/avatarsettings.php:308
+#: actions/avatarsettings.php:308 actions/avatarsettings.php:322
 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
+#: actions/grouplogo.php:377 actions/avatarsettings.php:337
 msgid "Lost our file data."
 msgstr ""
 
@@ -4375,7 +4391,7 @@ msgid "%s left group %s"
 msgstr ""
 
 #: actions/login.php:225 lib/facebookaction.php:304 actions/login.php:208
-#: actions/login.php:216
+#: actions/login.php:216 actions/login.php:243
 msgid "Login to site"
 msgstr ""
 
@@ -4550,7 +4566,8 @@ 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
+#: actions/register.php:398 actions/register.php:85 actions/register.php:189
+#: actions/register.php:404
 msgid "Sorry, only invited people can register."
 msgstr ""
 
@@ -4632,7 +4649,7 @@ msgstr ""
 #: 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
+#: lib/profilelist.php:230 lib/userprofile.php:177
 msgid "URL"
 msgstr ""
 
@@ -4643,7 +4660,7 @@ msgstr ""
 #: 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
+#: lib/profilelist.php:245 lib/userprofile.php:194
 msgid "Note"
 msgstr ""
 
@@ -4690,6 +4707,7 @@ msgid "Only the sender and recipient "
 msgstr ""
 
 #: actions/showstream.php:73 actions/showstream.php:78
+#: actions/showstream.php:79
 #, php-format
 msgid "%s, page %d"
 msgstr ""
@@ -4700,28 +4718,29 @@ msgstr ""
 
 #: actions/showstream.php:236 actions/tagother.php:77
 #: actions/showstream.php:220 actions/showstream.php:185
-#: actions/showstream.php:193
+#: actions/showstream.php:193 lib/userprofile.php:75
 msgid "User profile"
 msgstr ""
 
 #: actions/showstream.php:240 actions/tagother.php:81
 #: actions/showstream.php:224 actions/showstream.php:189
-#: actions/showstream.php:220
+#: actions/showstream.php:220 lib/userprofile.php:102
 msgid "Photo"
 msgstr ""
 
 #: actions/showstream.php:317 actions/showstream.php:309
 #: actions/showstream.php:274 actions/showstream.php:354
+#: lib/userprofile.php:236
 msgid "User actions"
 msgstr ""
 
 #: actions/showstream.php:342 actions/showstream.php:307
-#: actions/showstream.php:390
+#: actions/showstream.php:390 lib/userprofile.php:272
 msgid "Send a direct message to this user"
 msgstr ""
 
 #: actions/showstream.php:343 actions/showstream.php:308
-#: actions/showstream.php:391
+#: actions/showstream.php:391 lib/userprofile.php:273
 msgid "Message"
 msgstr ""
 
@@ -5411,7 +5430,7 @@ msgstr ""
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr ""
 
-#: actions/avatarsettings.php:373
+#: actions/avatarsettings.php:373 actions/avatarsettings.php:387
 msgid "Avatar deleted."
 msgstr ""
 
@@ -5533,10 +5552,12 @@ msgid ""
 msgstr ""
 
 #: actions/register.php:432 actions/register.php:479 actions/register.php:489
+#: actions/register.php:495
 msgid "Creative Commons Attribution 3.0"
 msgstr ""
 
 #: actions/register.php:433 actions/register.php:480 actions/register.php:490
+#: actions/register.php:496
 msgid ""
 " except this private data: password, email address, IM address, and phone "
 "number."
@@ -5568,42 +5589,46 @@ msgid "%s's profile"
 msgstr ""
 
 #: actions/showstream.php:163 actions/showstream.php:128
+#: actions/showstream.php:129
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr ""
 
 #: actions/showstream.php:170 actions/showstream.php:135
+#: actions/showstream.php:136
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr ""
 
 #: actions/showstream.php:177 actions/showstream.php:142
+#: actions/showstream.php:143
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr ""
 
 #: actions/showstream.php:182 actions/showstream.php:147
+#: actions/showstream.php:148
 #, php-format
 msgid "FOAF for %s"
 msgstr ""
 
 #: actions/showstream.php:237 actions/showstream.php:202
-#: actions/showstream.php:234
+#: actions/showstream.php:234 lib/userprofile.php:116
 msgid "Edit Avatar"
 msgstr ""
 
 #: actions/showstream.php:316 actions/showstream.php:281
-#: actions/showstream.php:366
+#: actions/showstream.php:366 lib/userprofile.php:248
 msgid "Edit profile settings"
 msgstr ""
 
 #: actions/showstream.php:317 actions/showstream.php:282
-#: actions/showstream.php:367
+#: actions/showstream.php:367 lib/userprofile.php:249
 msgid "Edit"
 msgstr ""
 
 #: actions/showstream.php:542 actions/showstream.php:388
-#: actions/showstream.php:487
+#: actions/showstream.php:487 actions/showstream.php:234
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5645,6 +5670,9 @@ msgstr ""
 #: actions/apistatusesupdate.php:125 actions/apisubscriptions.php:87
 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#: actions/apiaccountupdateprofileimage.php:91
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apistatusesupdate.php:139
 msgid "No such user!"
 msgstr ""
 
@@ -5692,36 +5720,6 @@ msgid ""
 "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 ""
@@ -5883,6 +5881,7 @@ 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
+#: actions/showstream.php:202
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -6047,7 +6046,8 @@ 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
+#: lib/designsettings.php:461 lib/designsettings.php:434
+#: lib/designsettings.php:464
 msgid "Couldn't update your design."
 msgstr ""
 
@@ -6135,7 +6135,9 @@ msgid "Message sent"
 msgstr ""
 
 #: actions/newnotice.php:93 lib/designsettings.php:281
-#: actions/newnotice.php:94
+#: actions/newnotice.php:94 actions/apiaccountupdateprofileimage.php:97
+#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254
+#: lib/designsettings.php:283
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s bytes) due to its "
@@ -6294,7 +6296,7 @@ msgstr ""
 msgid "Password recover"
 msgstr ""
 
-#: actions/register.php:86
+#: actions/register.php:86 actions/register.php:92
 msgid "Sorry, invalid invitation code."
 msgstr ""
 
@@ -6390,28 +6392,31 @@ msgstr ""
 msgid "Not a local notice"
 msgstr ""
 
-#: actions/showstream.php:72
+#: actions/showstream.php:72 actions/showstream.php:73
 #, php-format
 msgid " tagged %s"
 msgstr ""
 
-#: actions/showstream.php:121
+#: actions/showstream.php:121 actions/showstream.php:122
 #, php-format
 msgid "Notice feed for %s tagged %s (RSS 1.0)"
 msgstr ""
 
 #: actions/showstream.php:350 actions/showstream.php:444
+#: actions/showstream.php:191
 #, 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
+#: actions/showstream.php:196
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
 msgstr ""
 
 #: actions/showstream.php:357 actions/showstream.php:451
+#: actions/showstream.php:198
 #, php-format
 msgid ""
 "You can try to nudge %s or [post something to his or her attention](%%%%"
@@ -6419,6 +6424,7 @@ msgid ""
 msgstr ""
 
 #: actions/showstream.php:393 actions/showstream.php:492
+#: actions/showstream.php:239
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -6560,6 +6566,7 @@ msgid "Problem saving notice. Too long."
 msgstr ""
 
 #: classes/User.php:319 classes/User.php:327 classes/User.php:334
+#: classes/User.php:333
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr ""
@@ -6663,10 +6670,12 @@ msgid "Save design"
 msgstr ""
 
 #: lib/designsettings.php:378 lib/designsettings.php:369
+#: lib/designsettings.php:372
 msgid "Bad default color settings: "
 msgstr ""
 
 #: lib/designsettings.php:474 lib/designsettings.php:465
+#: lib/designsettings.php:468
 msgid "Design defaults restored."
 msgstr ""
 
@@ -6864,16 +6873,18 @@ msgid "Status deleted."
 msgstr ""
 
 #: actions/apistatusesupdate.php:132
+#: actions/apiaccountupdateprofileimage.php:99
 msgid "Unable to handle that much POST data!"
 msgstr ""
 
 #: actions/apistatusesupdate.php:145 actions/newnotice.php:155
-#: scripts/maildaemon.php:71
+#: scripts/maildaemon.php:71 actions/apistatusesupdate.php:152
 #, php-format
 msgid "That's too long. Max notice size is %d chars."
 msgstr ""
 
 #: actions/apistatusesupdate.php:209 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:216
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
@@ -6929,7 +6940,7 @@ msgstr ""
 msgid "IM is not available."
 msgstr ""
 
-#: actions/login.php:259
+#: actions/login.php:259 actions/login.php:286
 #, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -6960,20 +6971,23 @@ msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
 msgstr ""
 
 #: actions/profilesettings.php:122 actions/register.php:454
+#: actions/register.php:460
 #, php-format
 msgid "Describe yourself and your interests in %d chars"
 msgstr ""
 
 #: actions/profilesettings.php:125 actions/register.php:457
+#: actions/register.php:463
 msgid "Describe yourself and your interests"
 msgstr ""
 
 #: actions/profilesettings.php:221 actions/register.php:217
+#: actions/register.php:223
 #, php-format
 msgid "Bio is too long (max %d chars)."
 msgstr ""
 
-#: actions/register.php:336
+#: actions/register.php:336 actions/register.php:342
 msgid ""
 "With this form you can create  a new account. You can then post notices and "
 "link up to friends and colleagues. "
@@ -7159,41 +7173,6 @@ 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
 msgid "No configuration file found. "
 msgstr ""
@@ -7289,3 +7268,58 @@ msgstr ""
 #: lib/oauthstore.php:345
 msgid "Duplicate notice"
 msgstr ""
+
+#: actions/login.php:110 actions/login.php:120
+msgid "Invalid or expired token."
+msgstr ""
+
+#: lib/command.php:597
+#, php-format
+msgid "Could not create login token for %s"
+msgstr ""
+
+#: lib/command.php:602
+#, php-format
+msgid "This link is useable only once, and is good for only 2 minutes: %s"
+msgstr ""
+
+#: lib/imagefile.php:75
+#, php-format
+msgid "That file is too big. The maximum file size is %s."
+msgstr ""
+
+#: lib/command.php:613
+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"
+"login - Get a link to login to the web interface\n"
+"drop <group> - leave group\n"
+"stats - get your stats\n"
+"stop - same as 'off'\n"
+"quit - same as 'off'\n"
+"sub <nickname> - same as 'follow'\n"
+"unsub <nickname> - same as 'leave'\n"
+"last <nickname> - same as 'get'\n"
+"on <nickname> - not yet implemented.\n"
+"off <nickname> - not yet implemented.\n"
+"nudge <nickname> - remind a user to update.\n"
+"invite <phone number> - not yet implemented.\n"
+"track <word> - not yet implemented.\n"
+"untrack <word> - not yet implemented.\n"
+"track off - not yet implemented.\n"
+"untrack all - not yet implemented.\n"
+"tracks - not yet implemented.\n"
+"tracking - not yet implemented.\n"
+msgstr ""
diff --git a/locale/sv/LC_MESSAGES/statusnet.mo b/locale/sv/LC_MESSAGES/statusnet.mo
index 2b81e4b3d..9623ef664 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 d30753a0f..75282e518 100644
--- a/locale/sv/LC_MESSAGES/statusnet.po
+++ b/locale/sv/LC_MESSAGES/statusnet.po
@@ -6,12 +6,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-06 13:16+0000\n"
-"PO-Revision-Date: 2009-11-06 15:44:33+0000\n"
+"POT-Creation-Date: 2009-11-08 11:53+0000\n"
+"PO-Revision-Date: 2009-11-08 11:57:11+0000\n"
 "Language-Team: Swedish\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r58648); Translate extension (2009-08-03)\n"
+"X-Generator: MediaWiki 1.16alpha(r58760); 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"
@@ -197,7 +197,7 @@ msgid "%s updates from everyone!"
 msgstr "%s uppdateringar ifrån allihop!"
 
 #: ../actions/register.php:213 actions/register.php:497
-#: actions/register.php:545 actions/register.php:555
+#: actions/register.php:545 actions/register.php:555 actions/register.php:561
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -235,6 +235,7 @@ 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
+#: actions/register.php:424
 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 "
@@ -253,6 +254,7 @@ 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:419 actions/register.php:423
+#: actions/register.php:429
 msgid "6 or more characters. Required."
 msgstr "6 eller fler tecken. Måste fyllas i."
 
@@ -433,7 +435,7 @@ msgstr "Alla uppdateringar som matchar söksträngen \"%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
+#: actions/login.php:79 actions/register.php:137
 msgid "Already logged in."
 msgstr "Redan inloggad."
 
@@ -456,7 +458,7 @@ msgstr "Tillåt prenumeration."
 #: ../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
+#: actions/register.php:473 actions/login.php:253 actions/register.php:479
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Logga in automatiskt i framtiden; Ej för publika datorer!"
 
@@ -480,6 +482,7 @@ msgstr "Användarbild"
 
 #: ../actions/avatar.php:113 actions/profilesettings.php:350
 #: actions/avatarsettings.php:395 actions/avatarsettings.php:346
+#: actions/avatarsettings.php:360
 msgid "Avatar updated."
 msgstr "Användarbilden uppdaterad."
 
@@ -515,7 +518,7 @@ msgstr "Före"
 #: 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
+#: actions/register.php:459 actions/register.php:465
 msgid "Bio"
 msgstr "Biografi"
 
@@ -544,6 +547,7 @@ msgstr "Kan inte läsa användarbild URL '%s'"
 #: actions/passwordsettings.php:169 actions/recoverpassword.php:347
 #: actions/passwordsettings.php:174 actions/recoverpassword.php:365
 #: actions/passwordsettings.php:180 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:185
 msgid "Can't save new password."
 msgstr "Kan inte spara det nya lösenordet."
 
@@ -606,6 +610,7 @@ msgstr "Ändra dina profilinställningar"
 #: actions/recoverpassword.php:236 actions/register.php:422
 #: actions/passwordsettings.php:111 actions/recoverpassword.php:239
 #: actions/register.php:426 actions/smssettings.php:134
+#: actions/register.php:432
 msgid "Confirm"
 msgstr "Bekräfta"
 
@@ -635,7 +640,7 @@ msgid "Confirmation code not found."
 msgstr "Bekräftelsekoden kunde inte hittas."
 
 #: ../actions/register.php:202 actions/register.php:473
-#: actions/register.php:521 actions/register.php:531
+#: actions/register.php:521 actions/register.php:531 actions/register.php:537
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -873,6 +878,7 @@ 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
+#: classes/Notice.php:1120
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Databasfel för svar: %s"
@@ -895,7 +901,8 @@ msgstr "Berätta om dig själv och dina intressen inom 140 tecken"
 #: 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
+#: lib/accountsettingsaction.php:117 actions/register.php:437
+#: actions/register.php:441
 msgid "Email"
 msgstr "Epost"
 
@@ -910,7 +917,7 @@ 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
+#: actions/register.php:200 actions/register.php:206 actions/register.php:212
 msgid "Email address already exists."
 msgstr "Epostadressen finns redan."
 
@@ -996,7 +1003,7 @@ msgstr "Fel uppstog när användaren skulle sparas."
 
 #: ../actions/password.php:80 actions/profilesettings.php:399
 #: actions/passwordsettings.php:164 actions/passwordsettings.php:169
-#: actions/passwordsettings.php:175
+#: actions/passwordsettings.php:175 actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "Fel uppstog när användare skulle sparas."
 
@@ -1008,6 +1015,7 @@ msgstr "Fel uppstog när användare skulle sparas."
 #: actions/login.php:120 actions/recoverpassword.php:372
 #: actions/register.php:235 actions/login.php:122
 #: actions/recoverpassword.php:375 actions/register.php:242
+#: actions/login.php:149 actions/register.php:248
 msgid "Error setting user."
 msgstr "Fel uppstog i användarens inställning"
 
@@ -1039,6 +1047,7 @@ msgstr "Frågor & svar"
 
 #: ../actions/avatar.php:115 actions/profilesettings.php:352
 #: actions/avatarsettings.php:397 actions/avatarsettings.php:349
+#: actions/avatarsettings.php:363
 msgid "Failed updating avatar."
 msgstr "Uppdatering av profilbild misslyckades."
 
@@ -1073,6 +1082,7 @@ msgid "Find people on this site"
 msgstr "Sök personer på denna sida"
 
 #: ../actions/login.php:122 actions/login.php:247 actions/login.php:255
+#: actions/login.php:282
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -1090,6 +1100,7 @@ msgstr ""
 #: actions/showstream.php:220 lib/groupeditform.php:157
 #: actions/profilesettings.php:111 actions/register.php:441
 #: actions/showgroup.php:247 actions/showstream.php:267
+#: actions/register.php:447 lib/userprofile.php:149
 msgid "Full name"
 msgstr "Ditt fulla namn."
 
@@ -1103,7 +1114,7 @@ msgstr "Ditt fulla namn."
 #: 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
+#: actions/register.php:214 actions/register.php:220
 msgid "Full name is too long (max 255 chars)."
 msgstr "Ditt namn är för långt (max 255 tecken)."
 
@@ -1124,7 +1135,7 @@ msgstr "Hem"
 #: 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
+#: actions/register.php:446 actions/register.php:452
 msgid "Homepage"
 msgstr "Hemsida"
 
@@ -1136,7 +1147,7 @@ msgstr "Hemsida"
 #: 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
+#: actions/register.php:211 actions/register.php:217
 msgid "Homepage is not a valid URL."
 msgstr "Hemsidan har ingen giltig URL"
 
@@ -1208,7 +1219,7 @@ msgstr "Felaktigt, gammalt lösenord"
 
 #: ../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
+#: actions/facebookhome.php:129 actions/login.php:116 actions/login.php:143
 msgid "Incorrect username or password."
 msgstr "Felaktigt användarnamn eller lösenord."
 
@@ -1288,6 +1299,7 @@ msgstr "Felaktig storlek"
 #: 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
+#: actions/register.php:243 actions/register.php:264
 msgid "Invalid username or password."
 msgstr "Felaktigt användarnamn eller lösenord."
 
@@ -1364,7 +1376,7 @@ msgstr "Språket är för långt(max 50 tecken)."
 #: 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
+#: lib/profilelist.php:218 actions/register.php:470 lib/userprofile.php:164
 msgid "Location"
 msgstr "Plats"
 
@@ -1378,7 +1390,7 @@ msgstr "Plats"
 #: 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
+#: actions/register.php:221 actions/register.php:227
 msgid "Location is too long (max 255 chars)."
 msgstr "Platse är för lång (max 255 tecken)."
 
@@ -1392,6 +1404,7 @@ msgstr "Platse är för lång (max 255 tecken)."
 #: 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
+#: actions/login.php:204 actions/login.php:257
 #, php-format
 msgid "Login"
 msgstr "Logga in"
@@ -1420,12 +1433,13 @@ msgstr "Logga ut"
 
 #: ../actions/register.php:166 actions/register.php:180
 #: actions/register.php:393 actions/register.php:439 actions/register.php:443
+#: actions/register.php:449
 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 actions/login.php:228 lib/facebookaction.php:325
-#: lib/facebookaction.php:327 actions/login.php:236
+#: lib/facebookaction.php:327 actions/login.php:236 actions/login.php:263
 msgid "Lost or forgotten password?"
 msgstr "Glömt bort lösenord?"
 
@@ -1468,7 +1482,7 @@ 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:487
+#: actions/register.php:477 actions/register.php:487 actions/register.php:493
 msgid "My text and files are available under "
 msgstr "Min text och filer finns tillgängliga under"
 
@@ -1526,7 +1540,8 @@ msgstr "Nya lösenordet har blivit sparat. Du är nu även inloggad."
 #: 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
+#: actions/showgroup.php:236 actions/showstream.php:249 actions/login.php:246
+#: actions/register.php:423 lib/userprofile.php:131
 msgid "Nickname"
 msgstr "Smeknamn"
 
@@ -1540,7 +1555,7 @@ msgstr "Smeknamn"
 #: 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
+#: actions/register.php:202 actions/register.php:208
 msgid "Nickname already in use. Try another one."
 msgstr "Användarnamnet används redan, försök med ett annat."
 
@@ -1556,7 +1571,7 @@ msgstr "Användarnamnet används redan, försök med ett annat."
 #: 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
+#: actions/register.php:199 actions/register.php:205
 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."
@@ -1796,7 +1811,8 @@ msgstr "Inte registrerad användare."
 #: 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
+#: lib/api.php:954 lib/api.php:982 lib/api.php:1092 lib/api.php:963
+#: lib/api.php:991 lib/api.php:1101
 msgid "Not a supported data format."
 msgstr "Ingen support för det formatet."
 
@@ -1817,7 +1833,7 @@ 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
+#: actions/register.php:189 actions/register.php:195 actions/register.php:201
 msgid "Not a valid email address."
 msgstr "Det är ingen giltig epost adress."
 
@@ -1829,7 +1845,7 @@ msgstr "Det är ingen giltig epost adress."
 #: 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
+#: actions/register.php:204 actions/register.php:210
 msgid "Not a valid nickname."
 msgstr "Det är inget giltigt användarnamn."
 
@@ -1868,6 +1884,7 @@ msgstr "Väntade mig inte detta svar!"
 #: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
 #: actions/twitapistatuses.php:309 actions/twitapistatuses.php:327
 #: actions/twitapistatuses.php:284 actions/apistatusesupdate.php:186
+#: actions/apistatusesupdate.php:193
 msgid "Not found"
 msgstr "Hittades inte"
 
@@ -2014,7 +2031,8 @@ msgstr "Bitvis uppladdad."
 #: 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
+#: lib/accountsettingsaction.php:114 actions/login.php:249
+#: actions/register.php:428
 msgid "Password"
 msgstr "Lösenord"
 
@@ -2043,6 +2061,7 @@ msgstr "Förfrågan om återställning av lösenord"
 #: actions/passwordsettings.php:173 actions/recoverpassword.php:200
 #: actions/passwordsettings.php:178 actions/recoverpassword.php:208
 #: actions/passwordsettings.php:184 actions/recoverpassword.php:211
+#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "Lösenord är sparat."
 
@@ -2051,6 +2070,7 @@ msgstr "Lösenord är sparat."
 #: actions/passwordsettings.php:145 actions/register.php:183
 #: actions/passwordsettings.php:150 actions/register.php:220
 #: actions/passwordsettings.php:156 actions/register.php:227
+#: actions/register.php:233
 msgid "Passwords don't match."
 msgstr "Lösenorden matchar inte."
 
@@ -2214,19 +2234,19 @@ msgstr "Kod för återställning av okänd användare."
 #: 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
+#: lib/logingroupnav.php:85 actions/register.php:114 actions/register.php:502
 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
+#: actions/register.php:129 actions/register.php:135
 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:106
+#: actions/register.php:67 actions/register.php:106 actions/register.php:112
 msgid "Registration successful"
 msgstr "Registreringen är genomförd"
 
@@ -2240,6 +2260,7 @@ msgstr "Avvisa"
 #: 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
+#: actions/login.php:252 actions/register.php:477
 msgid "Remember me"
 msgstr "Kom ihåg mig"
 
@@ -2338,6 +2359,7 @@ msgstr "Samma som lösenordet ovan"
 
 #: ../actions/register.php:156 actions/register.php:170
 #: actions/register.php:377 actions/register.php:423 actions/register.php:427
+#: actions/register.php:433
 msgid "Same as password above. Required."
 msgstr "Samma som lösenordet ovan. Måste fyllas i."
 
@@ -2501,6 +2523,7 @@ msgstr "Sparade OpenID kunde inte hittas."
 #: actions/remotesubscribe.php:113 actions/showstream.php:376
 #: lib/subscribeform.php:139 actions/showstream.php:345
 #: actions/remotesubscribe.php:137 actions/showstream.php:439
+#: lib/userprofile.php:321
 msgid "Subscribe"
 msgstr "Prenumerera"
 
@@ -2547,6 +2570,7 @@ msgstr "Systemfel när filen laddades upp."
 #: actions/profilesettings.php:123 actions/showstream.php:255
 #: lib/subscriptionlist.php:106 lib/subscriptionlist.php:108
 #: actions/profilesettings.php:138 actions/showstream.php:327
+#: lib/userprofile.php:209
 msgid "Tags"
 msgstr "Taggar"
 
@@ -2767,6 +2791,7 @@ msgstr "Denna metod kräver antingen skicka eller tabort."
 #: actions/apifriendshipsdestroy.php:91 actions/apigroupcreate.php:104
 #: actions/apigroupjoin.php:91 actions/apigroupleave.php:91
 #: actions/apistatusesupdate.php:109
+#: actions/apiaccountupdateprofileimage.php:84
 msgid "This method requires a POST."
 msgstr "Denna metod kräver skicka."
 
@@ -2801,7 +2826,7 @@ msgstr ""
 
 #: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
 #: actions/twitapifriendships.php:132 actions/twitapifriendships.php:139
-#: actions/apifriendshipsexists.php:103
+#: actions/apifriendshipsexists.php:103 actions/apifriendshipsexists.php:94
 msgid "Two user ids or screen_names must be supplied."
 msgstr "Två användarid eller namn måste läggas till."
 
@@ -2809,7 +2834,7 @@ msgstr "Två användarid eller namn måste läggas till."
 #: 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
+#: actions/register.php:448 actions/register.php:454
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "URL till din hemsida, blog eller profil på en annan sida."
 
@@ -2831,6 +2856,7 @@ msgstr "URL till din profil på en annan kompatibel mikroblogg"
 #: actions/twittersettings.php:322 lib/designsettings.php:301
 #: actions/emailsettings.php:255 actions/grouplogo.php:319
 #: actions/imsettings.php:220 actions/smssettings.php:248
+#: actions/avatarsettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "Oväntat utskick av formuläret."
 
@@ -2943,7 +2969,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
+#: actions/register.php:436 actions/register.php:438 actions/register.php:442
 msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
 "Används endast för uppdateringar, annonsering och återställning av lösenord"
@@ -2972,7 +2998,8 @@ msgstr "Användaren som avlyssnas existerar inte."
 #: 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
+#: actions/apiusershow.php:108 actions/apiaccountupdateprofileimage.php:124
+#: actions/apiaccountupdateprofileimage.php:130
 msgid "User has no profile."
 msgstr "Användaren har ingen profil."
 
@@ -3001,7 +3028,7 @@ msgstr "Vad är på gång, %s?"
 #: 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
+#: actions/register.php:466 actions/register.php:472
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Var du håller till, såsom \"Stad, Län, Land\""
 
@@ -3104,7 +3131,7 @@ 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/register.php:149
-#: actions/register.php:186 actions/register.php:192
+#: actions/register.php:186 actions/register.php:192 actions/register.php:198
 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."
 
@@ -3179,56 +3206,56 @@ msgstr ""
 "Ställ in ditt OpenID konto härifrån."
 
 #: ../lib/util.php:943 lib/util.php:992 lib/util.php:945 lib/util.php:756
-#: lib/util.php:770 lib/util.php:816
+#: lib/util.php:770 lib/util.php:816 lib/util.php:844
 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:768
-#: lib/util.php:782 lib/util.php:828
+#: lib/util.php:782 lib/util.php:828 lib/util.php:856
 #, 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:764
-#: lib/util.php:778 lib/util.php:824
+#: lib/util.php:778 lib/util.php:824 lib/util.php:852
 #, 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:760
-#: lib/util.php:774 lib/util.php:820
+#: lib/util.php:774 lib/util.php:820 lib/util.php:848
 #, 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:772
-#: lib/util.php:786 lib/util.php:832
+#: lib/util.php:786 lib/util.php:832 lib/util.php:860
 #, 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:766
-#: lib/util.php:780 lib/util.php:826
+#: lib/util.php:780 lib/util.php:826 lib/util.php:854
 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:758
-#: lib/util.php:772 lib/util.php:818
+#: lib/util.php:772 lib/util.php:818 lib/util.php:846
 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:770
-#: lib/util.php:784 lib/util.php:830
+#: lib/util.php:784 lib/util.php:830 lib/util.php:858
 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:774
-#: lib/util.php:788 lib/util.php:834
+#: lib/util.php:788 lib/util.php:834 lib/util.php:862
 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:762
-#: lib/util.php:776 lib/util.php:822
+#: lib/util.php:776 lib/util.php:822 lib/util.php:850
 msgid "about an hour ago"
 msgstr "för en timma sedan"
 
@@ -3297,7 +3324,9 @@ msgstr "Efter"
 #: 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
+#: actions/userauthorization.php:52 actions/login.php:131
+#: actions/register.php:165 actions/avatarsettings.php:265
+#: lib/designsettings.php:294
 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."
 
@@ -3520,6 +3549,7 @@ 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
+#: actions/register.php:230
 msgid "Password must be 6 or more characters."
 msgstr "Lösenordet måste vara minst 6 tecken."
 
@@ -4068,13 +4098,13 @@ 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
+#: actions/avatarsettings.php:308 actions/avatarsettings.php:322
 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
+#: actions/grouplogo.php:377 actions/avatarsettings.php:337
 msgid "Lost our file data."
 msgstr ""
 
@@ -4584,7 +4614,7 @@ msgid "%s left group %s"
 msgstr ""
 
 #: actions/login.php:225 lib/facebookaction.php:304 actions/login.php:208
-#: actions/login.php:216
+#: actions/login.php:216 actions/login.php:243
 msgid "Login to site"
 msgstr ""
 
@@ -4778,7 +4808,8 @@ 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
+#: actions/register.php:398 actions/register.php:85 actions/register.php:189
+#: actions/register.php:404
 msgid "Sorry, only invited people can register."
 msgstr ""
 
@@ -4873,7 +4904,7 @@ msgstr "Inget sådant inlägg."
 #: 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
+#: lib/profilelist.php:230 lib/userprofile.php:177
 msgid "URL"
 msgstr ""
 
@@ -4884,7 +4915,7 @@ msgstr ""
 #: 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
+#: lib/profilelist.php:245 lib/userprofile.php:194
 #, fuzzy
 msgid "Note"
 msgstr "Inlägg"
@@ -4934,6 +4965,7 @@ 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:78
+#: actions/showstream.php:79
 #, fuzzy, php-format
 msgid "%s, page %d"
 msgstr "Inbox för %s - sida %d"
@@ -4945,31 +4977,32 @@ msgstr "Profil"
 
 #: actions/showstream.php:236 actions/tagother.php:77
 #: actions/showstream.php:220 actions/showstream.php:185
-#: actions/showstream.php:193
+#: actions/showstream.php:193 lib/userprofile.php:75
 #, 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
+#: actions/showstream.php:220 lib/userprofile.php:102
 msgid "Photo"
 msgstr ""
 
 #: actions/showstream.php:317 actions/showstream.php:309
 #: actions/showstream.php:274 actions/showstream.php:354
+#: lib/userprofile.php:236
 #, fuzzy
 msgid "User actions"
 msgstr "Okänd funktion"
 
 #: actions/showstream.php:342 actions/showstream.php:307
-#: actions/showstream.php:390
+#: actions/showstream.php:390 lib/userprofile.php:272
 #, 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:308
-#: actions/showstream.php:391
+#: actions/showstream.php:391 lib/userprofile.php:273
 #, fuzzy
 msgid "Message"
 msgstr "Nytt meddelande"
@@ -5737,7 +5770,7 @@ msgstr "%s med vänner"
 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
+#: actions/avatarsettings.php:373 actions/avatarsettings.php:387
 #, fuzzy
 msgid "Avatar deleted."
 msgstr "Användarbilden uppdaterad."
@@ -5872,10 +5905,12 @@ msgid ""
 msgstr ""
 
 #: actions/register.php:432 actions/register.php:479 actions/register.php:489
+#: actions/register.php:495
 msgid "Creative Commons Attribution 3.0"
 msgstr ""
 
 #: actions/register.php:433 actions/register.php:480 actions/register.php:490
+#: actions/register.php:496
 #, fuzzy
 msgid ""
 " except this private data: password, email address, IM address, and phone "
@@ -5912,44 +5947,48 @@ msgid "%s's profile"
 msgstr "Profil"
 
 #: actions/showstream.php:163 actions/showstream.php:128
+#: actions/showstream.php:129
 #, 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
+#: actions/showstream.php:136
 #, 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
+#: actions/showstream.php:143
 #, 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
+#: actions/showstream.php:148
 #, fuzzy, php-format
 msgid "FOAF for %s"
 msgstr "Outbox för %s"
 
 #: actions/showstream.php:237 actions/showstream.php:202
-#: actions/showstream.php:234
+#: actions/showstream.php:234 lib/userprofile.php:116
 #, fuzzy
 msgid "Edit Avatar"
 msgstr "Användarbild"
 
 #: actions/showstream.php:316 actions/showstream.php:281
-#: actions/showstream.php:366
+#: actions/showstream.php:366 lib/userprofile.php:248
 #, fuzzy
 msgid "Edit profile settings"
 msgstr "Profil inställningar"
 
 #: actions/showstream.php:317 actions/showstream.php:282
-#: actions/showstream.php:367
+#: actions/showstream.php:367 lib/userprofile.php:249
 msgid "Edit"
 msgstr ""
 
 #: actions/showstream.php:542 actions/showstream.php:388
-#: actions/showstream.php:487
+#: actions/showstream.php:487 actions/showstream.php:234
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5995,6 +6034,9 @@ msgstr ""
 #: actions/apistatusesupdate.php:125 actions/apisubscriptions.php:87
 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#: actions/apiaccountupdateprofileimage.php:91
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apistatusesupdate.php:139
 #, fuzzy
 msgid "No such user!"
 msgstr "Ingen sådan användare"
@@ -6050,36 +6092,6 @@ msgid ""
 "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 ""
@@ -6248,6 +6260,7 @@ 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
+#: actions/showstream.php:202
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -6427,7 +6440,8 @@ 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
+#: lib/designsettings.php:461 lib/designsettings.php:434
+#: lib/designsettings.php:464
 #, fuzzy
 msgid "Couldn't update your design."
 msgstr "Kunde inte uppdatera användare."
@@ -6522,7 +6536,9 @@ msgid "Message sent"
 msgstr "Nytt meddelande"
 
 #: actions/newnotice.php:93 lib/designsettings.php:281
-#: actions/newnotice.php:94
+#: actions/newnotice.php:94 actions/apiaccountupdateprofileimage.php:97
+#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254
+#: lib/designsettings.php:283
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s bytes) due to its "
@@ -6690,7 +6706,7 @@ msgstr "Du är identifierad. Skriv ett nytt lösenord nedan."
 msgid "Password recover"
 msgstr "Förfrågan om återställning av lösenord"
 
-#: actions/register.php:86
+#: actions/register.php:86 actions/register.php:92
 #, fuzzy
 msgid "Sorry, invalid invitation code."
 msgstr "Fel uppstog med bekräftelsekoden."
@@ -6789,28 +6805,31 @@ msgstr ""
 msgid "Not a local notice"
 msgstr "Ingen sådan användare"
 
-#: actions/showstream.php:72
+#: actions/showstream.php:72 actions/showstream.php:73
 #, fuzzy, php-format
 msgid " tagged %s"
 msgstr "Inlägg taggade med %s"
 
-#: actions/showstream.php:121
+#: actions/showstream.php:121 actions/showstream.php:122
 #, 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
+#: actions/showstream.php:191
 #, 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
+#: actions/showstream.php:196
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
 msgstr ""
 
 #: actions/showstream.php:357 actions/showstream.php:451
+#: actions/showstream.php:198
 #, php-format
 msgid ""
 "You can try to nudge %s or [post something to his or her attention](%%%%"
@@ -6818,6 +6837,7 @@ msgid ""
 msgstr ""
 
 #: actions/showstream.php:393 actions/showstream.php:492
+#: actions/showstream.php:239
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -6967,6 +6987,7 @@ 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
+#: classes/User.php:333
 #, fuzzy, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "Meddelande till %1$s på %2$s"
@@ -7077,10 +7098,12 @@ msgid "Save design"
 msgstr ""
 
 #: lib/designsettings.php:378 lib/designsettings.php:369
+#: lib/designsettings.php:372
 msgid "Bad default color settings: "
 msgstr ""
 
 #: lib/designsettings.php:474 lib/designsettings.php:465
+#: lib/designsettings.php:468
 msgid "Design defaults restored."
 msgstr ""
 
@@ -7286,16 +7309,18 @@ msgid "Status deleted."
 msgstr "Användarbilden uppdaterad."
 
 #: actions/apistatusesupdate.php:132
+#: actions/apiaccountupdateprofileimage.php:99
 msgid "Unable to handle that much POST data!"
 msgstr ""
 
 #: actions/apistatusesupdate.php:145 actions/newnotice.php:155
-#: scripts/maildaemon.php:71
+#: scripts/maildaemon.php:71 actions/apistatusesupdate.php:152
 #, 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
+#: actions/apistatusesupdate.php:216
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
@@ -7359,7 +7384,7 @@ msgstr "Uppdateringar från %1$s på %2$s!"
 msgid "IM is not available."
 msgstr "Denna sida är inte tillgänglig i den mediatyp du accepterat"
 
-#: actions/login.php:259
+#: actions/login.php:259 actions/login.php:286
 #, fuzzy, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -7394,21 +7419,24 @@ msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
 msgstr ""
 
 #: actions/profilesettings.php:122 actions/register.php:454
+#: actions/register.php:460
 #, 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
+#: actions/register.php:463
 #, 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
+#: actions/register.php:223
 #, 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
+#: actions/register.php:336 actions/register.php:342
 msgid ""
 "With this form you can create  a new account. You can then post notices and "
 "link up to friends and colleagues. "
@@ -7450,17 +7478,17 @@ msgid "Replies to %1$s on %2$s!"
 msgstr "Meddelande till %1$s på %2$s"
 
 #: actions/showfavorites.php:170
-#, fuzzy, php-format
+#, 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
+#, 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
+#, php-format
 msgid "Feed for favorites of %s (Atom)"
 msgstr "Flöden för $s vänner"
 
@@ -7473,7 +7501,7 @@ msgid ""
 msgstr ""
 
 #: actions/showgroup.php:345
-#, fuzzy, php-format
+#, php-format
 msgid "FOAF for %s group"
 msgstr "Outbox för %s"
 
@@ -7612,41 +7640,6 @@ msgstr "Svara på detta inlägg"
 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. "
@@ -7680,7 +7673,7 @@ 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
+#, php-format
 msgid "notice id: %s"
 msgstr "Nytt inlägg"
 
@@ -7740,7 +7733,6 @@ 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."
 
@@ -7748,3 +7740,59 @@ msgstr "Kunde inte ta emot favoritinläggen."
 #, fuzzy
 msgid "Duplicate notice"
 msgstr "Tabort inlägg"
+
+#: actions/login.php:110 actions/login.php:120
+#, fuzzy
+msgid "Invalid or expired token."
+msgstr "Ogiltig innehåll i inlägget "
+
+#: lib/command.php:597
+#, fuzzy, php-format
+msgid "Could not create login token for %s"
+msgstr "Kan inte skapa OpenID formulär: %s"
+
+#: lib/command.php:602
+#, php-format
+msgid "This link is useable only once, and is good for only 2 minutes: %s"
+msgstr ""
+
+#: lib/imagefile.php:75
+#, fuzzy, php-format
+msgid "That file is too big. The maximum file size is %s."
+msgstr "Du kan uppdatera din personliga profil här"
+
+#: lib/command.php:613
+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"
+"login - Get a link to login to the web interface\n"
+"drop <group> - leave group\n"
+"stats - get your stats\n"
+"stop - same as 'off'\n"
+"quit - same as 'off'\n"
+"sub <nickname> - same as 'follow'\n"
+"unsub <nickname> - same as 'leave'\n"
+"last <nickname> - same as 'get'\n"
+"on <nickname> - not yet implemented.\n"
+"off <nickname> - not yet implemented.\n"
+"nudge <nickname> - remind a user to update.\n"
+"invite <phone number> - not yet implemented.\n"
+"track <word> - not yet implemented.\n"
+"untrack <word> - not yet implemented.\n"
+"track off - not yet implemented.\n"
+"untrack all - not yet implemented.\n"
+"tracks - not yet implemented.\n"
+"tracking - not yet implemented.\n"
+msgstr ""
diff --git a/locale/te/LC_MESSAGES/statusnet.mo b/locale/te/LC_MESSAGES/statusnet.mo
index 034e68322..bc88e32ad 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 6ff6d95b6..2848e1c8c 100644
--- a/locale/te/LC_MESSAGES/statusnet.po
+++ b/locale/te/LC_MESSAGES/statusnet.po
@@ -6,12 +6,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-06 13:16+0000\n"
-"PO-Revision-Date: 2009-11-06 15:44:36+0000\n"
+"POT-Creation-Date: 2009-11-08 11:53+0000\n"
+"PO-Revision-Date: 2009-11-08 11:57:14+0000\n"
 "Language-Team: Telugu\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r58648); Translate extension (2009-08-03)\n"
+"X-Generator: MediaWiki 1.16alpha(r58760); 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"
@@ -168,7 +168,7 @@ msgid "%s updates from everyone!"
 msgstr ""
 
 #: ../actions/register.php:213 actions/register.php:497
-#: actions/register.php:545 actions/register.php:555
+#: actions/register.php:545 actions/register.php:555 actions/register.php:561
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -204,6 +204,7 @@ msgstr "1-64 చిన్నబడి అక్షరాలు లేదా అ�
 
 #: ../actions/register.php:152 actions/register.php:166
 #: actions/register.php:368 actions/register.php:414 actions/register.php:418
+#: actions/register.php:424
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr ""
 
@@ -220,6 +221,7 @@ msgstr "6 లేదా అంతకంటే ఎక్కువ అక్షర�
 
 #: ../actions/register.php:154 actions/register.php:168
 #: actions/register.php:373 actions/register.php:419 actions/register.php:423
+#: actions/register.php:429
 msgid "6 or more characters. Required."
 msgstr "6 లేదా అంతకంటే ఎక్కువ అక్షరాలు. తప్పనిసరి."
 
@@ -392,7 +394,7 @@ msgstr "\"%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
+#: actions/login.php:79 actions/register.php:137
 msgid "Already logged in."
 msgstr "ఇప్పటికే లోనికి ప్రవేశించారు."
 
@@ -415,7 +417,7 @@ 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/login.php:226
-#: actions/register.php:473
+#: actions/register.php:473 actions/login.php:253 actions/register.php:479
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "భవిష్యత్తులో ఆటోమెటిగ్గా లోనికి ప్రవేశించు; బయటి కంప్యూర్ల కొరకు కాదు!"
 
@@ -437,6 +439,7 @@ msgstr "అవతారం"
 
 #: ../actions/avatar.php:113 actions/profilesettings.php:350
 #: actions/avatarsettings.php:395 actions/avatarsettings.php:346
+#: actions/avatarsettings.php:360
 msgid "Avatar updated."
 msgstr "అవతారాన్ని తాజాకరించాం."
 
@@ -468,7 +471,7 @@ msgstr "ఇంతక్రితం »"
 #: 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
+#: actions/register.php:459 actions/register.php:465
 msgid "Bio"
 msgstr "స్వపరిచయం"
 
@@ -497,6 +500,7 @@ msgstr ""
 #: actions/passwordsettings.php:169 actions/recoverpassword.php:347
 #: actions/passwordsettings.php:174 actions/recoverpassword.php:365
 #: actions/passwordsettings.php:180 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:185
 msgid "Can't save new password."
 msgstr "కొత్త సంకేతపదాన్ని భద్రపరచలేము."
 
@@ -559,6 +563,7 @@ msgstr ""
 #: actions/recoverpassword.php:236 actions/register.php:422
 #: actions/passwordsettings.php:111 actions/recoverpassword.php:239
 #: actions/register.php:426 actions/smssettings.php:134
+#: actions/register.php:432
 msgid "Confirm"
 msgstr "నిర్థారించు"
 
@@ -580,7 +585,7 @@ msgstr "నిర్ధారణ రద్దయింది."
 #: ../actions/smssettings.php:63 actions/smssettings.php:63
 #: actions/smssettings.php:118 actions/smssettings.php:130
 msgid "Confirmation code"
-msgstr ""
+msgstr "నిర్ధారణ సంకేతం"
 
 #: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
 #: actions/confirmaddress.php:80
@@ -588,7 +593,7 @@ msgid "Confirmation code not found."
 msgstr "నిర్ధారణ సంకేతం కనబడలేదు."
 
 #: ../actions/register.php:202 actions/register.php:473
-#: actions/register.php:521 actions/register.php:531
+#: actions/register.php:521 actions/register.php:531 actions/register.php:537
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -812,6 +817,7 @@ 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
+#: classes/Notice.php:1120
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr ""
@@ -834,7 +840,8 @@ msgstr "మీ గురించి మరియు మీ ఆసక్తు�
 #: 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
+#: lib/accountsettingsaction.php:117 actions/register.php:437
+#: actions/register.php:441
 msgid "Email"
 msgstr "ఈమెయిల్"
 
@@ -849,7 +856,7 @@ msgid "Email Settings"
 msgstr "ఈమెయిల్ అమరికలు"
 
 #: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
-#: actions/register.php:200 actions/register.php:206
+#: actions/register.php:200 actions/register.php:206 actions/register.php:212
 msgid "Email address already exists."
 msgstr "ఈమెయిల్ చిరునామా ఇప్పటికే ఉంది."
 
@@ -936,7 +943,7 @@ msgstr "వాడుకరిని భద్రపరచడంలో పొర�
 
 #: ../actions/password.php:80 actions/profilesettings.php:399
 #: actions/passwordsettings.php:164 actions/passwordsettings.php:169
-#: actions/passwordsettings.php:175
+#: actions/passwordsettings.php:175 actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "వాడుకరిని భద్రపరచడంలో పొరపాటు: సరికాదు."
 
@@ -948,6 +955,7 @@ msgstr "వాడుకరిని భద్రపరచడంలో పొర�
 #: actions/login.php:120 actions/recoverpassword.php:372
 #: actions/register.php:235 actions/login.php:122
 #: actions/recoverpassword.php:375 actions/register.php:242
+#: actions/login.php:149 actions/register.php:248
 msgid "Error setting user."
 msgstr ""
 
@@ -980,6 +988,7 @@ msgstr "తవసం"
 
 #: ../actions/avatar.php:115 actions/profilesettings.php:352
 #: actions/avatarsettings.php:397 actions/avatarsettings.php:349
+#: actions/avatarsettings.php:363
 msgid "Failed updating avatar."
 msgstr "అవతారపు తాజాకరణ విఫలమైంది."
 
@@ -1014,6 +1023,7 @@ msgid "Find people on this site"
 msgstr ""
 
 #: ../actions/login.php:122 actions/login.php:247 actions/login.php:255
+#: actions/login.php:282
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -1030,6 +1040,7 @@ msgstr ""
 #: actions/showstream.php:220 lib/groupeditform.php:157
 #: actions/profilesettings.php:111 actions/register.php:441
 #: actions/showgroup.php:247 actions/showstream.php:267
+#: actions/register.php:447 lib/userprofile.php:149
 msgid "Full name"
 msgstr "పూర్తి పేరు"
 
@@ -1043,7 +1054,7 @@ msgstr "పూర్తి పేరు"
 #: 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
+#: actions/register.php:214 actions/register.php:220
 msgid "Full name is too long (max 255 chars)."
 msgstr "పూర్తి పేరు చాలా పెద్దగా ఉంది (గరిష్ఠంగా 255 అక్షరాలు)."
 
@@ -1064,7 +1075,7 @@ msgstr "ముంగిలి"
 #: 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
+#: actions/register.php:446 actions/register.php:452
 #, fuzzy
 msgid "Homepage"
 msgstr "హోమ్ పేజీ"
@@ -1077,7 +1088,7 @@ msgstr "హోమ్ పేజీ"
 #: 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
+#: actions/register.php:211 actions/register.php:217
 msgid "Homepage is not a valid URL."
 msgstr "హోమ్ పేజీ URL సరైనది కాదు."
 
@@ -1145,7 +1156,7 @@ 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/login.php:116
+#: actions/facebookhome.php:129 actions/login.php:116 actions/login.php:143
 msgid "Incorrect username or password."
 msgstr "వాడుకరిపేరు లేదా సంకేతపదం తప్పు."
 
@@ -1223,6 +1234,7 @@ msgstr "తప్పుడు పరిమాణం."
 #: 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
+#: actions/register.php:243 actions/register.php:264
 msgid "Invalid username or password."
 msgstr "వాడుకరిపేరు లేదా సంకేతపదం తప్పు."
 
@@ -1294,7 +1306,7 @@ msgstr ""
 #: 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
+#: lib/profilelist.php:218 actions/register.php:470 lib/userprofile.php:164
 msgid "Location"
 msgstr "ప్రాంతం"
 
@@ -1308,7 +1320,7 @@ msgstr "ప్రాంతం"
 #: 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
+#: actions/register.php:221 actions/register.php:227
 msgid "Location is too long (max 255 chars)."
 msgstr "ప్రాంతం పేరు మరీ పెద్దగా ఉంది (255 అక్షరాలు గరిష్ఠం)."
 
@@ -1322,6 +1334,7 @@ msgstr "ప్రాంతం పేరు మరీ పెద్దగా ఉ�
 #: 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
+#: actions/login.php:204 actions/login.php:257
 #, php-format
 msgid "Login"
 msgstr "ప్రవేశించండి"
@@ -1347,12 +1360,13 @@ msgstr "నిష్క్రమించు"
 
 #: ../actions/register.php:166 actions/register.php:180
 #: actions/register.php:393 actions/register.php:439 actions/register.php:443
+#: actions/register.php:449
 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 actions/login.php:236
+#: lib/facebookaction.php:327 actions/login.php:236 actions/login.php:263
 msgid "Lost or forgotten password?"
 msgstr "మీ సంకేతపదం మర్చిపోయారా?"
 
@@ -1376,7 +1390,7 @@ msgstr "సభ్యులైన తేదీ"
 
 #: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
 #: actions/userrss.php:93
-#, fuzzy, php-format
+#, php-format
 msgid "Microblog by %s"
 msgstr "%s యొక్క మైక్రోబ్లాగు"
 
@@ -1392,7 +1406,7 @@ 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:487
+#: actions/register.php:477 actions/register.php:487 actions/register.php:493
 msgid "My text and files are available under "
 msgstr ""
 
@@ -1401,7 +1415,7 @@ msgstr ""
 #: actions/emailsettings.php:142 actions/smssettings.php:152
 #: actions/emailsettings.php:148 actions/smssettings.php:164
 msgid "New"
-msgstr ""
+msgstr "కొత్తది"
 
 #: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286 lib/mail.php:285
 #, php-format
@@ -1450,7 +1464,8 @@ msgstr "మీ కొత్త సంకేతపదం భద్రమైంద
 #: 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
+#: actions/showgroup.php:236 actions/showstream.php:249 actions/login.php:246
+#: actions/register.php:423 lib/userprofile.php:131
 msgid "Nickname"
 msgstr "పేరు"
 
@@ -1464,7 +1479,7 @@ msgstr "పేరు"
 #: 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
+#: actions/register.php:202 actions/register.php:208
 msgid "Nickname already in use. Try another one."
 msgstr "ఆ పేరుని ఇప్పటికే వాడుతున్నారు. మరోటి ప్రయత్నించండి."
 
@@ -1480,7 +1495,7 @@ msgstr "ఆ పేరుని ఇప్పటికే వాడుతున్
 #: 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
+#: actions/register.php:199 actions/register.php:205
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
 
@@ -1505,7 +1520,7 @@ msgstr "పేరు లేదా ఈమెయిల్"
 #: actions/deletenotice.php:115 actions/groupblock.php:176
 #: actions/deletenotice.php:145
 msgid "No"
-msgstr ""
+msgstr "కాదు"
 
 #: ../actions/imsettings.php:156 actions/imsettings.php:164
 #: actions/imsettings.php:279 actions/imsettings.php:285
@@ -1720,7 +1735,8 @@ msgstr ""
 #: 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
+#: lib/api.php:954 lib/api.php:982 lib/api.php:1092 lib/api.php:963
+#: lib/api.php:991 lib/api.php:1101
 msgid "Not a supported data format."
 msgstr ""
 
@@ -1741,7 +1757,7 @@ 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
+#: actions/register.php:189 actions/register.php:195 actions/register.php:201
 msgid "Not a valid email address."
 msgstr "సరైన ఈమెయిల్ చిరునామా కాదు:"
 
@@ -1753,7 +1769,7 @@ msgstr "సరైన ఈమెయిల్ చిరునామా కాదు
 #: 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
+#: actions/register.php:204 actions/register.php:210
 msgid "Not a valid nickname."
 msgstr "సరైన పేరు కాదు."
 
@@ -1792,6 +1808,7 @@ msgstr ""
 #: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
 #: actions/twitapistatuses.php:309 actions/twitapistatuses.php:327
 #: actions/twitapistatuses.php:284 actions/apistatusesupdate.php:186
+#: actions/apistatusesupdate.php:193
 msgid "Not found"
 msgstr "దొరకలేదు"
 
@@ -1938,7 +1955,8 @@ msgstr "పాక్షిక ఎగుమతి."
 #: 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
+#: lib/accountsettingsaction.php:114 actions/login.php:249
+#: actions/register.php:428
 msgid "Password"
 msgstr "సంకేతపదం"
 
@@ -1967,6 +1985,7 @@ msgstr ""
 #: actions/passwordsettings.php:173 actions/recoverpassword.php:200
 #: actions/passwordsettings.php:178 actions/recoverpassword.php:208
 #: actions/passwordsettings.php:184 actions/recoverpassword.php:211
+#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "సంకేతపదం భద్రమయ్యింది."
 
@@ -1975,6 +1994,7 @@ msgstr "సంకేతపదం భద్రమయ్యింది."
 #: actions/passwordsettings.php:145 actions/register.php:183
 #: actions/passwordsettings.php:150 actions/register.php:220
 #: actions/passwordsettings.php:156 actions/register.php:227
+#: actions/register.php:233
 msgid "Passwords don't match."
 msgstr "సంకేతపదాలు సరిపోలలేదు."
 
@@ -2135,19 +2155,19 @@ msgstr ""
 #: 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
+#: lib/logingroupnav.php:85 actions/register.php:114 actions/register.php:502
 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
+#: actions/register.php:129 actions/register.php:135
 msgid "Registration not allowed."
 msgstr ""
 
 #: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67 actions/register.php:106
+#: actions/register.php:67 actions/register.php:106 actions/register.php:112
 msgid "Registration successful"
 msgstr ""
 
@@ -2161,6 +2181,7 @@ msgstr "తిరస్కరించు"
 #: 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
+#: actions/login.php:252 actions/register.php:477
 msgid "Remember me"
 msgstr "నన్ను గుర్తుంచుకో"
 
@@ -2259,6 +2280,7 @@ msgstr "పై సంకేతపదం వలెనే"
 
 #: ../actions/register.php:156 actions/register.php:170
 #: actions/register.php:377 actions/register.php:423 actions/register.php:427
+#: actions/register.php:433
 msgid "Same as password above. Required."
 msgstr ""
 
@@ -2418,6 +2440,7 @@ msgstr ""
 #: actions/remotesubscribe.php:113 actions/showstream.php:376
 #: lib/subscribeform.php:139 actions/showstream.php:345
 #: actions/remotesubscribe.php:137 actions/showstream.php:439
+#: lib/userprofile.php:321
 msgid "Subscribe"
 msgstr ""
 
@@ -2464,6 +2487,7 @@ msgstr ""
 #: actions/profilesettings.php:123 actions/showstream.php:255
 #: lib/subscriptionlist.php:106 lib/subscriptionlist.php:108
 #: actions/profilesettings.php:138 actions/showstream.php:327
+#: lib/userprofile.php:209
 msgid "Tags"
 msgstr ""
 
@@ -2672,6 +2696,7 @@ msgstr ""
 #: actions/apifriendshipsdestroy.php:91 actions/apigroupcreate.php:104
 #: actions/apigroupjoin.php:91 actions/apigroupleave.php:91
 #: actions/apistatusesupdate.php:109
+#: actions/apiaccountupdateprofileimage.php:84
 msgid "This method requires a POST."
 msgstr ""
 
@@ -2702,7 +2727,7 @@ msgstr ""
 
 #: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
 #: actions/twitapifriendships.php:132 actions/twitapifriendships.php:139
-#: actions/apifriendshipsexists.php:103
+#: actions/apifriendshipsexists.php:103 actions/apifriendshipsexists.php:94
 msgid "Two user ids or screen_names must be supplied."
 msgstr ""
 
@@ -2710,7 +2735,7 @@ msgstr ""
 #: 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
+#: actions/register.php:448 actions/register.php:454
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "మీ హోమ్ పేజీ, బ్లాగు, లేదా వేరే సేటులోని మీ ప్రొఫైలు యొక్క చిరునామా"
 
@@ -2732,6 +2757,7 @@ msgstr ""
 #: actions/twittersettings.php:322 lib/designsettings.php:301
 #: actions/emailsettings.php:255 actions/grouplogo.php:319
 #: actions/imsettings.php:220 actions/smssettings.php:248
+#: actions/avatarsettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr ""
 
@@ -2836,7 +2862,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
+#: actions/register.php:436 actions/register.php:438 actions/register.php:442
 msgid "Used only for updates, announcements, and password recovery"
 msgstr "తాజా విశేషాలు, ప్రకటనలు, మరియు సంకేతపదం పోయినప్పుడు మాత్రమే ఉపయోగిస్తాం."
 
@@ -2864,7 +2890,8 @@ 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
+#: actions/apiusershow.php:108 actions/apiaccountupdateprofileimage.php:124
+#: actions/apiaccountupdateprofileimage.php:130
 msgid "User has no profile."
 msgstr "వాడుకరికి ప్రొఫైలు లేదు."
 
@@ -2893,7 +2920,7 @@ msgstr "%s, సంగతులేమిటి?"
 #: 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
+#: actions/register.php:466 actions/register.php:472
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "మీరు ఎక్కడ నుండి, \"నగరం, రాష్ట్రం (లేదా ప్రాంతం), దేశం\""
 
@@ -2989,7 +3016,7 @@ 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:192
+#: actions/register.php:186 actions/register.php:192 actions/register.php:198
 msgid "You can't register if you don't agree to the license."
 msgstr ""
 
@@ -3054,56 +3081,56 @@ msgstr ""
 "ఓపెన్ఐడీలను ఇక్కడ సంభాళించుకోండి."
 
 #: ../lib/util.php:943 lib/util.php:992 lib/util.php:945 lib/util.php:756
-#: lib/util.php:770 lib/util.php:816
+#: lib/util.php:770 lib/util.php:816 lib/util.php:844
 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:828
+#: lib/util.php:782 lib/util.php:828 lib/util.php:856
 #, php-format
 msgid "about %d days ago"
 msgstr "%d రోజుల క్రితం"
 
 #: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953 lib/util.php:764
-#: lib/util.php:778 lib/util.php:824
+#: lib/util.php:778 lib/util.php:824 lib/util.php:852
 #, php-format
 msgid "about %d hours ago"
 msgstr "%d గంటల క్రితం"
 
 #: ../lib/util.php:947 lib/util.php:996 lib/util.php:949 lib/util.php:760
-#: lib/util.php:774 lib/util.php:820
+#: lib/util.php:774 lib/util.php:820 lib/util.php:848
 #, php-format
 msgid "about %d minutes ago"
 msgstr "%d నిమిషాల క్రితం"
 
 #: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961 lib/util.php:772
-#: lib/util.php:786 lib/util.php:832
+#: lib/util.php:786 lib/util.php:832 lib/util.php:860
 #, php-format
 msgid "about %d months ago"
 msgstr "%d నెలల క్రితం"
 
 #: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955 lib/util.php:766
-#: lib/util.php:780 lib/util.php:826
+#: lib/util.php:780 lib/util.php:826 lib/util.php:854
 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:818
+#: lib/util.php:772 lib/util.php:818 lib/util.php:846
 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:830
+#: lib/util.php:784 lib/util.php:830 lib/util.php:858
 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:834
+#: lib/util.php:788 lib/util.php:834 lib/util.php:862
 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:822
+#: lib/util.php:776 lib/util.php:822 lib/util.php:850
 msgid "about an hour ago"
 msgstr "ఒక గంట క్రితం"
 
@@ -3172,7 +3199,9 @@ msgstr "« తర్వాత"
 #: 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
+#: actions/userauthorization.php:52 actions/login.php:131
+#: actions/register.php:165 actions/avatarsettings.php:265
+#: lib/designsettings.php:294
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
@@ -3300,7 +3329,7 @@ msgstr ""
 #: actions/newmessage.php:163 actions/newmessage.php:114
 #: actions/newmessage.php:116 actions/remotesubscribe.php:154
 msgid "No such user"
-msgstr ""
+msgstr "అటువంటి వాడుకరి లేరు"
 
 #: actions/newmessage.php:117 actions/newmessage.php:67
 #: actions/newmessage.php:71 actions/newmessage.php:231
@@ -3392,6 +3421,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
+#: actions/register.php:230
 msgid "Password must be 6 or more characters."
 msgstr ""
 
@@ -3426,7 +3456,7 @@ msgstr ""
 
 #: actions/showmessage.php:33 actions/showmessage.php:81
 msgid "No such message."
-msgstr ""
+msgstr "అటువంటి సందేశం లేదు."
 
 #: actions/showmessage.php:42 actions/showmessage.php:98
 msgid "Only the sender and recipient may read this message."
@@ -3550,16 +3580,16 @@ msgstr ""
 
 #: actions/twittersettings.php:63
 msgid "Twitter Username"
-msgstr ""
+msgstr "ట్విట్టర్ వాడుకరిపేరు"
 
 #: actions/twittersettings.php:65 actions/twittersettings.php:123
 #: actions/twittersettings.php:126
 msgid "No spaces, please."
-msgstr ""
+msgstr "దయచేసి, ఖాళీలు వద్దు"
 
 #: actions/twittersettings.php:67
 msgid "Twitter Password"
-msgstr ""
+msgstr "ట్విట్టర్ సంకేతపదం"
 
 #: actions/twittersettings.php:72 actions/twittersettings.php:139
 #: actions/twittersettings.php:142
@@ -3930,13 +3960,13 @@ msgid "There was a problem with your session token. "
 msgstr ""
 
 #: actions/avatarsettings.php:303 actions/grouplogo.php:360
-#: actions/avatarsettings.php:308
+#: actions/avatarsettings.php:308 actions/avatarsettings.php:322
 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
+#: actions/grouplogo.php:377 actions/avatarsettings.php:337
 msgid "Lost our file data."
 msgstr ""
 
@@ -4270,7 +4300,7 @@ msgstr ""
 #: actions/grouplogo.php:144 actions/grouplogo.php:197
 #: actions/grouplogo.php:139 actions/grouplogo.php:192
 msgid "Group logo"
-msgstr ""
+msgstr "గుంపు చిహ్నం"
 
 #: actions/grouplogo.php:149
 msgid "You can upload a logo image for your group."
@@ -4291,7 +4321,7 @@ msgstr "అవతారపు తాజాకరణ విఫలమైంది.
 #: actions/groupmembers.php:93 lib/groupnav.php:91
 #, php-format
 msgid "%s group members"
-msgstr ""
+msgstr "%s గుంపు సభ్యులు"
 
 #: actions/groupmembers.php:96
 #, php-format
@@ -4300,13 +4330,13 @@ msgstr ""
 
 #: actions/groupmembers.php:111
 msgid "A list of the users in this group."
-msgstr ""
+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 ""
+msgstr "గుంపులు"
 
 #: actions/groups.php:64
 #, php-format
@@ -4416,7 +4446,7 @@ msgid "%s left group %s"
 msgstr ""
 
 #: actions/login.php:225 lib/facebookaction.php:304 actions/login.php:208
-#: actions/login.php:216
+#: actions/login.php:216 actions/login.php:243
 msgid "Login to site"
 msgstr ""
 
@@ -4602,7 +4632,8 @@ 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
+#: actions/register.php:398 actions/register.php:85 actions/register.php:189
+#: actions/register.php:404
 msgid "Sorry, only invited people can register."
 msgstr ""
 
@@ -4691,7 +4722,7 @@ msgstr "అటువంటి సందేశమేమీ లేదు."
 #: 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
+#: lib/profilelist.php:230 lib/userprofile.php:177
 msgid "URL"
 msgstr ""
 
@@ -4702,7 +4733,7 @@ msgstr ""
 #: 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
+#: lib/profilelist.php:245 lib/userprofile.php:194
 #, fuzzy
 msgid "Note"
 msgstr "సందేశాలు"
@@ -4710,7 +4741,7 @@ msgstr "సందేశాలు"
 #: actions/showgroup.php:270 actions/showgroup.php:272
 #: actions/showgroup.php:288 actions/showgroup.php:293
 msgid "Group actions"
-msgstr ""
+msgstr "గుంపు చర్యలు"
 
 #: actions/showgroup.php:323 actions/showgroup.php:304
 #, fuzzy, php-format
@@ -4731,7 +4762,7 @@ msgstr "సభ్యులు"
 #: lib/profileaction.php:148 lib/profileaction.php:226
 #: actions/showgroup.php:386
 msgid "(None)"
-msgstr ""
+msgstr "(ఏమీలేదు)"
 
 #: actions/showgroup.php:370 actions/showgroup.php:350
 #: actions/showgroup.php:384 actions/showgroup.php:392
@@ -4750,6 +4781,7 @@ msgid "Only the sender and recipient "
 msgstr ""
 
 #: actions/showstream.php:73 actions/showstream.php:78
+#: actions/showstream.php:79
 #, php-format
 msgid "%s, page %d"
 msgstr "%s, పేజీ %d"
@@ -4761,29 +4793,30 @@ msgstr "ప్రొఫైలు"
 
 #: actions/showstream.php:236 actions/tagother.php:77
 #: actions/showstream.php:220 actions/showstream.php:185
-#: actions/showstream.php:193
+#: actions/showstream.php:193 lib/userprofile.php:75
 #, 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
+#: actions/showstream.php:220 lib/userprofile.php:102
 msgid "Photo"
 msgstr ""
 
 #: actions/showstream.php:317 actions/showstream.php:309
 #: actions/showstream.php:274 actions/showstream.php:354
+#: lib/userprofile.php:236
 msgid "User actions"
 msgstr "వాడుకరి చర్యలు"
 
 #: actions/showstream.php:342 actions/showstream.php:307
-#: actions/showstream.php:390
+#: actions/showstream.php:390 lib/userprofile.php:272
 msgid "Send a direct message to this user"
 msgstr ""
 
 #: actions/showstream.php:343 actions/showstream.php:308
-#: actions/showstream.php:391
+#: actions/showstream.php:391 lib/userprofile.php:273
 msgid "Message"
 msgstr ""
 
@@ -4794,7 +4827,7 @@ msgstr "చందాదార్లు"
 
 #: actions/showstream.php:533 lib/profileaction.php:235
 msgid "All groups"
-msgstr ""
+msgstr "అన్ని గుంపులు"
 
 #: actions/showstream.php:542
 #, php-format
@@ -5519,7 +5552,7 @@ msgstr "%s మరియు మిత్రులు"
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr ""
 
-#: actions/avatarsettings.php:373
+#: actions/avatarsettings.php:373 actions/avatarsettings.php:387
 #, fuzzy
 msgid "Avatar deleted."
 msgstr "అవతారాన్ని తాజాకరించాం."
@@ -5648,10 +5681,12 @@ msgid ""
 msgstr ""
 
 #: actions/register.php:432 actions/register.php:479 actions/register.php:489
+#: actions/register.php:495
 msgid "Creative Commons Attribution 3.0"
 msgstr ""
 
 #: actions/register.php:433 actions/register.php:480 actions/register.php:490
+#: actions/register.php:496
 #, fuzzy
 msgid ""
 " except this private data: password, email address, IM address, and phone "
@@ -5686,44 +5721,48 @@ msgid "%s's profile"
 msgstr "ప్రొఫైలు"
 
 #: actions/showstream.php:163 actions/showstream.php:128
+#: actions/showstream.php:129
 #, fuzzy, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "%s యొక్క సందేశముల ఫీడు"
 
 #: actions/showstream.php:170 actions/showstream.php:135
+#: actions/showstream.php:136
 #, fuzzy, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "%s యొక్క సందేశముల ఫీడు"
 
 #: actions/showstream.php:177 actions/showstream.php:142
+#: actions/showstream.php:143
 #, fuzzy, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "%s యొక్క సందేశముల ఫీడు"
 
 #: actions/showstream.php:182 actions/showstream.php:147
+#: actions/showstream.php:148
 #, php-format
 msgid "FOAF for %s"
 msgstr ""
 
 #: actions/showstream.php:237 actions/showstream.php:202
-#: actions/showstream.php:234
+#: actions/showstream.php:234 lib/userprofile.php:116
 #, fuzzy
 msgid "Edit Avatar"
 msgstr "అవతారం"
 
 #: actions/showstream.php:316 actions/showstream.php:281
-#: actions/showstream.php:366
+#: actions/showstream.php:366 lib/userprofile.php:248
 #, fuzzy
 msgid "Edit profile settings"
 msgstr "ఫ్రొఫైలు అమరికలు"
 
 #: actions/showstream.php:317 actions/showstream.php:282
-#: actions/showstream.php:367
+#: actions/showstream.php:367 lib/userprofile.php:249
 msgid "Edit"
 msgstr ""
 
 #: actions/showstream.php:542 actions/showstream.php:388
-#: actions/showstream.php:487
+#: actions/showstream.php:487 actions/showstream.php:234
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5766,6 +5805,9 @@ msgstr ""
 #: actions/apistatusesupdate.php:125 actions/apisubscriptions.php:87
 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#: actions/apiaccountupdateprofileimage.php:91
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apistatusesupdate.php:139
 #, fuzzy
 msgid "No such user!"
 msgstr "అటువంటి వాడుకరి లేరు."
@@ -5814,36 +5856,6 @@ msgid ""
 "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 ""
@@ -6008,6 +6020,7 @@ 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
+#: actions/showstream.php:202
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -6183,7 +6196,8 @@ 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
+#: lib/designsettings.php:461 lib/designsettings.php:434
+#: lib/designsettings.php:464
 #, fuzzy
 msgid "Couldn't update your design."
 msgstr "వాడుకరిని తాజాకరించలేకున్నాం."
@@ -6275,7 +6289,9 @@ msgid "Message sent"
 msgstr ""
 
 #: actions/newnotice.php:93 lib/designsettings.php:281
-#: actions/newnotice.php:94
+#: actions/newnotice.php:94 actions/apiaccountupdateprofileimage.php:97
+#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254
+#: lib/designsettings.php:283
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s bytes) due to its "
@@ -6441,7 +6457,7 @@ msgstr "మిమ్మల్ని గుర్తించాం. కొత్
 msgid "Password recover"
 msgstr "సంకేతపదం భద్రమయ్యింది."
 
-#: actions/register.php:86
+#: actions/register.php:86 actions/register.php:92
 #, fuzzy
 msgid "Sorry, invalid invitation code."
 msgstr "నిర్ధారణ సంకేతంలో పొరపాటు."
@@ -6540,28 +6556,31 @@ msgstr ""
 msgid "Not a local notice"
 msgstr "అటువంటి వాడుకరి లేరు."
 
-#: actions/showstream.php:72
+#: actions/showstream.php:72 actions/showstream.php:73
 #, php-format
 msgid " tagged %s"
 msgstr ""
 
-#: actions/showstream.php:121
+#: actions/showstream.php:121 actions/showstream.php:122
 #, fuzzy, php-format
 msgid "Notice feed for %s tagged %s (RSS 1.0)"
 msgstr "%s యొక్క సందేశముల ఫీడు"
 
 #: actions/showstream.php:350 actions/showstream.php:444
+#: actions/showstream.php:191
 #, 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
+#: actions/showstream.php:196
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
 msgstr ""
 
 #: actions/showstream.php:357 actions/showstream.php:451
+#: actions/showstream.php:198
 #, php-format
 msgid ""
 "You can try to nudge %s or [post something to his or her attention](%%%%"
@@ -6569,6 +6588,7 @@ msgid ""
 msgstr ""
 
 #: actions/showstream.php:393 actions/showstream.php:492
+#: actions/showstream.php:239
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -6716,6 +6736,7 @@ msgid "Problem saving notice. Too long."
 msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు."
 
 #: classes/User.php:319 classes/User.php:327 classes/User.php:334
+#: classes/User.php:333
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr ""
@@ -6826,10 +6847,12 @@ msgid "Save design"
 msgstr ""
 
 #: lib/designsettings.php:378 lib/designsettings.php:369
+#: lib/designsettings.php:372
 msgid "Bad default color settings: "
 msgstr ""
 
 #: lib/designsettings.php:474 lib/designsettings.php:465
+#: lib/designsettings.php:468
 msgid "Design defaults restored."
 msgstr ""
 
@@ -7036,16 +7059,18 @@ msgid "Status deleted."
 msgstr "అవతారాన్ని తాజాకరించాం."
 
 #: actions/apistatusesupdate.php:132
+#: actions/apiaccountupdateprofileimage.php:99
 msgid "Unable to handle that much POST data!"
 msgstr ""
 
 #: actions/apistatusesupdate.php:145 actions/newnotice.php:155
-#: scripts/maildaemon.php:71
+#: scripts/maildaemon.php:71 actions/apistatusesupdate.php:152
 #, fuzzy, php-format
 msgid "That's too long. Max notice size is %d chars."
 msgstr "ఇది చాలా పొడవుంది. గరిష్ఠ సందేశ పరిమాణం 140 అక్షరాలు."
 
 #: actions/apistatusesupdate.php:209 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:216
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
@@ -7104,7 +7129,7 @@ msgstr "%s యొక్క మైక్రోబ్లాగు"
 msgid "IM is not available."
 msgstr "హోమ్ పేజీ URL సరైనది కాదు."
 
-#: actions/login.php:259
+#: actions/login.php:259 actions/login.php:286
 #, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -7136,21 +7161,24 @@ msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
 msgstr ""
 
 #: actions/profilesettings.php:122 actions/register.php:454
+#: actions/register.php:460
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d chars"
 msgstr "మీ గురించి మరియు మీ ఆసక్తుల గురించి 140 అక్షరాల్లో చెప్పండి"
 
 #: actions/profilesettings.php:125 actions/register.php:457
+#: actions/register.php:463
 #, fuzzy
 msgid "Describe yourself and your interests"
 msgstr "మీ గురించి మరియు మీ ఆసక్తుల గురించి 140 అక్షరాల్లో చెప్పండి"
 
 #: actions/profilesettings.php:221 actions/register.php:217
+#: actions/register.php:223
 #, fuzzy, php-format
 msgid "Bio is too long (max %d chars)."
 msgstr "స్వపరిచయం చాలా పెద్దగా ఉంది (140 అక్షరాలు గరిష్ఠం)."
 
-#: actions/register.php:336
+#: actions/register.php:336 actions/register.php:342
 msgid ""
 "With this form you can create  a new account. You can then post notices and "
 "link up to friends and colleagues. "
@@ -7213,7 +7241,7 @@ msgid ""
 msgstr ""
 
 #: actions/showgroup.php:345
-#, fuzzy, php-format
+#, php-format
 msgid "FOAF for %s group"
 msgstr "%s గుంపు"
 
@@ -7303,7 +7331,7 @@ msgid "Site content license"
 msgstr "కొత్త సందేశం"
 
 #: lib/command.php:88
-#, fuzzy, php-format
+#, php-format
 msgid "Could not find a user with nickname %s"
 msgstr "వాడుకరిని తాజాకరించలేకున్నాం."
 
@@ -7340,41 +7368,6 @@ msgstr "%sకి స్పందనలు"
 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. "
@@ -7407,7 +7400,7 @@ msgid "Describe the group or topic in %d characters"
 msgstr "మీ గురించి మరియు మీ ఆసక్తుల గురించి 140 అక్షరాల్లో చెప్పండి"
 
 #: lib/jabber.php:192
-#, fuzzy, php-format
+#, php-format
 msgid "notice id: %s"
 msgstr "కొత్త సందేశం"
 
@@ -7475,3 +7468,59 @@ msgstr "వాడుకరిని తాజాకరించలేకున�
 #, fuzzy
 msgid "Duplicate notice"
 msgstr "కొత్త సందేశం"
+
+#: actions/login.php:110 actions/login.php:120
+#, fuzzy
+msgid "Invalid or expired token."
+msgstr "సందేశపు విషయం సరైనది కాదు"
+
+#: lib/command.php:597
+#, fuzzy, php-format
+msgid "Could not create login token for %s"
+msgstr "ఓపెన్ఐడీ ఫారమును సృష్టించలేకపోయాం: %s"
+
+#: lib/command.php:602
+#, php-format
+msgid "This link is useable only once, and is good for only 2 minutes: %s"
+msgstr ""
+
+#: lib/imagefile.php:75
+#, fuzzy, php-format
+msgid "That file is too big. The maximum file size is %s."
+msgstr "ఇది చాలా పొడవుంది. గరిష్ఠ సందేశ పరిమాణం 140 అక్షరాలు."
+
+#: lib/command.php:613
+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"
+"login - Get a link to login to the web interface\n"
+"drop <group> - leave group\n"
+"stats - get your stats\n"
+"stop - same as 'off'\n"
+"quit - same as 'off'\n"
+"sub <nickname> - same as 'follow'\n"
+"unsub <nickname> - same as 'leave'\n"
+"last <nickname> - same as 'get'\n"
+"on <nickname> - not yet implemented.\n"
+"off <nickname> - not yet implemented.\n"
+"nudge <nickname> - remind a user to update.\n"
+"invite <phone number> - not yet implemented.\n"
+"track <word> - not yet implemented.\n"
+"untrack <word> - not yet implemented.\n"
+"track off - not yet implemented.\n"
+"untrack all - not yet implemented.\n"
+"tracks - not yet implemented.\n"
+"tracking - not yet implemented.\n"
+msgstr ""
diff --git a/locale/tr/LC_MESSAGES/statusnet.mo b/locale/tr/LC_MESSAGES/statusnet.mo
index 7c579c44a..f017ec257 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 ec8b3fd9a..3519942ec 100644
--- a/locale/tr/LC_MESSAGES/statusnet.po
+++ b/locale/tr/LC_MESSAGES/statusnet.po
@@ -5,12 +5,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-06 13:16+0000\n"
-"PO-Revision-Date: 2009-11-06 15:44:40+0000\n"
+"POT-Creation-Date: 2009-11-08 11:53+0000\n"
+"PO-Revision-Date: 2009-11-08 11:57:17+0000\n"
 "Language-Team: Turkish\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r58648); Translate extension (2009-08-03)\n"
+"X-Generator: MediaWiki 1.16alpha(r58760); 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"
@@ -175,7 +175,7 @@ msgid "%s updates from everyone!"
 msgstr ""
 
 #: ../actions/register.php:213 actions/register.php:497
-#: actions/register.php:545 actions/register.php:555
+#: actions/register.php:545 actions/register.php:555 actions/register.php:561
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -213,6 +213,7 @@ msgstr ""
 
 #: ../actions/register.php:152 actions/register.php:166
 #: actions/register.php:368 actions/register.php:414 actions/register.php:418
+#: actions/register.php:424
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr ""
 
@@ -229,6 +230,7 @@ msgstr "Unutmayın, 6 veya daha fazla karakter"
 
 #: ../actions/register.php:154 actions/register.php:168
 #: actions/register.php:373 actions/register.php:419 actions/register.php:423
+#: actions/register.php:429
 msgid "6 or more characters. Required."
 msgstr ""
 
@@ -403,7 +405,7 @@ msgstr "\"%s\" kelimesinin geçtiği tüm güncellemeler"
 #: 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
+#: actions/login.php:79 actions/register.php:137
 msgid "Already logged in."
 msgstr "Zaten giriş yapılmış."
 
@@ -426,7 +428,7 @@ msgstr "Takip isteğini onayla"
 #: ../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
+#: actions/register.php:473 actions/login.php:253 actions/register.php:479
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Gelecekte kendiliğinden giriş yap, paylaşılan bilgisayarlar için değildir!"
@@ -449,6 +451,7 @@ msgstr "Avatar"
 
 #: ../actions/avatar.php:113 actions/profilesettings.php:350
 #: actions/avatarsettings.php:395 actions/avatarsettings.php:346
+#: actions/avatarsettings.php:360
 msgid "Avatar updated."
 msgstr "Avatar güncellendi."
 
@@ -483,7 +486,7 @@ msgstr "Önce »"
 #: 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
+#: actions/register.php:459 actions/register.php:465
 msgid "Bio"
 msgstr "Hakkında"
 
@@ -512,6 +515,7 @@ msgstr "Avatar URLi '%s' okunamıyor"
 #: actions/passwordsettings.php:169 actions/recoverpassword.php:347
 #: actions/passwordsettings.php:174 actions/recoverpassword.php:365
 #: actions/passwordsettings.php:180 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:185
 msgid "Can't save new password."
 msgstr "Yeni parola kaydedilemedi."
 
@@ -574,6 +578,7 @@ msgstr ""
 #: actions/recoverpassword.php:236 actions/register.php:422
 #: actions/passwordsettings.php:111 actions/recoverpassword.php:239
 #: actions/register.php:426 actions/smssettings.php:134
+#: actions/register.php:432
 msgid "Confirm"
 msgstr "Onayla"
 
@@ -603,7 +608,7 @@ msgid "Confirmation code not found."
 msgstr "Onay kodu bulunamadı."
 
 #: ../actions/register.php:202 actions/register.php:473
-#: actions/register.php:521 actions/register.php:531
+#: actions/register.php:521 actions/register.php:531 actions/register.php:537
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -827,6 +832,7 @@ 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
+#: classes/Notice.php:1120
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Cevap eklenirken veritabanı hatası: %s"
@@ -849,7 +855,8 @@ msgstr "Kendinizi ve ilgi alanlarınızı 140 karakter ile anlatın"
 #: 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
+#: lib/accountsettingsaction.php:117 actions/register.php:437
+#: actions/register.php:441
 msgid "Email"
 msgstr "Eposta"
 
@@ -864,7 +871,7 @@ msgid "Email Settings"
 msgstr ""
 
 #: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
-#: actions/register.php:200 actions/register.php:206
+#: actions/register.php:200 actions/register.php:206 actions/register.php:212
 msgid "Email address already exists."
 msgstr "Eposta adresi zaten var."
 
@@ -950,7 +957,7 @@ msgstr "Kullanıcıyı kaydetmede hata oluştu."
 
 #: ../actions/password.php:80 actions/profilesettings.php:399
 #: actions/passwordsettings.php:164 actions/passwordsettings.php:169
-#: actions/passwordsettings.php:175
+#: actions/passwordsettings.php:175 actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "Kullanıcıyı kaydetmede hata oluştu; geçersiz."
 
@@ -962,6 +969,7 @@ msgstr "Kullanıcıyı kaydetmede hata oluştu; geçersiz."
 #: actions/login.php:120 actions/recoverpassword.php:372
 #: actions/register.php:235 actions/login.php:122
 #: actions/recoverpassword.php:375 actions/register.php:242
+#: actions/login.php:149 actions/register.php:248
 msgid "Error setting user."
 msgstr "Kullanıcı ayarlamada hata oluştu."
 
@@ -993,6 +1001,7 @@ msgstr "SSS"
 
 #: ../actions/avatar.php:115 actions/profilesettings.php:352
 #: actions/avatarsettings.php:397 actions/avatarsettings.php:349
+#: actions/avatarsettings.php:363
 msgid "Failed updating avatar."
 msgstr "Avatar güncellemede hata."
 
@@ -1027,6 +1036,7 @@ msgid "Find people on this site"
 msgstr ""
 
 #: ../actions/login.php:122 actions/login.php:247 actions/login.php:255
+#: actions/login.php:282
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -1044,6 +1054,7 @@ msgstr ""
 #: actions/showstream.php:220 lib/groupeditform.php:157
 #: actions/profilesettings.php:111 actions/register.php:441
 #: actions/showgroup.php:247 actions/showstream.php:267
+#: actions/register.php:447 lib/userprofile.php:149
 msgid "Full name"
 msgstr "Tam İsim"
 
@@ -1057,7 +1068,7 @@ msgstr "Tam İsim"
 #: 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
+#: actions/register.php:214 actions/register.php:220
 msgid "Full name is too long (max 255 chars)."
 msgstr "Tam isim çok uzun (azm: 255 karakter)."
 
@@ -1078,7 +1089,7 @@ msgstr "Başlangıç"
 #: 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
+#: actions/register.php:446 actions/register.php:452
 msgid "Homepage"
 msgstr "Başlangıç Sayfası"
 
@@ -1090,7 +1101,7 @@ msgstr "Başlangıç Sayfası"
 #: 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
+#: actions/register.php:211 actions/register.php:217
 msgid "Homepage is not a valid URL."
 msgstr "Başlangıç sayfası adresi geçerli bir URL değil."
 
@@ -1160,7 +1171,7 @@ msgstr "Eski parola yanlış"
 
 #: ../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
+#: actions/facebookhome.php:129 actions/login.php:116 actions/login.php:143
 msgid "Incorrect username or password."
 msgstr "Yanlış kullanıcı adı veya parola."
 
@@ -1240,6 +1251,7 @@ msgstr "Geçersiz büyüklük."
 #: 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
+#: actions/register.php:243 actions/register.php:264
 msgid "Invalid username or password."
 msgstr "Geçersiz kullanıcı adı veya parola."
 
@@ -1316,7 +1328,7 @@ msgstr ""
 #: 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
+#: lib/profilelist.php:218 actions/register.php:470 lib/userprofile.php:164
 msgid "Location"
 msgstr "Yer"
 
@@ -1330,7 +1342,7 @@ msgstr "Yer"
 #: 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
+#: actions/register.php:221 actions/register.php:227
 msgid "Location is too long (max 255 chars)."
 msgstr "Yer bilgisi çok uzun (azm: 255 karakter)."
 
@@ -1344,6 +1356,7 @@ msgstr "Yer bilgisi çok uzun (azm: 255 karakter)."
 #: 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
+#: actions/login.php:204 actions/login.php:257
 #, php-format
 msgid "Login"
 msgstr "Giriş"
@@ -1372,12 +1385,13 @@ msgstr "Çıkış"
 
 #: ../actions/register.php:166 actions/register.php:180
 #: actions/register.php:393 actions/register.php:439 actions/register.php:443
+#: actions/register.php:449
 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 actions/login.php:236
+#: lib/facebookaction.php:327 actions/login.php:236 actions/login.php:263
 msgid "Lost or forgotten password?"
 msgstr "Parolamı unuttum veya kaybettim"
 
@@ -1417,7 +1431,7 @@ 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:487
+#: actions/register.php:477 actions/register.php:487 actions/register.php:493
 msgid "My text and files are available under "
 msgstr "Durum mesajlarim ve dosyalarim şu lisans ile korunmaktadır: "
 
@@ -1475,7 +1489,8 @@ msgstr "Yeni parola başarıyla kaydedildi. Şimdi giriş yaptınız."
 #: 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
+#: actions/showgroup.php:236 actions/showstream.php:249 actions/login.php:246
+#: actions/register.php:423 lib/userprofile.php:131
 msgid "Nickname"
 msgstr "Takma ad"
 
@@ -1489,7 +1504,7 @@ msgstr "Takma ad"
 #: 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
+#: actions/register.php:202 actions/register.php:208
 msgid "Nickname already in use. Try another one."
 msgstr "Takma ad kullanımda. Başka bir tane deneyin."
 
@@ -1505,7 +1520,7 @@ msgstr "Takma ad kullanımda. Başka bir tane deneyin."
 #: 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
+#: actions/register.php:199 actions/register.php:205
 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 "
@@ -1746,7 +1761,8 @@ msgstr ""
 #: 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
+#: lib/api.php:954 lib/api.php:982 lib/api.php:1092 lib/api.php:963
+#: lib/api.php:991 lib/api.php:1101
 msgid "Not a supported data format."
 msgstr ""
 
@@ -1767,7 +1783,7 @@ 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
+#: actions/register.php:189 actions/register.php:195 actions/register.php:201
 msgid "Not a valid email address."
 msgstr "Geçersiz bir eposta adresi."
 
@@ -1779,7 +1795,7 @@ msgstr "Geçersiz bir eposta adresi."
 #: 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
+#: actions/register.php:204 actions/register.php:210
 msgid "Not a valid nickname."
 msgstr "Geçersiz bir takma ad."
 
@@ -1818,6 +1834,7 @@ msgstr ""
 #: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
 #: actions/twitapistatuses.php:309 actions/twitapistatuses.php:327
 #: actions/twitapistatuses.php:284 actions/apistatusesupdate.php:186
+#: actions/apistatusesupdate.php:193
 msgid "Not found"
 msgstr ""
 
@@ -1964,7 +1981,8 @@ msgstr "Kısmi yükleme."
 #: 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
+#: lib/accountsettingsaction.php:114 actions/login.php:249
+#: actions/register.php:428
 msgid "Password"
 msgstr "Parola"
 
@@ -1993,6 +2011,7 @@ msgstr "Parola geri alma isteği"
 #: actions/passwordsettings.php:173 actions/recoverpassword.php:200
 #: actions/passwordsettings.php:178 actions/recoverpassword.php:208
 #: actions/passwordsettings.php:184 actions/recoverpassword.php:211
+#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "Parola kaydedildi."
 
@@ -2001,6 +2020,7 @@ msgstr "Parola kaydedildi."
 #: actions/passwordsettings.php:145 actions/register.php:183
 #: actions/passwordsettings.php:150 actions/register.php:220
 #: actions/passwordsettings.php:156 actions/register.php:227
+#: actions/register.php:233
 msgid "Passwords don't match."
 msgstr "Parolalar birbirini tutmuyor."
 
@@ -2165,19 +2185,19 @@ msgstr "Bilinmeye kullanıcı için geri alma kodu"
 #: 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
+#: lib/logingroupnav.php:85 actions/register.php:114 actions/register.php:502
 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
+#: actions/register.php:129 actions/register.php:135
 msgid "Registration not allowed."
 msgstr ""
 
 #: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67 actions/register.php:106
+#: actions/register.php:67 actions/register.php:106 actions/register.php:112
 msgid "Registration successful"
 msgstr ""
 
@@ -2191,6 +2211,7 @@ msgstr "Reddet"
 #: 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
+#: actions/login.php:252 actions/register.php:477
 msgid "Remember me"
 msgstr "Beni hatırla"
 
@@ -2289,6 +2310,7 @@ msgstr "yukarıdaki parolanın aynısı"
 
 #: ../actions/register.php:156 actions/register.php:170
 #: actions/register.php:377 actions/register.php:423 actions/register.php:427
+#: actions/register.php:433
 msgid "Same as password above. Required."
 msgstr ""
 
@@ -2449,6 +2471,7 @@ msgstr "Kaydedilmiş OpenID bulunamadı."
 #: actions/remotesubscribe.php:113 actions/showstream.php:376
 #: lib/subscribeform.php:139 actions/showstream.php:345
 #: actions/remotesubscribe.php:137 actions/showstream.php:439
+#: lib/userprofile.php:321
 msgid "Subscribe"
 msgstr "Abone ol"
 
@@ -2495,6 +2518,7 @@ msgstr "Dosya yüklemede sistem hatası."
 #: actions/profilesettings.php:123 actions/showstream.php:255
 #: lib/subscriptionlist.php:106 lib/subscriptionlist.php:108
 #: actions/profilesettings.php:138 actions/showstream.php:327
+#: lib/userprofile.php:209
 msgid "Tags"
 msgstr ""
 
@@ -2709,6 +2733,7 @@ msgstr ""
 #: actions/apifriendshipsdestroy.php:91 actions/apigroupcreate.php:104
 #: actions/apigroupjoin.php:91 actions/apigroupleave.php:91
 #: actions/apistatusesupdate.php:109
+#: actions/apiaccountupdateprofileimage.php:84
 msgid "This method requires a POST."
 msgstr ""
 
@@ -2739,7 +2764,7 @@ msgstr ""
 
 #: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
 #: actions/twitapifriendships.php:132 actions/twitapifriendships.php:139
-#: actions/apifriendshipsexists.php:103
+#: actions/apifriendshipsexists.php:103 actions/apifriendshipsexists.php:94
 msgid "Two user ids or screen_names must be supplied."
 msgstr ""
 
@@ -2747,7 +2772,7 @@ msgstr ""
 #: 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
+#: actions/register.php:448 actions/register.php:454
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr ""
 "Web Sitenizin, blogunuzun ya da varsa başka bir sitedeki profilinizin adresi"
@@ -2770,6 +2795,7 @@ msgstr ""
 #: actions/twittersettings.php:322 lib/designsettings.php:301
 #: actions/emailsettings.php:255 actions/grouplogo.php:319
 #: actions/imsettings.php:220 actions/smssettings.php:248
+#: actions/avatarsettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "Beklenmeğen form girdisi."
 
@@ -2880,7 +2906,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
+#: actions/register.php:436 actions/register.php:438 actions/register.php:442
 msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
 "Sadece sistem güncellemeleri, duyurular ve parola geri alma için kullanılır."
@@ -2909,7 +2935,8 @@ 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
+#: actions/apiusershow.php:108 actions/apiaccountupdateprofileimage.php:124
+#: actions/apiaccountupdateprofileimage.php:130
 msgid "User has no profile."
 msgstr "Kullanıcının profili yok."
 
@@ -2938,7 +2965,7 @@ msgstr "N'aber %s?"
 #: 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
+#: actions/register.php:466 actions/register.php:472
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Bulunduğunuz yer, \"Şehir, Eyalet (veya Bölge), Ülke\" gibi"
 
@@ -3040,7 +3067,7 @@ 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/register.php:149
-#: actions/register.php:186 actions/register.php:192
+#: actions/register.php:186 actions/register.php:192 actions/register.php:198
 msgid "You can't register if you don't agree to the license."
 msgstr "Eğer lisansı kabul etmezseniz kayıt olamazsınız."
 
@@ -3105,56 +3132,56 @@ msgstr ""
 "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:756
-#: lib/util.php:770 lib/util.php:816
+#: lib/util.php:770 lib/util.php:816 lib/util.php:844
 msgid "a few seconds ago"
 msgstr "birkaç saniye önce"
 
 #: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957 lib/util.php:768
-#: lib/util.php:782 lib/util.php:828
+#: lib/util.php:782 lib/util.php:828 lib/util.php:856
 #, 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:764
-#: lib/util.php:778 lib/util.php:824
+#: lib/util.php:778 lib/util.php:824 lib/util.php:852
 #, 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:760
-#: lib/util.php:774 lib/util.php:820
+#: lib/util.php:774 lib/util.php:820 lib/util.php:848
 #, 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:772
-#: lib/util.php:786 lib/util.php:832
+#: lib/util.php:786 lib/util.php:832 lib/util.php:860
 #, 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:766
-#: lib/util.php:780 lib/util.php:826
+#: lib/util.php:780 lib/util.php:826 lib/util.php:854
 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:758
-#: lib/util.php:772 lib/util.php:818
+#: lib/util.php:772 lib/util.php:818 lib/util.php:846
 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:770
-#: lib/util.php:784 lib/util.php:830
+#: lib/util.php:784 lib/util.php:830 lib/util.php:858
 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:774
-#: lib/util.php:788 lib/util.php:834
+#: lib/util.php:788 lib/util.php:834 lib/util.php:862
 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:762
-#: lib/util.php:776 lib/util.php:822
+#: lib/util.php:776 lib/util.php:822 lib/util.php:850
 msgid "about an hour ago"
 msgstr "yaklaşık bir saat önce"
 
@@ -3224,7 +3251,9 @@ msgstr "« Sonra"
 #: 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
+#: actions/userauthorization.php:52 actions/login.php:131
+#: actions/register.php:165 actions/avatarsettings.php:265
+#: lib/designsettings.php:294
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
@@ -3444,6 +3473,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
+#: actions/register.php:230
 msgid "Password must be 6 or more characters."
 msgstr ""
 
@@ -3983,13 +4013,13 @@ msgid "There was a problem with your session token. "
 msgstr ""
 
 #: actions/avatarsettings.php:303 actions/grouplogo.php:360
-#: actions/avatarsettings.php:308
+#: actions/avatarsettings.php:308 actions/avatarsettings.php:322
 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
+#: actions/grouplogo.php:377 actions/avatarsettings.php:337
 msgid "Lost our file data."
 msgstr ""
 
@@ -4479,7 +4509,7 @@ msgid "%s left group %s"
 msgstr ""
 
 #: actions/login.php:225 lib/facebookaction.php:304 actions/login.php:208
-#: actions/login.php:216
+#: actions/login.php:216 actions/login.php:243
 msgid "Login to site"
 msgstr ""
 
@@ -4668,7 +4698,8 @@ 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
+#: actions/register.php:398 actions/register.php:85 actions/register.php:189
+#: actions/register.php:404
 msgid "Sorry, only invited people can register."
 msgstr ""
 
@@ -4764,7 +4795,7 @@ msgstr "Böyle bir durum mesajı yok."
 #: 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
+#: lib/profilelist.php:230 lib/userprofile.php:177
 msgid "URL"
 msgstr ""
 
@@ -4775,7 +4806,7 @@ msgstr ""
 #: 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
+#: lib/profilelist.php:245 lib/userprofile.php:194
 #, fuzzy
 msgid "Note"
 msgstr "Durum mesajları"
@@ -4824,6 +4855,7 @@ msgid "Only the sender and recipient "
 msgstr ""
 
 #: actions/showstream.php:73 actions/showstream.php:78
+#: actions/showstream.php:79
 #, php-format
 msgid "%s, page %d"
 msgstr ""
@@ -4835,29 +4867,30 @@ msgstr "Profil"
 
 #: actions/showstream.php:236 actions/tagother.php:77
 #: actions/showstream.php:220 actions/showstream.php:185
-#: actions/showstream.php:193
+#: actions/showstream.php:193 lib/userprofile.php:75
 #, 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
+#: actions/showstream.php:220 lib/userprofile.php:102
 msgid "Photo"
 msgstr ""
 
 #: actions/showstream.php:317 actions/showstream.php:309
 #: actions/showstream.php:274 actions/showstream.php:354
+#: lib/userprofile.php:236
 msgid "User actions"
 msgstr ""
 
 #: actions/showstream.php:342 actions/showstream.php:307
-#: actions/showstream.php:390
+#: actions/showstream.php:390 lib/userprofile.php:272
 msgid "Send a direct message to this user"
 msgstr ""
 
 #: actions/showstream.php:343 actions/showstream.php:308
-#: actions/showstream.php:391
+#: actions/showstream.php:391 lib/userprofile.php:273
 msgid "Message"
 msgstr ""
 
@@ -5603,7 +5636,7 @@ msgstr "%s ve arkadaşları"
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr ""
 
-#: actions/avatarsettings.php:373
+#: actions/avatarsettings.php:373 actions/avatarsettings.php:387
 #, fuzzy
 msgid "Avatar deleted."
 msgstr "Avatar güncellendi."
@@ -5734,10 +5767,12 @@ msgid ""
 msgstr ""
 
 #: actions/register.php:432 actions/register.php:479 actions/register.php:489
+#: actions/register.php:495
 msgid "Creative Commons Attribution 3.0"
 msgstr ""
 
 #: actions/register.php:433 actions/register.php:480 actions/register.php:490
+#: actions/register.php:496
 #, fuzzy
 msgid ""
 " except this private data: password, email address, IM address, and phone "
@@ -5774,44 +5809,48 @@ msgid "%s's profile"
 msgstr "Profil"
 
 #: actions/showstream.php:163 actions/showstream.php:128
+#: actions/showstream.php:129
 #, 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
+#: actions/showstream.php:136
 #, 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
+#: actions/showstream.php:143
 #, fuzzy, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "%s için durum RSS beslemesi"
 
 #: actions/showstream.php:182 actions/showstream.php:147
+#: actions/showstream.php:148
 #, php-format
 msgid "FOAF for %s"
 msgstr ""
 
 #: actions/showstream.php:237 actions/showstream.php:202
-#: actions/showstream.php:234
+#: actions/showstream.php:234 lib/userprofile.php:116
 #, fuzzy
 msgid "Edit Avatar"
 msgstr "Avatar"
 
 #: actions/showstream.php:316 actions/showstream.php:281
-#: actions/showstream.php:366
+#: actions/showstream.php:366 lib/userprofile.php:248
 #, fuzzy
 msgid "Edit profile settings"
 msgstr "Profil ayarları"
 
 #: actions/showstream.php:317 actions/showstream.php:282
-#: actions/showstream.php:367
+#: actions/showstream.php:367 lib/userprofile.php:249
 msgid "Edit"
 msgstr ""
 
 #: actions/showstream.php:542 actions/showstream.php:388
-#: actions/showstream.php:487
+#: actions/showstream.php:487 actions/showstream.php:234
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5854,6 +5893,9 @@ msgstr ""
 #: actions/apistatusesupdate.php:125 actions/apisubscriptions.php:87
 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#: actions/apiaccountupdateprofileimage.php:91
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apistatusesupdate.php:139
 #, fuzzy
 msgid "No such user!"
 msgstr "Böyle bir kullanıcı yok."
@@ -5906,36 +5948,6 @@ msgid ""
 "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 ""
@@ -6106,6 +6118,7 @@ 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
+#: actions/showstream.php:202
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -6283,7 +6296,8 @@ 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
+#: lib/designsettings.php:461 lib/designsettings.php:434
+#: lib/designsettings.php:464
 #, fuzzy
 msgid "Couldn't update your design."
 msgstr "Kullanıcı güncellenemedi."
@@ -6375,7 +6389,9 @@ msgid "Message sent"
 msgstr ""
 
 #: actions/newnotice.php:93 lib/designsettings.php:281
-#: actions/newnotice.php:94
+#: actions/newnotice.php:94 actions/apiaccountupdateprofileimage.php:97
+#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254
+#: lib/designsettings.php:283
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s bytes) due to its "
@@ -6543,7 +6559,7 @@ msgstr "Harika, sizi tanıdık. Simdi yeni parolanızı girin."
 msgid "Password recover"
 msgstr "Parola geri alma isteği"
 
-#: actions/register.php:86
+#: actions/register.php:86 actions/register.php:92
 #, fuzzy
 msgid "Sorry, invalid invitation code."
 msgstr "Onay kodu hatası."
@@ -6642,28 +6658,31 @@ msgstr ""
 msgid "Not a local notice"
 msgstr "Böyle bir kullanıcı yok."
 
-#: actions/showstream.php:72
+#: actions/showstream.php:72 actions/showstream.php:73
 #, php-format
 msgid " tagged %s"
 msgstr ""
 
-#: actions/showstream.php:121
+#: actions/showstream.php:121 actions/showstream.php:122
 #, 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
+#: actions/showstream.php:191
 #, 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
+#: actions/showstream.php:196
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
 msgstr ""
 
 #: actions/showstream.php:357 actions/showstream.php:451
+#: actions/showstream.php:198
 #, php-format
 msgid ""
 "You can try to nudge %s or [post something to his or her attention](%%%%"
@@ -6671,6 +6690,7 @@ msgid ""
 msgstr ""
 
 #: actions/showstream.php:393 actions/showstream.php:492
+#: actions/showstream.php:239
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -6817,6 +6837,7 @@ 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
+#: classes/User.php:333
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr ""
@@ -6927,10 +6948,12 @@ msgid "Save design"
 msgstr ""
 
 #: lib/designsettings.php:378 lib/designsettings.php:369
+#: lib/designsettings.php:372
 msgid "Bad default color settings: "
 msgstr ""
 
 #: lib/designsettings.php:474 lib/designsettings.php:465
+#: lib/designsettings.php:468
 msgid "Design defaults restored."
 msgstr ""
 
@@ -7137,17 +7160,19 @@ msgid "Status deleted."
 msgstr "Avatar güncellendi."
 
 #: actions/apistatusesupdate.php:132
+#: actions/apiaccountupdateprofileimage.php:99
 msgid "Unable to handle that much POST data!"
 msgstr ""
 
 #: actions/apistatusesupdate.php:145 actions/newnotice.php:155
-#: scripts/maildaemon.php:71
+#: scripts/maildaemon.php:71 actions/apistatusesupdate.php:152
 #, 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
+#: actions/apistatusesupdate.php:216
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
@@ -7209,7 +7234,7 @@ msgstr "%s adli kullanicinin durum mesajlari"
 msgid "IM is not available."
 msgstr "Bu sayfa kabul ettiğiniz ortam türünde kullanılabilir değil"
 
-#: actions/login.php:259
+#: actions/login.php:259 actions/login.php:286
 #, fuzzy, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -7244,21 +7269,24 @@ msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
 msgstr ""
 
 #: actions/profilesettings.php:122 actions/register.php:454
+#: actions/register.php:460
 #, 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
+#: actions/register.php:463
 #, 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
+#: actions/register.php:223
 #, 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
+#: actions/register.php:336 actions/register.php:342
 msgid ""
 "With this form you can create  a new account. You can then post notices and "
 "link up to friends and colleagues. "
@@ -7417,7 +7445,7 @@ msgid "Site content license"
 msgstr "Yeni durum mesajı"
 
 #: lib/command.php:88
-#, fuzzy, php-format
+#, php-format
 msgid "Could not find a user with nickname %s"
 msgstr "Kullanıcı güncellenemedi."
 
@@ -7454,41 +7482,6 @@ msgstr "%s için cevaplar"
 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. "
@@ -7521,7 +7514,7 @@ 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
+#, php-format
 msgid "notice id: %s"
 msgstr "Yeni durum mesajı"
 
@@ -7588,3 +7581,60 @@ msgstr "Kullanıcı güncellenemedi."
 #, fuzzy
 msgid "Duplicate notice"
 msgstr "Yeni durum mesajı"
+
+#: actions/login.php:110 actions/login.php:120
+#, fuzzy
+msgid "Invalid or expired token."
+msgstr "Geçersiz durum mesajı"
+
+#: lib/command.php:597
+#, fuzzy, php-format
+msgid "Could not create login token for %s"
+msgstr "OpenID formu yaratılamadı: %s"
+
+#: lib/command.php:602
+#, php-format
+msgid "This link is useable only once, and is good for only 2 minutes: %s"
+msgstr ""
+
+#: lib/imagefile.php:75
+#, fuzzy, php-format
+msgid "That file is too big. The maximum file size is %s."
+msgstr ""
+"Ah, durumunuz biraz uzun kaçtı. Azami 180 karaktere sığdırmaya ne dersiniz?"
+
+#: lib/command.php:613
+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"
+"login - Get a link to login to the web interface\n"
+"drop <group> - leave group\n"
+"stats - get your stats\n"
+"stop - same as 'off'\n"
+"quit - same as 'off'\n"
+"sub <nickname> - same as 'follow'\n"
+"unsub <nickname> - same as 'leave'\n"
+"last <nickname> - same as 'get'\n"
+"on <nickname> - not yet implemented.\n"
+"off <nickname> - not yet implemented.\n"
+"nudge <nickname> - remind a user to update.\n"
+"invite <phone number> - not yet implemented.\n"
+"track <word> - not yet implemented.\n"
+"untrack <word> - not yet implemented.\n"
+"track off - not yet implemented.\n"
+"untrack all - not yet implemented.\n"
+"tracks - not yet implemented.\n"
+"tracking - not yet implemented.\n"
+msgstr ""
diff --git a/locale/uk/LC_MESSAGES/statusnet.mo b/locale/uk/LC_MESSAGES/statusnet.mo
index a3a9b117b..f661c48a3 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 c9301425b..e24f37a6a 100644
--- a/locale/uk/LC_MESSAGES/statusnet.po
+++ b/locale/uk/LC_MESSAGES/statusnet.po
@@ -5,12 +5,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-06 13:16+0000\n"
-"PO-Revision-Date: 2009-11-06 15:44:43+0000\n"
+"POT-Creation-Date: 2009-11-08 11:53+0000\n"
+"PO-Revision-Date: 2009-11-08 11:57:20+0000\n"
 "Language-Team: Ukrainian\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r58648); Translate extension (2009-08-03)\n"
+"X-Generator: MediaWiki 1.16alpha(r58760); 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"
@@ -202,7 +202,7 @@ msgid "%s updates from everyone!"
 msgstr "%s оновлення від всіх!"
 
 #: ../actions/register.php:213 actions/register.php:497
-#: actions/register.php:545 actions/register.php:555
+#: actions/register.php:545 actions/register.php:555 actions/register.php:561
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -242,6 +242,7 @@ msgstr ""
 
 #: ../actions/register.php:152 actions/register.php:166
 #: actions/register.php:368 actions/register.php:414 actions/register.php:418
+#: actions/register.php:424
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr ""
 "1-64 літери нижнього регістра і цифри, ніякої пунктуації або інтервалів. "
@@ -260,6 +261,7 @@ msgstr "6 або більше знаків, і не забудьте їх!"
 
 #: ../actions/register.php:154 actions/register.php:168
 #: actions/register.php:373 actions/register.php:419 actions/register.php:423
+#: actions/register.php:429
 msgid "6 or more characters. Required."
 msgstr "6 або більше знаків. Неодмінно."
 
@@ -440,7 +442,7 @@ msgstr "Всі оновлення за збігом з \"%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
+#: actions/login.php:79 actions/register.php:137
 msgid "Already logged in."
 msgstr "Тепер ви увійшли."
 
@@ -463,7 +465,7 @@ 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/login.php:226
-#: actions/register.php:473
+#: actions/register.php:473 actions/login.php:253 actions/register.php:479
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Автоматично входити у майбутньому; не для комп'ютерів загального "
@@ -489,6 +491,7 @@ msgstr "Аватара"
 
 #: ../actions/avatar.php:113 actions/profilesettings.php:350
 #: actions/avatarsettings.php:395 actions/avatarsettings.php:346
+#: actions/avatarsettings.php:360
 msgid "Avatar updated."
 msgstr "Аватару оновлено."
 
@@ -525,7 +528,7 @@ msgstr "Назад »"
 #: 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
+#: actions/register.php:459 actions/register.php:465
 msgid "Bio"
 msgstr "Про себе"
 
@@ -554,6 +557,7 @@ msgstr "Не можна прочитати URL аватари '%s'"
 #: actions/passwordsettings.php:169 actions/recoverpassword.php:347
 #: actions/passwordsettings.php:174 actions/recoverpassword.php:365
 #: actions/passwordsettings.php:180 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:185
 msgid "Can't save new password."
 msgstr "Не можна зберегти новий пароль."
 
@@ -616,6 +620,7 @@ msgstr "Змінити налаштування профілю"
 #: actions/recoverpassword.php:236 actions/register.php:422
 #: actions/passwordsettings.php:111 actions/recoverpassword.php:239
 #: actions/register.php:426 actions/smssettings.php:134
+#: actions/register.php:432
 msgid "Confirm"
 msgstr "Підтвердити"
 
@@ -645,7 +650,7 @@ msgid "Confirmation code not found."
 msgstr "Код підтвердження не знайдено."
 
 #: ../actions/register.php:202 actions/register.php:473
-#: actions/register.php:521 actions/register.php:531
+#: actions/register.php:521 actions/register.php:531 actions/register.php:537
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -884,6 +889,7 @@ 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
+#: classes/Notice.php:1120
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Помилка бази даних при додаванні відповіді: %s"
@@ -906,7 +912,8 @@ msgstr "Опишіть себе та свої інтереси (140 знаків
 #: 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
+#: lib/accountsettingsaction.php:117 actions/register.php:437
+#: actions/register.php:441
 msgid "Email"
 msgstr "Пошта"
 
@@ -921,7 +928,7 @@ msgid "Email Settings"
 msgstr "Налаштування пошти"
 
 #: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
-#: actions/register.php:200 actions/register.php:206
+#: actions/register.php:200 actions/register.php:206 actions/register.php:212
 msgid "Email address already exists."
 msgstr "Ця адреса вже використовується."
 
@@ -1007,7 +1014,7 @@ msgstr "Помилка при збереженні користувача."
 
 #: ../actions/password.php:80 actions/profilesettings.php:399
 #: actions/passwordsettings.php:164 actions/passwordsettings.php:169
-#: actions/passwordsettings.php:175
+#: actions/passwordsettings.php:175 actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "Помилка при збереженні користувача; недійсний."
 
@@ -1019,6 +1026,7 @@ msgstr "Помилка при збереженні користувача; не�
 #: actions/login.php:120 actions/recoverpassword.php:372
 #: actions/register.php:235 actions/login.php:122
 #: actions/recoverpassword.php:375 actions/register.php:242
+#: actions/login.php:149 actions/register.php:248
 msgid "Error setting user."
 msgstr "Помилка в налаштуваннях користувача."
 
@@ -1050,6 +1058,7 @@ msgstr "ЧаПи"
 
 #: ../actions/avatar.php:115 actions/profilesettings.php:352
 #: actions/avatarsettings.php:397 actions/avatarsettings.php:349
+#: actions/avatarsettings.php:363
 msgid "Failed updating avatar."
 msgstr "Оновлення аватари невдале."
 
@@ -1084,6 +1093,7 @@ msgid "Find people on this site"
 msgstr "Знайти людей на цьому сайті"
 
 #: ../actions/login.php:122 actions/login.php:247 actions/login.php:255
+#: actions/login.php:282
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -1101,6 +1111,7 @@ msgstr ""
 #: actions/showstream.php:220 lib/groupeditform.php:157
 #: actions/profilesettings.php:111 actions/register.php:441
 #: actions/showgroup.php:247 actions/showstream.php:267
+#: actions/register.php:447 lib/userprofile.php:149
 msgid "Full name"
 msgstr "Повне ім'я"
 
@@ -1114,7 +1125,7 @@ msgstr "Повне ім'я"
 #: 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
+#: actions/register.php:214 actions/register.php:220
 msgid "Full name is too long (max 255 chars)."
 msgstr "Повне ім'я задовге (255 знаків максимум)"
 
@@ -1135,7 +1146,7 @@ msgstr "Дім"
 #: 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
+#: actions/register.php:446 actions/register.php:452
 msgid "Homepage"
 msgstr "Веб-сторінка"
 
@@ -1147,7 +1158,7 @@ msgstr "Веб-сторінка"
 #: 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
+#: actions/register.php:211 actions/register.php:217
 msgid "Homepage is not a valid URL."
 msgstr "Веб-сторінка має недійсну URL-адресу."
 
@@ -1220,7 +1231,7 @@ 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/login.php:116
+#: actions/facebookhome.php:129 actions/login.php:116 actions/login.php:143
 msgid "Incorrect username or password."
 msgstr "Неточне ім'я або пароль."
 
@@ -1300,6 +1311,7 @@ msgstr "Недійсний розмір."
 #: 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
+#: actions/register.php:243 actions/register.php:264
 msgid "Invalid username or password."
 msgstr "Недійсне ім'я або пароль."
 
@@ -1377,7 +1389,7 @@ msgstr "Мова задовга (50 знаків максимум)"
 #: 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
+#: lib/profilelist.php:218 actions/register.php:470 lib/userprofile.php:164
 msgid "Location"
 msgstr "Локація"
 
@@ -1391,7 +1403,7 @@ msgstr "Локація"
 #: 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
+#: actions/register.php:221 actions/register.php:227
 msgid "Location is too long (max 255 chars)."
 msgstr "Локація надто довга (255 знаків максимум)"
 
@@ -1405,6 +1417,7 @@ msgstr "Локація надто довга (255 знаків максимум)
 #: 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
+#: actions/login.php:204 actions/login.php:257
 #, php-format
 msgid "Login"
 msgstr "Увійти"
@@ -1433,12 +1446,13 @@ msgstr "Вийти"
 
 #: ../actions/register.php:166 actions/register.php:180
 #: actions/register.php:393 actions/register.php:439 actions/register.php:443
+#: actions/register.php:449
 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 actions/login.php:236
+#: lib/facebookaction.php:327 actions/login.php:236 actions/login.php:263
 msgid "Lost or forgotten password?"
 msgstr "Загубили або забули пароль?"
 
@@ -1481,7 +1495,7 @@ 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:487
+#: actions/register.php:477 actions/register.php:487 actions/register.php:493
 msgid "My text and files are available under "
 msgstr "Мої повідомлення та файли доступні під "
 
@@ -1539,7 +1553,8 @@ msgstr "Новий пароль успішно збережено. Тепер в
 #: 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
+#: actions/showgroup.php:236 actions/showstream.php:249 actions/login.php:246
+#: actions/register.php:423 lib/userprofile.php:131
 msgid "Nickname"
 msgstr "Ім'я користувача"
 
@@ -1553,7 +1568,7 @@ msgstr "Ім'я користувача"
 #: 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
+#: actions/register.php:202 actions/register.php:208
 msgid "Nickname already in use. Try another one."
 msgstr "Це ім'я вже використовується. Спробуйте інше."
 
@@ -1569,7 +1584,7 @@ msgstr "Це ім'я вже використовується. Спробуйте
 #: 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
+#: actions/register.php:199 actions/register.php:205
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
 "Ім'я користувача повинно складатись з літер нижнього регістру і цифр, ніяких "
@@ -1810,7 +1825,8 @@ msgstr "Це не зареєстрований користувач."
 #: 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
+#: lib/api.php:954 lib/api.php:982 lib/api.php:1092 lib/api.php:963
+#: lib/api.php:991 lib/api.php:1101
 msgid "Not a supported data format."
 msgstr "Такий формат даних не підтримується."
 
@@ -1831,7 +1847,7 @@ 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
+#: actions/register.php:189 actions/register.php:195 actions/register.php:201
 msgid "Not a valid email address."
 msgstr "Це недійсна електронна адреса."
 
@@ -1843,7 +1859,7 @@ msgstr "Це недійсна електронна адреса."
 #: 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
+#: actions/register.php:204 actions/register.php:210
 msgid "Not a valid nickname."
 msgstr "Це недійсне ім'я користувача."
 
@@ -1882,6 +1898,7 @@ msgstr "Ця відповідь не очікується!"
 #: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
 #: actions/twitapistatuses.php:309 actions/twitapistatuses.php:327
 #: actions/twitapistatuses.php:284 actions/apistatusesupdate.php:186
+#: actions/apistatusesupdate.php:193
 msgid "Not found"
 msgstr "Не знайдено"
 
@@ -2028,7 +2045,8 @@ msgstr "Часткове завантаження."
 #: 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
+#: lib/accountsettingsaction.php:114 actions/login.php:249
+#: actions/register.php:428
 msgid "Password"
 msgstr "Пароль"
 
@@ -2057,6 +2075,7 @@ msgstr "Запит на відновлення паролю відправлен
 #: actions/passwordsettings.php:173 actions/recoverpassword.php:200
 #: actions/passwordsettings.php:178 actions/recoverpassword.php:208
 #: actions/passwordsettings.php:184 actions/recoverpassword.php:211
+#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "Пароль збережено."
 
@@ -2065,6 +2084,7 @@ msgstr "Пароль збережено."
 #: actions/passwordsettings.php:145 actions/register.php:183
 #: actions/passwordsettings.php:150 actions/register.php:220
 #: actions/passwordsettings.php:156 actions/register.php:227
+#: actions/register.php:233
 msgid "Passwords don't match."
 msgstr "Паролі не співпадають."
 
@@ -2229,19 +2249,19 @@ msgstr "Код відновлення для невідомого користу
 #: 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
+#: lib/logingroupnav.php:85 actions/register.php:114 actions/register.php:502
 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
+#: actions/register.php:129 actions/register.php:135
 msgid "Registration not allowed."
 msgstr "Реєстрацію не дозволено."
 
 #: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67 actions/register.php:106
+#: actions/register.php:67 actions/register.php:106 actions/register.php:112
 msgid "Registration successful"
 msgstr "Реєстрація успішна"
 
@@ -2255,6 +2275,7 @@ msgstr "Забраковано"
 #: 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
+#: actions/login.php:252 actions/register.php:477
 msgid "Remember me"
 msgstr "Пам'ятати мене"
 
@@ -2353,6 +2374,7 @@ msgstr "Такий само, як і пароль вище"
 
 #: ../actions/register.php:156 actions/register.php:170
 #: actions/register.php:377 actions/register.php:423 actions/register.php:427
+#: actions/register.php:433
 msgid "Same as password above. Required."
 msgstr "Такий само, як і пароль вище. Неодмінно."
 
@@ -2518,6 +2540,7 @@ msgstr "Збережений OpenID не знайдено."
 #: actions/remotesubscribe.php:113 actions/showstream.php:376
 #: lib/subscribeform.php:139 actions/showstream.php:345
 #: actions/remotesubscribe.php:137 actions/showstream.php:439
+#: lib/userprofile.php:321
 msgid "Subscribe"
 msgstr "Підписатись"
 
@@ -2564,6 +2587,7 @@ msgstr "Система відповіла помилкою при заванта
 #: actions/profilesettings.php:123 actions/showstream.php:255
 #: lib/subscriptionlist.php:106 lib/subscriptionlist.php:108
 #: actions/profilesettings.php:138 actions/showstream.php:327
+#: lib/userprofile.php:209
 msgid "Tags"
 msgstr "Теги"
 
@@ -2784,6 +2808,7 @@ msgstr "Цей метод потребує або НАПИСАТИ, або ВИ�
 #: actions/apifriendshipsdestroy.php:91 actions/apigroupcreate.php:104
 #: actions/apigroupjoin.php:91 actions/apigroupleave.php:91
 #: actions/apistatusesupdate.php:109
+#: actions/apiaccountupdateprofileimage.php:84
 msgid "This method requires a POST."
 msgstr "Цей метод потребує НАПИСАТИ."
 
@@ -2817,7 +2842,7 @@ msgstr ""
 
 #: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
 #: actions/twitapifriendships.php:132 actions/twitapifriendships.php:139
-#: actions/apifriendshipsexists.php:103
+#: actions/apifriendshipsexists.php:103 actions/apifriendshipsexists.php:94
 msgid "Two user ids or screen_names must be supplied."
 msgstr "Два ID або імені_у_мережі повинні підтримуватись."
 
@@ -2825,7 +2850,7 @@ msgstr "Два ID або імені_у_мережі повинні підтри�
 #: 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
+#: actions/register.php:448 actions/register.php:454
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "URL-адреса вашої веб-сторінки, блогу, або профілю на іншому сайті"
 
@@ -2847,6 +2872,7 @@ msgstr "URL-адреса вашого профілю на іншому сумі�
 #: actions/twittersettings.php:322 lib/designsettings.php:301
 #: actions/emailsettings.php:255 actions/grouplogo.php:319
 #: actions/imsettings.php:220 actions/smssettings.php:248
+#: actions/avatarsettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "Несподіване представлення форми."
 
@@ -2960,7 +2986,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
+#: actions/register.php:436 actions/register.php:438 actions/register.php:442
 msgid "Used only for updates, announcements, and password recovery"
 msgstr "Використовується лише для оновлень, оголошень та відновлення паролю"
 
@@ -2988,7 +3014,8 @@ 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
+#: actions/apiusershow.php:108 actions/apiaccountupdateprofileimage.php:124
+#: actions/apiaccountupdateprofileimage.php:130
 msgid "User has no profile."
 msgstr "Користувач не має профілю."
 
@@ -3017,7 +3044,7 @@ msgstr "Що нового, %s?"
 #: 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
+#: actions/register.php:466 actions/register.php:472
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Де ви живете, на зразок \"Місто, область (регіон), країна\""
 
@@ -3122,7 +3149,7 @@ 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:192
+#: actions/register.php:186 actions/register.php:192 actions/register.php:198
 msgid "You can't register if you don't agree to the license."
 msgstr "Ви не зможете зареєструватись, якщо не погодитесь з умовами ліцензії."
 
@@ -3198,56 +3225,56 @@ msgstr ""
 "сайтах  користуючись єдиним рахунком.  Керувати вашими OpenID можна звідси."
 
 #: ../lib/util.php:943 lib/util.php:992 lib/util.php:945 lib/util.php:756
-#: lib/util.php:770 lib/util.php:816
+#: lib/util.php:770 lib/util.php:816 lib/util.php:844
 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:828
+#: lib/util.php:782 lib/util.php:828 lib/util.php:856
 #, php-format
 msgid "about %d days ago"
 msgstr "близько %d днів тому"
 
 #: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953 lib/util.php:764
-#: lib/util.php:778 lib/util.php:824
+#: lib/util.php:778 lib/util.php:824 lib/util.php:852
 #, php-format
 msgid "about %d hours ago"
 msgstr "близько %d годин тому"
 
 #: ../lib/util.php:947 lib/util.php:996 lib/util.php:949 lib/util.php:760
-#: lib/util.php:774 lib/util.php:820
+#: lib/util.php:774 lib/util.php:820 lib/util.php:848
 #, php-format
 msgid "about %d minutes ago"
 msgstr "близько %d хвилин тому"
 
 #: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961 lib/util.php:772
-#: lib/util.php:786 lib/util.php:832
+#: lib/util.php:786 lib/util.php:832 lib/util.php:860
 #, php-format
 msgid "about %d months ago"
 msgstr "близько %d місяців тому"
 
 #: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955 lib/util.php:766
-#: lib/util.php:780 lib/util.php:826
+#: lib/util.php:780 lib/util.php:826 lib/util.php:854
 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:818
+#: lib/util.php:772 lib/util.php:818 lib/util.php:846
 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:830
+#: lib/util.php:784 lib/util.php:830 lib/util.php:858
 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:834
+#: lib/util.php:788 lib/util.php:834 lib/util.php:862
 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:822
+#: lib/util.php:776 lib/util.php:822 lib/util.php:850
 msgid "about an hour ago"
 msgstr "годину тому"
 
@@ -3316,7 +3343,9 @@ msgstr "« Вперед"
 #: 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
+#: actions/userauthorization.php:52 actions/login.php:131
+#: actions/register.php:165 actions/avatarsettings.php:265
+#: lib/designsettings.php:294
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 "Виникли певні проблеми з токеном поточної сесії. Спробуйте знов, будь ласка."
@@ -3545,6 +3574,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
+#: actions/register.php:230
 msgid "Password must be 6 or more characters."
 msgstr "Пароль має складатись з 6-ти або більше знаків."
 
@@ -4098,13 +4128,13 @@ msgid "There was a problem with your session token. "
 msgstr "Виникли певні проблеми з токеном поточної сесії. "
 
 #: actions/avatarsettings.php:303 actions/grouplogo.php:360
-#: actions/avatarsettings.php:308
+#: actions/avatarsettings.php:308 actions/avatarsettings.php:322
 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
+#: actions/grouplogo.php:377 actions/avatarsettings.php:337
 msgid "Lost our file data."
 msgstr "Дані вашого файлу десь загубились."
 
@@ -4565,7 +4595,7 @@ msgid "%s left group %s"
 msgstr "%s залишив групу %s"
 
 #: actions/login.php:225 lib/facebookaction.php:304 actions/login.php:208
-#: actions/login.php:216
+#: actions/login.php:216 actions/login.php:243
 msgid "Login to site"
 msgstr "Вхід на сайт"
 
@@ -4746,7 +4776,8 @@ 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
+#: actions/register.php:398 actions/register.php:85 actions/register.php:189
+#: actions/register.php:404
 msgid "Sorry, only invited people can register."
 msgstr ""
 "Пробачте, але лише ті, кого було запрошено, мають змогу зареєструватись тут."
@@ -4829,7 +4860,7 @@ msgstr "Профіль групи"
 #: 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
+#: lib/profilelist.php:230 lib/userprofile.php:177
 msgid "URL"
 msgstr "URL"
 
@@ -4840,7 +4871,7 @@ msgstr "URL"
 #: 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
+#: lib/profilelist.php:245 lib/userprofile.php:194
 msgid "Note"
 msgstr "Зауваження"
 
@@ -4889,6 +4920,7 @@ msgid "Only the sender and recipient "
 msgstr "Лише відправник та отримувач "
 
 #: actions/showstream.php:73 actions/showstream.php:78
+#: actions/showstream.php:79
 #, php-format
 msgid "%s, page %d"
 msgstr "%s, сторінка %d"
@@ -4899,28 +4931,29 @@ msgstr " профіль"
 
 #: actions/showstream.php:236 actions/tagother.php:77
 #: actions/showstream.php:220 actions/showstream.php:185
-#: actions/showstream.php:193
+#: actions/showstream.php:193 lib/userprofile.php:75
 msgid "User profile"
 msgstr "Профіль користувача."
 
 #: actions/showstream.php:240 actions/tagother.php:81
 #: actions/showstream.php:224 actions/showstream.php:189
-#: actions/showstream.php:220
+#: actions/showstream.php:220 lib/userprofile.php:102
 msgid "Photo"
 msgstr "Фото"
 
 #: actions/showstream.php:317 actions/showstream.php:309
 #: actions/showstream.php:274 actions/showstream.php:354
+#: lib/userprofile.php:236
 msgid "User actions"
 msgstr "Діяльність користувача"
 
 #: actions/showstream.php:342 actions/showstream.php:307
-#: actions/showstream.php:390
+#: actions/showstream.php:390 lib/userprofile.php:272
 msgid "Send a direct message to this user"
 msgstr "Надіслати пряме повідомлення цьому користувачеві"
 
 #: actions/showstream.php:343 actions/showstream.php:308
-#: actions/showstream.php:391
+#: actions/showstream.php:391 lib/userprofile.php:273
 msgid "Message"
 msgstr "Повідомлення"
 
@@ -5623,7 +5656,7 @@ msgstr "%s з друзями"
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr "Ви можете завантажити вашу персональну аватару."
 
-#: actions/avatarsettings.php:373
+#: actions/avatarsettings.php:373 actions/avatarsettings.php:387
 #, fuzzy
 msgid "Avatar deleted."
 msgstr "Аватару оновлено."
@@ -5762,10 +5795,12 @@ msgid ""
 msgstr ""
 
 #: actions/register.php:432 actions/register.php:479 actions/register.php:489
+#: actions/register.php:495
 msgid "Creative Commons Attribution 3.0"
 msgstr ""
 
 #: actions/register.php:433 actions/register.php:480 actions/register.php:490
+#: actions/register.php:496
 #, fuzzy
 msgid ""
 " except this private data: password, email address, IM address, and phone "
@@ -5802,44 +5837,48 @@ msgid "%s's profile"
 msgstr " профіль"
 
 #: actions/showstream.php:163 actions/showstream.php:128
+#: actions/showstream.php:129
 #, fuzzy, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "Живлення повідомлень для %s"
 
 #: actions/showstream.php:170 actions/showstream.php:135
+#: actions/showstream.php:136
 #, fuzzy, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "Живлення повідомлень для %s"
 
 #: actions/showstream.php:177 actions/showstream.php:142
+#: actions/showstream.php:143
 #, fuzzy, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "Живлення повідомлень для %s"
 
 #: actions/showstream.php:182 actions/showstream.php:147
+#: actions/showstream.php:148
 #, fuzzy, php-format
 msgid "FOAF for %s"
 msgstr "Вихідні для %s"
 
 #: actions/showstream.php:237 actions/showstream.php:202
-#: actions/showstream.php:234
+#: actions/showstream.php:234 lib/userprofile.php:116
 #, fuzzy
 msgid "Edit Avatar"
 msgstr "Аватара"
 
 #: actions/showstream.php:316 actions/showstream.php:281
-#: actions/showstream.php:366
+#: actions/showstream.php:366 lib/userprofile.php:248
 #, fuzzy
 msgid "Edit profile settings"
 msgstr "Налаштування профілю"
 
 #: actions/showstream.php:317 actions/showstream.php:282
-#: actions/showstream.php:367
+#: actions/showstream.php:367 lib/userprofile.php:249
 msgid "Edit"
 msgstr ""
 
 #: actions/showstream.php:542 actions/showstream.php:388
-#: actions/showstream.php:487
+#: actions/showstream.php:487 actions/showstream.php:234
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5884,6 +5923,9 @@ msgstr ""
 #: actions/apistatusesupdate.php:125 actions/apisubscriptions.php:87
 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#: actions/apiaccountupdateprofileimage.php:91
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apistatusesupdate.php:139
 #, fuzzy
 msgid "No such user!"
 msgstr "Немає такого користувача"
@@ -5945,36 +5987,6 @@ msgid ""
 "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 ""
@@ -6143,6 +6155,7 @@ 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
+#: actions/showstream.php:202
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -6324,7 +6337,8 @@ 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
+#: lib/designsettings.php:461 lib/designsettings.php:434
+#: lib/designsettings.php:464
 #, fuzzy
 msgid "Couldn't update your design."
 msgstr "Не вдалося оновити користувача."
@@ -6420,7 +6434,9 @@ msgid "Message sent"
 msgstr "Повідомлення"
 
 #: actions/newnotice.php:93 lib/designsettings.php:281
-#: actions/newnotice.php:94
+#: actions/newnotice.php:94 actions/apiaccountupdateprofileimage.php:97
+#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254
+#: lib/designsettings.php:283
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s bytes) due to its "
@@ -6591,7 +6607,7 @@ msgstr "Вас ідентифіковано. Введіть  новий паро
 msgid "Password recover"
 msgstr "Запит на відновлення паролю відправлено."
 
-#: actions/register.php:86
+#: actions/register.php:86 actions/register.php:92
 #, fuzzy
 msgid "Sorry, invalid invitation code."
 msgstr "Помилка з кодом підтвердження."
@@ -6693,28 +6709,31 @@ msgstr "Адмін"
 msgid "Not a local notice"
 msgstr "Такого користувача немає."
 
-#: actions/showstream.php:72
+#: actions/showstream.php:72 actions/showstream.php:73
 #, fuzzy, php-format
 msgid " tagged %s"
 msgstr "Повідомлення позначені з %s"
 
-#: actions/showstream.php:121
+#: actions/showstream.php:121 actions/showstream.php:122
 #, fuzzy, php-format
 msgid "Notice feed for %s tagged %s (RSS 1.0)"
 msgstr "Живлення повідомлень для групи %s"
 
 #: actions/showstream.php:350 actions/showstream.php:444
+#: actions/showstream.php:191
 #, 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
+#: actions/showstream.php:196
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
 msgstr ""
 
 #: actions/showstream.php:357 actions/showstream.php:451
+#: actions/showstream.php:198
 #, php-format
 msgid ""
 "You can try to nudge %s or [post something to his or her attention](%%%%"
@@ -6722,6 +6741,7 @@ msgid ""
 msgstr ""
 
 #: actions/showstream.php:393 actions/showstream.php:492
+#: actions/showstream.php:239
 #, fuzzy, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -6874,6 +6894,7 @@ msgid "Problem saving notice. Too long."
 msgstr "Проблема при збереженні повідомлення."
 
 #: classes/User.php:319 classes/User.php:327 classes/User.php:334
+#: classes/User.php:333
 #, fuzzy, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "Повідомлення до %1$s на %2$s"
@@ -6984,10 +7005,12 @@ msgid "Save design"
 msgstr ""
 
 #: lib/designsettings.php:378 lib/designsettings.php:369
+#: lib/designsettings.php:372
 msgid "Bad default color settings: "
 msgstr ""
 
 #: lib/designsettings.php:474 lib/designsettings.php:465
+#: lib/designsettings.php:468
 msgid "Design defaults restored."
 msgstr ""
 
@@ -7194,16 +7217,18 @@ msgid "Status deleted."
 msgstr "Аватару оновлено."
 
 #: actions/apistatusesupdate.php:132
+#: actions/apiaccountupdateprofileimage.php:99
 msgid "Unable to handle that much POST data!"
 msgstr ""
 
 #: actions/apistatusesupdate.php:145 actions/newnotice.php:155
-#: scripts/maildaemon.php:71
+#: scripts/maildaemon.php:71 actions/apistatusesupdate.php:152
 #, fuzzy, php-format
 msgid "That's too long. Max notice size is %d chars."
 msgstr "Надто довго. Максимальний розмір повідомлення 140 знаків."
 
 #: actions/apistatusesupdate.php:209 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:216
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
@@ -7268,7 +7293,7 @@ msgstr "Оновлення від %1$s на %2$s!"
 msgid "IM is not available."
 msgstr "Ця сторінка не доступна в "
 
-#: actions/login.php:259
+#: actions/login.php:259 actions/login.php:286
 #, fuzzy, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -7303,21 +7328,24 @@ msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
 msgstr ""
 
 #: actions/profilesettings.php:122 actions/register.php:454
+#: actions/register.php:460
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d chars"
 msgstr "Опишіть себе та свої інтереси (140 знаків)"
 
 #: actions/profilesettings.php:125 actions/register.php:457
+#: actions/register.php:463
 #, fuzzy
 msgid "Describe yourself and your interests"
 msgstr "Опишіть себе та свої "
 
 #: actions/profilesettings.php:221 actions/register.php:217
+#: actions/register.php:223
 #, fuzzy, php-format
 msgid "Bio is too long (max %d chars)."
 msgstr "Ви перевищили ліміт (140 знаків це максимум)"
 
-#: actions/register.php:336
+#: actions/register.php:336 actions/register.php:342
 msgid ""
 "With this form you can create  a new account. You can then post notices and "
 "link up to friends and colleagues. "
@@ -7350,7 +7378,7 @@ msgid "Replies feed for %s (RSS 2.0)"
 msgstr "Живлення повідомлень для %s"
 
 #: actions/replies.php:158
-#, fuzzy, php-format
+#, php-format
 msgid "Replies feed for %s (Atom)"
 msgstr "Живлення повідомлень для %s"
 
@@ -7360,17 +7388,17 @@ msgid "Replies to %1$s on %2$s!"
 msgstr "Повідомлення до %1$s на %2$s"
 
 #: actions/showfavorites.php:170
-#, fuzzy, php-format
+#, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
 msgstr "Живлення для друзів %s"
 
 #: actions/showfavorites.php:177
-#, fuzzy, php-format
+#, php-format
 msgid "Feed for favorites of %s (RSS 2.0)"
 msgstr "Живлення для друзів %s"
 
 #: actions/showfavorites.php:184
-#, fuzzy, php-format
+#, php-format
 msgid "Feed for favorites of %s (Atom)"
 msgstr "Живлення для друзів %s"
 
@@ -7383,7 +7411,7 @@ msgid ""
 msgstr ""
 
 #: actions/showgroup.php:345
-#, fuzzy, php-format
+#, php-format
 msgid "FOAF for %s group"
 msgstr "Вихідні для %s"
 
@@ -7523,41 +7551,6 @@ 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 "No configuration file found. "
@@ -7592,7 +7585,7 @@ msgid "Describe the group or topic in %d characters"
 msgstr "Опишіть групу або тему, вкладаючись у 140 знаків"
 
 #: lib/jabber.php:192
-#, fuzzy, php-format
+#, php-format
 msgid "notice id: %s"
 msgstr "Нове повідомлення"
 
@@ -7652,7 +7645,6 @@ 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 "Не вдається відновити загальний потік."
 
@@ -7660,3 +7652,59 @@ msgstr "Не вдається відновити загальний потік."
 #, fuzzy
 msgid "Duplicate notice"
 msgstr "Видалити повідомлення"
+
+#: actions/login.php:110 actions/login.php:120
+#, fuzzy
+msgid "Invalid or expired token."
+msgstr "Недійсний зміст повідомлення"
+
+#: lib/command.php:597
+#, fuzzy, php-format
+msgid "Could not create login token for %s"
+msgstr "Не вдалося створити форму OpenID: %s"
+
+#: lib/command.php:602
+#, php-format
+msgid "This link is useable only once, and is good for only 2 minutes: %s"
+msgstr ""
+
+#: lib/imagefile.php:75
+#, fuzzy, php-format
+msgid "That file is too big. The maximum file size is %s."
+msgstr "Ви маєте можливість завантажити логотип для вашої группи."
+
+#: lib/command.php:613
+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"
+"login - Get a link to login to the web interface\n"
+"drop <group> - leave group\n"
+"stats - get your stats\n"
+"stop - same as 'off'\n"
+"quit - same as 'off'\n"
+"sub <nickname> - same as 'follow'\n"
+"unsub <nickname> - same as 'leave'\n"
+"last <nickname> - same as 'get'\n"
+"on <nickname> - not yet implemented.\n"
+"off <nickname> - not yet implemented.\n"
+"nudge <nickname> - remind a user to update.\n"
+"invite <phone number> - not yet implemented.\n"
+"track <word> - not yet implemented.\n"
+"untrack <word> - not yet implemented.\n"
+"track off - not yet implemented.\n"
+"untrack all - not yet implemented.\n"
+"tracks - not yet implemented.\n"
+"tracking - not yet implemented.\n"
+msgstr ""
diff --git a/locale/vi/LC_MESSAGES/statusnet.mo b/locale/vi/LC_MESSAGES/statusnet.mo
index afc0fe785..e96b142b4 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 69fb732e4..b017c6ef4 100644
--- a/locale/vi/LC_MESSAGES/statusnet.po
+++ b/locale/vi/LC_MESSAGES/statusnet.po
@@ -5,12 +5,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-06 13:16+0000\n"
-"PO-Revision-Date: 2009-11-06 15:44:47+0000\n"
+"POT-Creation-Date: 2009-11-08 11:53+0000\n"
+"PO-Revision-Date: 2009-11-08 11:57:24+0000\n"
 "Language-Team: Vietnamese\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r58648); Translate extension (2009-08-03)\n"
+"X-Generator: MediaWiki 1.16alpha(r58760); 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"
@@ -199,7 +199,7 @@ 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:497
-#: actions/register.php:545 actions/register.php:555
+#: actions/register.php:545 actions/register.php:555 actions/register.php:561
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -237,6 +237,7 @@ msgstr "1-64 chữ cái thường hoặc là chữ số, không có dấu chấm
 
 #: ../actions/register.php:152 actions/register.php:166
 #: actions/register.php:368 actions/register.php:414 actions/register.php:418
+#: actions/register.php:424
 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 "
@@ -255,6 +256,7 @@ 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:419 actions/register.php:423
+#: actions/register.php:429
 msgid "6 or more characters. Required."
 msgstr "Nhiều hơn 6 ký tự. Bắt buộc"
 
@@ -435,7 +437,7 @@ msgstr "Các thay đổi phù hợp với từ \"%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
+#: actions/login.php:79 actions/register.php:137
 msgid "Already logged in."
 msgstr "Đã đăng nhập."
 
@@ -458,7 +460,7 @@ msgstr "Đăng nhận cho phép"
 #: ../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
+#: actions/register.php:473 actions/login.php:253 actions/register.php:479
 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!"
 
@@ -480,6 +482,7 @@ msgstr "Hình đại diện"
 
 #: ../actions/avatar.php:113 actions/profilesettings.php:350
 #: actions/avatarsettings.php:395 actions/avatarsettings.php:346
+#: actions/avatarsettings.php:360
 msgid "Avatar updated."
 msgstr "Hình đại diện đã được cập nhật."
 
@@ -517,7 +520,7 @@ msgstr "Trước"
 #: 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
+#: actions/register.php:459 actions/register.php:465
 msgid "Bio"
 msgstr "Lý lịch"
 
@@ -546,6 +549,7 @@ msgstr "Không thể đọc URL cho hình đại diện '%s'"
 #: actions/passwordsettings.php:169 actions/recoverpassword.php:347
 #: actions/passwordsettings.php:174 actions/recoverpassword.php:365
 #: actions/passwordsettings.php:180 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:185
 msgid "Can't save new password."
 msgstr "Không thể lưu mật khẩu mới"
 
@@ -609,6 +613,7 @@ msgstr "Thay đổi các thiết lập trong hồ sơ cá nhân của bạn"
 #: actions/recoverpassword.php:236 actions/register.php:422
 #: actions/passwordsettings.php:111 actions/recoverpassword.php:239
 #: actions/register.php:426 actions/smssettings.php:134
+#: actions/register.php:432
 msgid "Confirm"
 msgstr "Xác nhận"
 
@@ -639,7 +644,7 @@ msgid "Confirmation code not found."
 msgstr "Không tìm thấy mã xác nhận."
 
 #: ../actions/register.php:202 actions/register.php:473
-#: actions/register.php:521 actions/register.php:531
+#: actions/register.php:521 actions/register.php:531 actions/register.php:537
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -880,6 +885,7 @@ 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
+#: classes/Notice.php:1120
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Lỗi cơ sở dữ liệu khi chèn trả lời: %s"
@@ -902,7 +908,8 @@ msgstr "Nói về bạn và những sở thích của bạn khoảng 140 ký t�
 #: 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
+#: lib/accountsettingsaction.php:117 actions/register.php:437
+#: actions/register.php:441
 msgid "Email"
 msgstr "Email"
 
@@ -918,7 +925,7 @@ 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
+#: actions/register.php:200 actions/register.php:206 actions/register.php:212
 msgid "Email address already exists."
 msgstr "Địa chỉ email đã tồn tại."
 
@@ -1005,7 +1012,7 @@ 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:169
-#: actions/passwordsettings.php:175
+#: actions/passwordsettings.php:175 actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "Lỗi xảy ra khi lưu thành viên;  không hợp lệ."
 
@@ -1017,6 +1024,7 @@ msgstr "Lỗi xảy ra khi lưu thành viên;  không hợp lệ."
 #: actions/login.php:120 actions/recoverpassword.php:372
 #: actions/register.php:235 actions/login.php:122
 #: actions/recoverpassword.php:375 actions/register.php:242
+#: actions/login.php:149 actions/register.php:248
 msgid "Error setting user."
 msgstr "Lỗi xảy ra khi tạo thành viên."
 
@@ -1048,6 +1056,7 @@ msgstr "FAQ"
 
 #: ../actions/avatar.php:115 actions/profilesettings.php:352
 #: actions/avatarsettings.php:397 actions/avatarsettings.php:349
+#: actions/avatarsettings.php:363
 msgid "Failed updating avatar."
 msgstr "Cập nhật hình đại diện không thành công."
 
@@ -1082,6 +1091,7 @@ 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:247 actions/login.php:255
+#: actions/login.php:282
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -1099,6 +1109,7 @@ msgstr ""
 #: actions/showstream.php:220 lib/groupeditform.php:157
 #: actions/profilesettings.php:111 actions/register.php:441
 #: actions/showgroup.php:247 actions/showstream.php:267
+#: actions/register.php:447 lib/userprofile.php:149
 msgid "Full name"
 msgstr "Tên đầy đủ"
 
@@ -1112,7 +1123,7 @@ msgstr "Tên đầy đủ"
 #: 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
+#: actions/register.php:214 actions/register.php:220
 msgid "Full name is too long (max 255 chars)."
 msgstr "Tên đầy đủ quá dài (tối đa là 255 ký tự)."
 
@@ -1133,7 +1144,7 @@ msgstr "Trang chủ"
 #: 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
+#: actions/register.php:446 actions/register.php:452
 msgid "Homepage"
 msgstr "Trang chủ hoặc Blog"
 
@@ -1145,7 +1156,7 @@ msgstr "Trang chủ hoặc Blog"
 #: 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
+#: actions/register.php:211 actions/register.php:217
 msgid "Homepage is not a valid URL."
 msgstr "Trang chủ không phải là URL"
 
@@ -1218,7 +1229,7 @@ msgstr "Mật khẩu cũ sai"
 
 #: ../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
+#: actions/facebookhome.php:129 actions/login.php:116 actions/login.php:143
 msgid "Incorrect username or password."
 msgstr "Sai tên đăng nhập hoặc mật khẩu."
 
@@ -1298,6 +1309,7 @@ msgstr "Kích thước không hợp lệ."
 #: 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
+#: actions/register.php:243 actions/register.php:264
 msgid "Invalid username or password."
 msgstr "Tên đăng nhập hoặc mật khẩu không hợp lệ."
 
@@ -1375,7 +1387,7 @@ msgstr "Ngôn ngữ quá dài (tối đa là 50 ký tự)."
 #: 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
+#: lib/profilelist.php:218 actions/register.php:470 lib/userprofile.php:164
 msgid "Location"
 msgstr "Thành phố"
 
@@ -1389,7 +1401,7 @@ msgstr "Thành phố"
 #: 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
+#: actions/register.php:221 actions/register.php:227
 msgid "Location is too long (max 255 chars)."
 msgstr "Tên khu vực quá dài (không quá 255 ký tự)."
 
@@ -1403,6 +1415,7 @@ msgstr "Tên khu vực quá dài (không quá 255 ký tự)."
 #: 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
+#: actions/login.php:204 actions/login.php:257
 #, php-format
 msgid "Login"
 msgstr "Đăng nhập"
@@ -1431,12 +1444,13 @@ msgstr "Thoát"
 
 #: ../actions/register.php:166 actions/register.php:180
 #: actions/register.php:393 actions/register.php:439 actions/register.php:443
+#: actions/register.php:449
 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 actions/login.php:228 lib/facebookaction.php:325
-#: lib/facebookaction.php:327 actions/login.php:236
+#: lib/facebookaction.php:327 actions/login.php:236 actions/login.php:263
 msgid "Lost or forgotten password?"
 msgstr "Mất hoặc quên mật khẩu?"
 
@@ -1479,7 +1493,7 @@ 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:487
+#: actions/register.php:477 actions/register.php:487 actions/register.php:493
 msgid "My text and files are available under "
 msgstr "Ghi chú và các file của tôi đã có ở phía dưới"
 
@@ -1538,7 +1552,8 @@ msgstr "Mật khẩu mới đã được lưu. Bạn có thể đăng nhập nga
 #: 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
+#: actions/showgroup.php:236 actions/showstream.php:249 actions/login.php:246
+#: actions/register.php:423 lib/userprofile.php:131
 msgid "Nickname"
 msgstr "Biệt danh"
 
@@ -1552,7 +1567,7 @@ msgstr "Biệt danh"
 #: 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
+#: actions/register.php:202 actions/register.php:208
 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."
 
@@ -1568,7 +1583,7 @@ msgstr "Biệt hiệu này đã dùng rồi. Hãy nhập biệt hiệu khác."
 #: 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
+#: actions/register.php:199 actions/register.php:205
 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."
 
@@ -1810,7 +1825,8 @@ msgstr "Không có người dùng nào đăng ký"
 #: 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
+#: lib/api.php:954 lib/api.php:982 lib/api.php:1092 lib/api.php:963
+#: lib/api.php:991 lib/api.php:1101
 msgid "Not a supported data format."
 msgstr "Không hỗ trợ định dạng dữ liệu này."
 
@@ -1832,7 +1848,7 @@ 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
+#: actions/register.php:189 actions/register.php:195 actions/register.php:201
 msgid "Not a valid email address."
 msgstr "Địa chỉ email không hợp lệ."
 
@@ -1844,7 +1860,7 @@ msgstr "Địa chỉ email không hợp lệ."
 #: 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
+#: actions/register.php:204 actions/register.php:210
 msgid "Not a valid nickname."
 msgstr "Biệt hiệu không hợp lệ."
 
@@ -1883,6 +1899,7 @@ 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:327
 #: actions/twitapistatuses.php:284 actions/apistatusesupdate.php:186
+#: actions/apistatusesupdate.php:193
 msgid "Not found"
 msgstr "Không tìm thấy"
 
@@ -2029,7 +2046,8 @@ msgstr "Upload từng phần."
 #: 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
+#: lib/accountsettingsaction.php:114 actions/login.php:249
+#: actions/register.php:428
 msgid "Password"
 msgstr "Mật khẩu"
 
@@ -2058,6 +2076,7 @@ msgstr "Yêu cầu khôi phục lại mật khẩu đã được gửi"
 #: actions/passwordsettings.php:173 actions/recoverpassword.php:200
 #: actions/passwordsettings.php:178 actions/recoverpassword.php:208
 #: actions/passwordsettings.php:184 actions/recoverpassword.php:211
+#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "Đã lưu mật khẩu."
 
@@ -2066,6 +2085,7 @@ msgstr "Đã lưu mật khẩu."
 #: actions/passwordsettings.php:145 actions/register.php:183
 #: actions/passwordsettings.php:150 actions/register.php:220
 #: actions/passwordsettings.php:156 actions/register.php:227
+#: actions/register.php:233
 msgid "Passwords don't match."
 msgstr "Mật khẩu không khớp."
 
@@ -2230,20 +2250,20 @@ msgstr "Khôi phục lại code cho user không đăng ký."
 #: 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
+#: lib/logingroupnav.php:85 actions/register.php:114 actions/register.php:502
 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
+#: actions/register.php:129 actions/register.php:135
 #, 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:106
+#: actions/register.php:67 actions/register.php:106 actions/register.php:112
 msgid "Registration successful"
 msgstr "Đăng ký thành công"
 
@@ -2257,6 +2277,7 @@ msgstr "Từ chối"
 #: 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
+#: actions/login.php:252 actions/register.php:477
 msgid "Remember me"
 msgstr "Nhớ tôi"
 
@@ -2355,6 +2376,7 @@ msgstr "Cùng mật khẩu ở trên"
 
 #: ../actions/register.php:156 actions/register.php:170
 #: actions/register.php:377 actions/register.php:423 actions/register.php:427
+#: actions/register.php:433
 msgid "Same as password above. Required."
 msgstr "Cùng mật khẩu ở trên. Bắt buộc."
 
@@ -2518,6 +2540,7 @@ msgstr "Không tìm thấy OpenID."
 #: actions/remotesubscribe.php:113 actions/showstream.php:376
 #: lib/subscribeform.php:139 actions/showstream.php:345
 #: actions/remotesubscribe.php:137 actions/showstream.php:439
+#: lib/userprofile.php:321
 msgid "Subscribe"
 msgstr "Theo bạn này"
 
@@ -2564,6 +2587,7 @@ msgstr "Hệ thống xảy ra lỗi trong khi tải file."
 #: actions/profilesettings.php:123 actions/showstream.php:255
 #: lib/subscriptionlist.php:106 lib/subscriptionlist.php:108
 #: actions/profilesettings.php:138 actions/showstream.php:327
+#: lib/userprofile.php:209
 msgid "Tags"
 msgstr "Từ khóa"
 
@@ -2790,6 +2814,7 @@ msgstr "Phương thức này yêu cầu là POST hoặc DELETE"
 #: actions/apifriendshipsdestroy.php:91 actions/apigroupcreate.php:104
 #: actions/apigroupjoin.php:91 actions/apigroupleave.php:91
 #: actions/apistatusesupdate.php:109
+#: actions/apiaccountupdateprofileimage.php:84
 msgid "This method requires a POST."
 msgstr "Phương thức này yêu cầu là POST."
 
@@ -2824,7 +2849,7 @@ msgstr ""
 
 #: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
 #: actions/twitapifriendships.php:132 actions/twitapifriendships.php:139
-#: actions/apifriendshipsexists.php:103
+#: actions/apifriendshipsexists.php:103 actions/apifriendshipsexists.php:94
 msgid "Two user ids or screen_names must be supplied."
 msgstr ""
 
@@ -2832,7 +2857,7 @@ msgstr ""
 #: 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
+#: actions/register.php:448 actions/register.php:454
 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 "
 
@@ -2854,6 +2879,7 @@ msgstr "URL trong hồ sơ cá nhân của bạn ở trên các trang microblogg
 #: actions/twittersettings.php:322 lib/designsettings.php:301
 #: actions/emailsettings.php:255 actions/grouplogo.php:319
 #: actions/imsettings.php:220 actions/smssettings.php:248
+#: actions/avatarsettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "Bất ngờ gửi mẫu thông tin. "
 
@@ -2965,7 +2991,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
+#: actions/register.php:436 actions/register.php:438 actions/register.php:442
 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"
 
@@ -2993,7 +3019,8 @@ msgstr "Người dùng đang lắng nghe để không thoát khỏi."
 #: 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
+#: actions/apiusershow.php:108 actions/apiaccountupdateprofileimage.php:124
+#: actions/apiaccountupdateprofileimage.php:130
 msgid "User has no profile."
 msgstr "Người dùng không có thông tin."
 
@@ -3022,7 +3049,7 @@ msgstr "Bạn đang làm gì thế, %s?"
 #: 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
+#: actions/register.php:466 actions/register.php:472
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Bạn ở đâu, \"Thành phố, Tỉnh thành, Quốc gia\""
 
@@ -3125,7 +3152,7 @@ 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/register.php:149
-#: actions/register.php:186 actions/register.php:192
+#: actions/register.php:186 actions/register.php:192 actions/register.php:198
 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."
 
@@ -3200,56 +3227,56 @@ msgstr ""
 "lý các OpenID của bạn ở đây."
 
 #: ../lib/util.php:943 lib/util.php:992 lib/util.php:945 lib/util.php:756
-#: lib/util.php:770 lib/util.php:816
+#: lib/util.php:770 lib/util.php:816 lib/util.php:844
 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:768
-#: lib/util.php:782 lib/util.php:828
+#: lib/util.php:782 lib/util.php:828 lib/util.php:856
 #, 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:764
-#: lib/util.php:778 lib/util.php:824
+#: lib/util.php:778 lib/util.php:824 lib/util.php:852
 #, 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:760
-#: lib/util.php:774 lib/util.php:820
+#: lib/util.php:774 lib/util.php:820 lib/util.php:848
 #, 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:772
-#: lib/util.php:786 lib/util.php:832
+#: lib/util.php:786 lib/util.php:832 lib/util.php:860
 #, 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:766
-#: lib/util.php:780 lib/util.php:826
+#: lib/util.php:780 lib/util.php:826 lib/util.php:854
 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:758
-#: lib/util.php:772 lib/util.php:818
+#: lib/util.php:772 lib/util.php:818 lib/util.php:846
 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:770
-#: lib/util.php:784 lib/util.php:830
+#: lib/util.php:784 lib/util.php:830 lib/util.php:858
 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:774
-#: lib/util.php:788 lib/util.php:834
+#: lib/util.php:788 lib/util.php:834 lib/util.php:862
 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:762
-#: lib/util.php:776 lib/util.php:822
+#: lib/util.php:776 lib/util.php:822 lib/util.php:850
 msgid "about an hour ago"
 msgstr "1 giờ trước"
 
@@ -3320,7 +3347,9 @@ msgstr "Sau"
 #: 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
+#: actions/userauthorization.php:52 actions/login.php:131
+#: actions/register.php:165 actions/avatarsettings.php:265
+#: lib/designsettings.php:294
 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."
 
@@ -3579,6 +3608,7 @@ msgstr "Mật khẩu mới đã được lưu. Bạn có thể đăng nhập nga
 #: actions/register.php:95 actions/register.php:180
 #: actions/passwordsettings.php:147 actions/register.php:217
 #: actions/passwordsettings.php:153 actions/register.php:224
+#: actions/register.php:230
 #, fuzzy
 msgid "Password must be 6 or more characters."
 msgstr "Mật khẩu phải nhiều hơn 6 ký tự."
@@ -4154,13 +4184,13 @@ 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
+#: actions/avatarsettings.php:308 actions/avatarsettings.php:322
 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
+#: actions/grouplogo.php:377 actions/avatarsettings.php:337
 msgid "Lost our file data."
 msgstr ""
 
@@ -4669,7 +4699,7 @@ msgid "%s left group %s"
 msgstr "%s và nhóm"
 
 #: actions/login.php:225 lib/facebookaction.php:304 actions/login.php:208
-#: actions/login.php:216
+#: actions/login.php:216 actions/login.php:243
 msgid "Login to site"
 msgstr ""
 
@@ -4865,7 +4895,8 @@ 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
+#: actions/register.php:398 actions/register.php:85 actions/register.php:189
+#: actions/register.php:404
 msgid "Sorry, only invited people can register."
 msgstr ""
 
@@ -4958,7 +4989,7 @@ msgstr "Thông tin nhóm"
 #: 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
+#: lib/profilelist.php:230 lib/userprofile.php:177
 msgid "URL"
 msgstr ""
 
@@ -4969,7 +5000,7 @@ msgstr ""
 #: 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
+#: lib/profilelist.php:245 lib/userprofile.php:194
 #, fuzzy
 msgid "Note"
 msgstr "Tin nhắn"
@@ -5020,6 +5051,7 @@ 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:78
+#: actions/showstream.php:79
 #, fuzzy, php-format
 msgid "%s, page %d"
 msgstr "Hộp thư đến của %s - trang %d"
@@ -5031,31 +5063,32 @@ msgstr "Hồ sơ"
 
 #: actions/showstream.php:236 actions/tagother.php:77
 #: actions/showstream.php:220 actions/showstream.php:185
-#: actions/showstream.php:193
+#: actions/showstream.php:193 lib/userprofile.php:75
 #, 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
+#: actions/showstream.php:220 lib/userprofile.php:102
 msgid "Photo"
 msgstr ""
 
 #: actions/showstream.php:317 actions/showstream.php:309
 #: actions/showstream.php:274 actions/showstream.php:354
+#: lib/userprofile.php:236
 #, fuzzy
 msgid "User actions"
 msgstr "Không tìm thấy action"
 
 #: actions/showstream.php:342 actions/showstream.php:307
-#: actions/showstream.php:390
+#: actions/showstream.php:390 lib/userprofile.php:272
 #, 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:308
-#: actions/showstream.php:391
+#: actions/showstream.php:391 lib/userprofile.php:273
 #, fuzzy
 msgid "Message"
 msgstr "Tin mới nhất"
@@ -5828,7 +5861,7 @@ 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
+#: actions/avatarsettings.php:373 actions/avatarsettings.php:387
 #, fuzzy
 msgid "Avatar deleted."
 msgstr "Hình đại diện đã được cập nhật."
@@ -5962,10 +5995,12 @@ msgid ""
 msgstr ""
 
 #: actions/register.php:432 actions/register.php:479 actions/register.php:489
+#: actions/register.php:495
 msgid "Creative Commons Attribution 3.0"
 msgstr ""
 
 #: actions/register.php:433 actions/register.php:480 actions/register.php:490
+#: actions/register.php:496
 #, fuzzy
 msgid ""
 " except this private data: password, email address, IM address, and phone "
@@ -6000,44 +6035,48 @@ msgid "%s's profile"
 msgstr "Hồ sơ"
 
 #: actions/showstream.php:163 actions/showstream.php:128
+#: actions/showstream.php:129
 #, 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
+#: actions/showstream.php:136
 #, 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
+#: actions/showstream.php:143
 #, 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
+#: actions/showstream.php:148
 #, 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
+#: actions/showstream.php:234 lib/userprofile.php:116
 #, fuzzy
 msgid "Edit Avatar"
 msgstr "Hình đại diện"
 
 #: actions/showstream.php:316 actions/showstream.php:281
-#: actions/showstream.php:366
+#: actions/showstream.php:366 lib/userprofile.php:248
 #, 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
+#: actions/showstream.php:367 lib/userprofile.php:249
 msgid "Edit"
 msgstr ""
 
 #: actions/showstream.php:542 actions/showstream.php:388
-#: actions/showstream.php:487
+#: actions/showstream.php:487 actions/showstream.php:234
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -6095,6 +6134,9 @@ msgstr ""
 #: actions/apistatusesupdate.php:125 actions/apisubscriptions.php:87
 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#: actions/apiaccountupdateprofileimage.php:91
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apistatusesupdate.php:139
 #, fuzzy
 msgid "No such user!"
 msgstr "Không có user nào."
@@ -6151,36 +6193,6 @@ msgid ""
 "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 ""
@@ -6380,6 +6392,7 @@ 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
+#: actions/showstream.php:202
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -6559,7 +6572,8 @@ 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
+#: lib/designsettings.php:461 lib/designsettings.php:434
+#: lib/designsettings.php:464
 #, fuzzy
 msgid "Couldn't update your design."
 msgstr "Không thể cập nhật thành viên."
@@ -6655,7 +6669,9 @@ msgid "Message sent"
 msgstr "Tin mới nhất"
 
 #: actions/newnotice.php:93 lib/designsettings.php:281
-#: actions/newnotice.php:94
+#: actions/newnotice.php:94 actions/apiaccountupdateprofileimage.php:97
+#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254
+#: lib/designsettings.php:283
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s bytes) due to its "
@@ -6823,7 +6839,7 @@ msgstr "Bạn đã được xác định. Hãy nhập mật khẩu mới ở dư
 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
+#: actions/register.php:86 actions/register.php:92
 #, fuzzy
 msgid "Sorry, invalid invitation code."
 msgstr "Lỗi xảy ra với mã xác nhận."
@@ -6922,28 +6938,31 @@ msgstr ""
 msgid "Not a local notice"
 msgstr "Không có user nào."
 
-#: actions/showstream.php:72
+#: actions/showstream.php:72 actions/showstream.php:73
 #, fuzzy, php-format
 msgid " tagged %s"
 msgstr "Thông báo được gắn thẻ %s"
 
-#: actions/showstream.php:121
+#: actions/showstream.php:121 actions/showstream.php:122
 #, 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
+#: actions/showstream.php:191
 #, 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
+#: actions/showstream.php:196
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
 msgstr ""
 
 #: actions/showstream.php:357 actions/showstream.php:451
+#: actions/showstream.php:198
 #, php-format
 msgid ""
 "You can try to nudge %s or [post something to his or her attention](%%%%"
@@ -6951,6 +6970,7 @@ msgid ""
 msgstr ""
 
 #: actions/showstream.php:393 actions/showstream.php:492
+#: actions/showstream.php:239
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -7099,6 +7119,7 @@ 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
+#: classes/User.php:333
 #, fuzzy, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "%s chào mừng bạn "
@@ -7213,10 +7234,12 @@ msgid "Save design"
 msgstr "Lưu"
 
 #: lib/designsettings.php:378 lib/designsettings.php:369
+#: lib/designsettings.php:372
 msgid "Bad default color settings: "
 msgstr ""
 
 #: lib/designsettings.php:474 lib/designsettings.php:465
+#: lib/designsettings.php:468
 msgid "Design defaults restored."
 msgstr ""
 
@@ -7420,7 +7443,7 @@ msgid "%s's groups"
 msgstr "%s và nhóm"
 
 #: actions/apigrouplist.php:103
-#, fuzzy, php-format
+#, 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"
 
@@ -7435,16 +7458,18 @@ msgid "Status deleted."
 msgstr "Hình đại diện đã được cập nhật."
 
 #: actions/apistatusesupdate.php:132
+#: actions/apiaccountupdateprofileimage.php:99
 msgid "Unable to handle that much POST data!"
 msgstr ""
 
 #: actions/apistatusesupdate.php:145 actions/newnotice.php:155
-#: scripts/maildaemon.php:71
+#: scripts/maildaemon.php:71 actions/apistatusesupdate.php:152
 #, 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ự."
 
 #: actions/apistatusesupdate.php:209 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:216
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
@@ -7464,7 +7489,7 @@ msgid "description is too long (max %d chars)."
 msgstr "Lý lịch quá dài (không quá 140 ký tự)"
 
 #: actions/favoritesrss.php:115
-#, fuzzy, php-format
+#, php-format
 msgid "Updates favored by %1$s on %2$s!"
 msgstr "Dòng tin nhắn cho %s"
 
@@ -7508,8 +7533,8 @@ msgstr "Dòng tin nhắn cho %s"
 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."
 
-#: actions/login.php:259
-#, fuzzy, php-format
+#: actions/login.php:259 actions/login.php:286
+#, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
 "(%%action.register%%) a new account."
@@ -7543,21 +7568,24 @@ msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
 msgstr ""
 
 #: actions/profilesettings.php:122 actions/register.php:454
+#: actions/register.php:460
 #, 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ự"
 
 #: actions/profilesettings.php:125 actions/register.php:457
+#: actions/register.php:463
 #, 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ự"
 
 #: actions/profilesettings.php:221 actions/register.php:217
+#: actions/register.php:223
 #, fuzzy, php-format
 msgid "Bio is too long (max %d chars)."
 msgstr "Lý lịch quá dài (không quá 140 ký tự)"
 
-#: actions/register.php:336
+#: actions/register.php:336 actions/register.php:342
 msgid ""
 "With this form you can create  a new account. You can then post notices and "
 "link up to friends and colleagues. "
@@ -7594,22 +7622,22 @@ msgid "Replies feed for %s (Atom)"
 msgstr "Dòng tin nhắn cho %s"
 
 #: actions/repliesrss.php:72
-#, fuzzy, php-format
+#, 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
+#, 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
+#, 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
+#, php-format
 msgid "Feed for favorites of %s (Atom)"
 msgstr "Chọn những người bạn của %s"
 
@@ -7622,7 +7650,7 @@ msgid ""
 msgstr ""
 
 #: actions/showgroup.php:345
-#, fuzzy, php-format
+#, php-format
 msgid "FOAF for %s group"
 msgstr "Hộp thư đi của %s"
 
@@ -7761,41 +7789,6 @@ msgstr "Trả lời tin nhắn này"
 msgid "Error saving notice."
 msgstr "Có lỗi xảy ra khi lưu tin nhắn."
 
-#: 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. "
@@ -7829,7 +7822,7 @@ 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ự"
 
 #: lib/jabber.php:192
-#, fuzzy, php-format
+#, php-format
 msgid "notice id: %s"
 msgstr "Thông báo mới"
 
@@ -7902,7 +7895,6 @@ 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 "Không thể lấy lại các tin nhắn ưa thích"
 
@@ -7910,3 +7902,61 @@ msgstr "Không thể lấy lại các tin nhắn ưa thích"
 #, fuzzy
 msgid "Duplicate notice"
 msgstr "Xóa tin nhắn"
+
+#: actions/login.php:110 actions/login.php:120
+#, fuzzy
+msgid "Invalid or expired token."
+msgstr "Nội dung tin nhắn không hợp lệ"
+
+#: lib/command.php:597
+#, fuzzy, php-format
+msgid "Could not create login token for %s"
+msgstr "Không thể tạo OpenID mẫu: %s"
+
+#: lib/command.php:602
+#, php-format
+msgid "This link is useable only once, and is good for only 2 minutes: %s"
+msgstr ""
+
+#: lib/imagefile.php:75
+#, fuzzy, php-format
+msgid "That file is too big. 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."
+
+#: lib/command.php:613
+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"
+"login - Get a link to login to the web interface\n"
+"drop <group> - leave group\n"
+"stats - get your stats\n"
+"stop - same as 'off'\n"
+"quit - same as 'off'\n"
+"sub <nickname> - same as 'follow'\n"
+"unsub <nickname> - same as 'leave'\n"
+"last <nickname> - same as 'get'\n"
+"on <nickname> - not yet implemented.\n"
+"off <nickname> - not yet implemented.\n"
+"nudge <nickname> - remind a user to update.\n"
+"invite <phone number> - not yet implemented.\n"
+"track <word> - not yet implemented.\n"
+"untrack <word> - not yet implemented.\n"
+"track off - not yet implemented.\n"
+"untrack all - not yet implemented.\n"
+"tracks - not yet implemented.\n"
+"tracking - not yet implemented.\n"
+msgstr ""
diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.mo b/locale/zh_CN/LC_MESSAGES/statusnet.mo
index ce757eea5..38a4c990b 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 05ab5243f..27ec36bf1 100644
--- a/locale/zh_CN/LC_MESSAGES/statusnet.po
+++ b/locale/zh_CN/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-06 13:16+0000\n"
-"PO-Revision-Date: 2009-11-06 15:44:51+0000\n"
+"POT-Creation-Date: 2009-11-08 11:53+0000\n"
+"PO-Revision-Date: 2009-11-08 11:57:27+0000\n"
 "Language-Team: Simplified Chinese\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r58648); Translate extension (2009-08-03)\n"
+"X-Generator: MediaWiki 1.16alpha(r58760); 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"
@@ -197,7 +197,7 @@ msgid "%s updates from everyone!"
 msgstr "来自所有人的 %s 消息！"
 
 #: ../actions/register.php:213 actions/register.php:497
-#: actions/register.php:545 actions/register.php:555
+#: actions/register.php:545 actions/register.php:555 actions/register.php:561
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -233,6 +233,7 @@ msgstr "1 到 64 个小写字母或数字，不包含标点及空白"
 
 #: ../actions/register.php:152 actions/register.php:166
 #: actions/register.php:368 actions/register.php:414 actions/register.php:418
+#: actions/register.php:424
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr "1 到 64 个小写字母或数字，不包含标点及空白。此项必填。"
 
@@ -249,6 +250,7 @@ msgstr "6 个或更多字符，不能忘记！"
 
 #: ../actions/register.php:154 actions/register.php:168
 #: actions/register.php:373 actions/register.php:419 actions/register.php:423
+#: actions/register.php:429
 msgid "6 or more characters. Required."
 msgstr "6 个或更多字符。此项必填。"
 
@@ -425,7 +427,7 @@ msgstr "所有匹配搜索条件\"%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
+#: actions/login.php:79 actions/register.php:137
 msgid "Already logged in."
 msgstr "已登录。"
 
@@ -448,7 +450,7 @@ 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/login.php:226
-#: actions/register.php:473
+#: actions/register.php:473 actions/login.php:253 actions/register.php:479
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "保持这台机器上的登录状态。不要在共用的机器上保持登录！"
 
@@ -470,6 +472,7 @@ msgstr "头像"
 
 #: ../actions/avatar.php:113 actions/profilesettings.php:350
 #: actions/avatarsettings.php:395 actions/avatarsettings.php:346
+#: actions/avatarsettings.php:360
 msgid "Avatar updated."
 msgstr "头像已更新。"
 
@@ -506,7 +509,7 @@ msgstr "下一页 »"
 #: 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
+#: actions/register.php:459 actions/register.php:465
 msgid "Bio"
 msgstr "自述"
 
@@ -535,6 +538,7 @@ msgstr "无法访问头像URL '%s'"
 #: actions/passwordsettings.php:169 actions/recoverpassword.php:347
 #: actions/passwordsettings.php:174 actions/recoverpassword.php:365
 #: actions/passwordsettings.php:180 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:185
 msgid "Can't save new password."
 msgstr "无法保存新密码。"
 
@@ -597,6 +601,7 @@ msgstr "修改您的个人信息"
 #: actions/recoverpassword.php:236 actions/register.php:422
 #: actions/passwordsettings.php:111 actions/recoverpassword.php:239
 #: actions/register.php:426 actions/smssettings.php:134
+#: actions/register.php:432
 msgid "Confirm"
 msgstr "确认"
 
@@ -626,7 +631,7 @@ msgid "Confirmation code not found."
 msgstr "未找到确认码。"
 
 #: ../actions/register.php:202 actions/register.php:473
-#: actions/register.php:521 actions/register.php:531
+#: actions/register.php:521 actions/register.php:531 actions/register.php:537
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -862,6 +867,7 @@ 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
+#: classes/Notice.php:1120
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "添加回复时数据库出错：%s"
@@ -884,7 +890,8 @@ msgstr "用不超过140个字符描述您自己和您的爱好"
 #: 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
+#: lib/accountsettingsaction.php:117 actions/register.php:437
+#: actions/register.php:441
 msgid "Email"
 msgstr "电子邮件"
 
@@ -899,7 +906,7 @@ msgid "Email Settings"
 msgstr "电子邮件设置"
 
 #: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
-#: actions/register.php:200 actions/register.php:206
+#: actions/register.php:200 actions/register.php:206 actions/register.php:212
 msgid "Email address already exists."
 msgstr "电子邮件地址已存在。"
 
@@ -985,7 +992,7 @@ msgstr "保存用户时出错。"
 
 #: ../actions/password.php:80 actions/profilesettings.php:399
 #: actions/passwordsettings.php:164 actions/passwordsettings.php:169
-#: actions/passwordsettings.php:175
+#: actions/passwordsettings.php:175 actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "保存用户时出错；不正确。"
 
@@ -997,6 +1004,7 @@ msgstr "保存用户时出错；不正确。"
 #: actions/login.php:120 actions/recoverpassword.php:372
 #: actions/register.php:235 actions/login.php:122
 #: actions/recoverpassword.php:375 actions/register.php:242
+#: actions/login.php:149 actions/register.php:248
 msgid "Error setting user."
 msgstr "保存用户设置时出错。"
 
@@ -1028,6 +1036,7 @@ msgstr "常见问题FAQ"
 
 #: ../actions/avatar.php:115 actions/profilesettings.php:352
 #: actions/avatarsettings.php:397 actions/avatarsettings.php:349
+#: actions/avatarsettings.php:363
 msgid "Failed updating avatar."
 msgstr "更新头像失败。"
 
@@ -1062,6 +1071,7 @@ msgid "Find people on this site"
 msgstr "搜索用户信息"
 
 #: ../actions/login.php:122 actions/login.php:247 actions/login.php:255
+#: actions/login.php:282
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -1077,6 +1087,7 @@ msgstr "由于安全原因，修改设置前需要输入用户名和密码。"
 #: actions/showstream.php:220 lib/groupeditform.php:157
 #: actions/profilesettings.php:111 actions/register.php:441
 #: actions/showgroup.php:247 actions/showstream.php:267
+#: actions/register.php:447 lib/userprofile.php:149
 msgid "Full name"
 msgstr "全名"
 
@@ -1090,7 +1101,7 @@ msgstr "全名"
 #: 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
+#: actions/register.php:214 actions/register.php:220
 msgid "Full name is too long (max 255 chars)."
 msgstr "全名过长(不能超过 255 个字符)。"
 
@@ -1111,7 +1122,7 @@ msgstr "主页"
 #: 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
+#: actions/register.php:446 actions/register.php:452
 msgid "Homepage"
 msgstr "主页"
 
@@ -1123,7 +1134,7 @@ msgstr "主页"
 #: 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
+#: actions/register.php:211 actions/register.php:217
 msgid "Homepage is not a valid URL."
 msgstr "主页的URL不正确。"
 
@@ -1189,7 +1200,7 @@ 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/login.php:116
+#: actions/facebookhome.php:129 actions/login.php:116 actions/login.php:143
 msgid "Incorrect username or password."
 msgstr "用户名或密码不正确。"
 
@@ -1267,6 +1278,7 @@ msgstr "大小不正确。"
 #: 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
+#: actions/register.php:243 actions/register.php:264
 msgid "Invalid username or password."
 msgstr "用户名或密码不正确。"
 
@@ -1343,7 +1355,7 @@ msgstr "语言过长(不能超过50个字符)。"
 #: 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
+#: lib/profilelist.php:218 actions/register.php:470 lib/userprofile.php:164
 msgid "Location"
 msgstr "位置"
 
@@ -1357,7 +1369,7 @@ msgstr "位置"
 #: 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
+#: actions/register.php:221 actions/register.php:227
 msgid "Location is too long (max 255 chars)."
 msgstr "位置过长(不能超过255个字符)。"
 
@@ -1371,6 +1383,7 @@ msgstr "位置过长(不能超过255个字符)。"
 #: 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
+#: actions/login.php:204 actions/login.php:257
 #, php-format
 msgid "Login"
 msgstr "登录"
@@ -1398,12 +1411,13 @@ msgstr "登出"
 
 #: ../actions/register.php:166 actions/register.php:180
 #: actions/register.php:393 actions/register.php:439 actions/register.php:443
+#: actions/register.php:449
 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 actions/login.php:236
+#: lib/facebookaction.php:327 actions/login.php:236 actions/login.php:263
 msgid "Lost or forgotten password?"
 msgstr "忘记了密码？"
 
@@ -1445,7 +1459,7 @@ 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:487
+#: actions/register.php:477 actions/register.php:487 actions/register.php:493
 msgid "My text and files are available under "
 msgstr "我的文字和文件采用的授权方式为"
 
@@ -1503,7 +1517,8 @@ msgstr "新密码已保存，您现在已登录。"
 #: 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
+#: actions/showgroup.php:236 actions/showstream.php:249 actions/login.php:246
+#: actions/register.php:423 lib/userprofile.php:131
 msgid "Nickname"
 msgstr "昵称"
 
@@ -1517,7 +1532,7 @@ msgstr "昵称"
 #: 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
+#: actions/register.php:202 actions/register.php:208
 msgid "Nickname already in use. Try another one."
 msgstr "昵称已被使用，换一个吧。"
 
@@ -1533,7 +1548,7 @@ msgstr "昵称已被使用，换一个吧。"
 #: 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
+#: actions/register.php:199 actions/register.php:205
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr "昵称只能使用小写字母和数字，不包含空格。"
 
@@ -1772,7 +1787,8 @@ msgstr "不是已注册用户。"
 #: 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
+#: lib/api.php:954 lib/api.php:982 lib/api.php:1092 lib/api.php:963
+#: lib/api.php:991 lib/api.php:1101
 msgid "Not a supported data format."
 msgstr "不支持的数据格式。"
 
@@ -1793,7 +1809,7 @@ 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
+#: actions/register.php:189 actions/register.php:195 actions/register.php:201
 msgid "Not a valid email address."
 msgstr "不是有效的电子邮件。"
 
@@ -1805,7 +1821,7 @@ msgstr "不是有效的电子邮件。"
 #: 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
+#: actions/register.php:204 actions/register.php:210
 msgid "Not a valid nickname."
 msgstr "不是有效的昵称。"
 
@@ -1844,6 +1860,7 @@ msgstr "未预料的响应！"
 #: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
 #: actions/twitapistatuses.php:309 actions/twitapistatuses.php:327
 #: actions/twitapistatuses.php:284 actions/apistatusesupdate.php:186
+#: actions/apistatusesupdate.php:193
 msgid "Not found"
 msgstr "未找到"
 
@@ -1990,7 +2007,8 @@ msgstr "部分上传。"
 #: 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
+#: lib/accountsettingsaction.php:114 actions/login.php:249
+#: actions/register.php:428
 msgid "Password"
 msgstr "密码"
 
@@ -2019,6 +2037,7 @@ msgstr "请求恢复密码"
 #: actions/passwordsettings.php:173 actions/recoverpassword.php:200
 #: actions/passwordsettings.php:178 actions/recoverpassword.php:208
 #: actions/passwordsettings.php:184 actions/recoverpassword.php:211
+#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr "密码已保存。"
 
@@ -2027,6 +2046,7 @@ msgstr "密码已保存。"
 #: actions/passwordsettings.php:145 actions/register.php:183
 #: actions/passwordsettings.php:150 actions/register.php:220
 #: actions/passwordsettings.php:156 actions/register.php:227
+#: actions/register.php:233
 msgid "Passwords don't match."
 msgstr "密码不匹配。"
 
@@ -2189,19 +2209,19 @@ msgstr "恢复码未知"
 #: 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
+#: lib/logingroupnav.php:85 actions/register.php:114 actions/register.php:502
 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
+#: actions/register.php:129 actions/register.php:135
 msgid "Registration not allowed."
 msgstr "不允许注册。"
 
 #: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67 actions/register.php:106
+#: actions/register.php:67 actions/register.php:106 actions/register.php:112
 msgid "Registration successful"
 msgstr "注册成功。"
 
@@ -2215,6 +2235,7 @@ msgstr "拒绝"
 #: 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
+#: actions/login.php:252 actions/register.php:477
 msgid "Remember me"
 msgstr "记住登录状态"
 
@@ -2311,6 +2332,7 @@ msgstr "相同的密码"
 
 #: ../actions/register.php:156 actions/register.php:170
 #: actions/register.php:377 actions/register.php:423 actions/register.php:427
+#: actions/register.php:433
 msgid "Same as password above. Required."
 msgstr "相同的密码。此项必填。"
 
@@ -2470,6 +2492,7 @@ msgstr "未找到已有的OpenID。"
 #: actions/remotesubscribe.php:113 actions/showstream.php:376
 #: lib/subscribeform.php:139 actions/showstream.php:345
 #: actions/remotesubscribe.php:137 actions/showstream.php:439
+#: lib/userprofile.php:321
 msgid "Subscribe"
 msgstr "订阅"
 
@@ -2516,6 +2539,7 @@ msgstr "上传文件时出错。"
 #: actions/profilesettings.php:123 actions/showstream.php:255
 #: lib/subscriptionlist.php:106 lib/subscriptionlist.php:108
 #: actions/profilesettings.php:138 actions/showstream.php:327
+#: lib/userprofile.php:209
 msgid "Tags"
 msgstr "标签"
 
@@ -2727,6 +2751,7 @@ msgstr "此方法接受POST或DELETE请求。"
 #: actions/apifriendshipsdestroy.php:91 actions/apigroupcreate.php:104
 #: actions/apigroupjoin.php:91 actions/apigroupleave.php:91
 #: actions/apistatusesupdate.php:109
+#: actions/apiaccountupdateprofileimage.php:84
 msgid "This method requires a POST."
 msgstr "此方法接受POST请求。"
 
@@ -2760,7 +2785,7 @@ msgstr ""
 
 #: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
 #: actions/twitapifriendships.php:132 actions/twitapifriendships.php:139
-#: actions/apifriendshipsexists.php:103
+#: actions/apifriendshipsexists.php:103 actions/apifriendshipsexists.php:94
 msgid "Two user ids or screen_names must be supplied."
 msgstr "必须提供两个用户帐号或昵称。"
 
@@ -2768,7 +2793,7 @@ msgstr "必须提供两个用户帐号或昵称。"
 #: 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
+#: actions/register.php:448 actions/register.php:454
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "您的主页、博客或在其他站点的URL"
 
@@ -2790,6 +2815,7 @@ msgstr "您在其他兼容的微博客服务的个人信息URL"
 #: actions/twittersettings.php:322 lib/designsettings.php:301
 #: actions/emailsettings.php:255 actions/grouplogo.php:319
 #: actions/imsettings.php:220 actions/smssettings.php:248
+#: actions/avatarsettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "未预料的表单提交。"
 
@@ -2896,7 +2922,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
+#: actions/register.php:436 actions/register.php:438 actions/register.php:442
 msgid "Used only for updates, announcements, and password recovery"
 msgstr "只用于更新、通告或密码恢复"
 
@@ -2924,7 +2950,8 @@ 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
+#: actions/apiusershow.php:108 actions/apiaccountupdateprofileimage.php:124
+#: actions/apiaccountupdateprofileimage.php:130
 msgid "User has no profile."
 msgstr "用户没有个人信息。"
 
@@ -2953,7 +2980,7 @@ msgstr "怎么样，%s？"
 #: 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
+#: actions/register.php:466 actions/register.php:472
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "你的位置，格式类似\"城市，省份，国家\""
 
@@ -3051,7 +3078,7 @@ 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:192
+#: actions/register.php:186 actions/register.php:192 actions/register.php:198
 msgid "You can't register if you don't agree to the license."
 msgstr "您必须同意此授权方可注册。"
 
@@ -3123,56 +3150,56 @@ msgstr ""
 "关联的 OpenID。"
 
 #: ../lib/util.php:943 lib/util.php:992 lib/util.php:945 lib/util.php:756
-#: lib/util.php:770 lib/util.php:816
+#: lib/util.php:770 lib/util.php:816 lib/util.php:844
 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:828
+#: lib/util.php:782 lib/util.php:828 lib/util.php:856
 #, php-format
 msgid "about %d days ago"
 msgstr "%d 天前"
 
 #: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953 lib/util.php:764
-#: lib/util.php:778 lib/util.php:824
+#: lib/util.php:778 lib/util.php:824 lib/util.php:852
 #, php-format
 msgid "about %d hours ago"
 msgstr "%d 小时前"
 
 #: ../lib/util.php:947 lib/util.php:996 lib/util.php:949 lib/util.php:760
-#: lib/util.php:774 lib/util.php:820
+#: lib/util.php:774 lib/util.php:820 lib/util.php:848
 #, php-format
 msgid "about %d minutes ago"
 msgstr "%d 分钟前"
 
 #: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961 lib/util.php:772
-#: lib/util.php:786 lib/util.php:832
+#: lib/util.php:786 lib/util.php:832 lib/util.php:860
 #, php-format
 msgid "about %d months ago"
 msgstr "%d 个月前"
 
 #: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955 lib/util.php:766
-#: lib/util.php:780 lib/util.php:826
+#: lib/util.php:780 lib/util.php:826 lib/util.php:854
 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:818
+#: lib/util.php:772 lib/util.php:818 lib/util.php:846
 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:830
+#: lib/util.php:784 lib/util.php:830 lib/util.php:858
 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:834
+#: lib/util.php:788 lib/util.php:834 lib/util.php:862
 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:822
+#: lib/util.php:776 lib/util.php:822 lib/util.php:850
 msgid "about an hour ago"
 msgstr "一小时前"
 
@@ -3242,7 +3269,9 @@ msgstr "« 之后"
 #: 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
+#: actions/userauthorization.php:52 actions/login.php:131
+#: actions/register.php:165 actions/avatarsettings.php:265
+#: lib/designsettings.php:294
 msgid "There was a problem with your session token. Try again, please."
 msgstr "会话标识有问题，请重试。"
 
@@ -3464,6 +3493,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
+#: actions/register.php:230
 msgid "Password must be 6 or more characters."
 msgstr "密码必须包含 6 个或更多字符。"
 
@@ -4009,13 +4039,13 @@ msgid "There was a problem with your session token. "
 msgstr "会话标识有问题，请重试。"
 
 #: actions/avatarsettings.php:303 actions/grouplogo.php:360
-#: actions/avatarsettings.php:308
+#: actions/avatarsettings.php:308 actions/avatarsettings.php:322
 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
+#: actions/grouplogo.php:377 actions/avatarsettings.php:337
 msgid "Lost our file data."
 msgstr "文件数据丢失"
 
@@ -4505,7 +4535,7 @@ msgid "%s left group %s"
 msgstr "%s 离开群 %s"
 
 #: actions/login.php:225 lib/facebookaction.php:304 actions/login.php:208
-#: actions/login.php:216
+#: actions/login.php:216 actions/login.php:243
 msgid "Login to site"
 msgstr "登录"
 
@@ -4696,7 +4726,8 @@ 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
+#: actions/register.php:398 actions/register.php:85 actions/register.php:189
+#: actions/register.php:404
 msgid "Sorry, only invited people can register."
 msgstr "对不起，请邀请那些能注册的人。"
 
@@ -4787,7 +4818,7 @@ msgstr "组资料"
 #: 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
+#: lib/profilelist.php:230 lib/userprofile.php:177
 msgid "URL"
 msgstr "URL 互联网地址"
 
@@ -4798,7 +4829,7 @@ msgstr "URL 互联网地址"
 #: 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
+#: lib/profilelist.php:245 lib/userprofile.php:194
 #, fuzzy
 msgid "Note"
 msgstr "通告"
@@ -4850,6 +4881,7 @@ msgid "Only the sender and recipient "
 msgstr "只有发送和接受双方可以阅读此消息。"
 
 #: actions/showstream.php:73 actions/showstream.php:78
+#: actions/showstream.php:79
 #, fuzzy, php-format
 msgid "%s, page %d"
 msgstr "%s 的收件箱 - 第 %d 页"
@@ -4861,31 +4893,32 @@ msgstr "个人信息"
 
 #: actions/showstream.php:236 actions/tagother.php:77
 #: actions/showstream.php:220 actions/showstream.php:185
-#: actions/showstream.php:193
+#: actions/showstream.php:193 lib/userprofile.php:75
 #, 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
+#: actions/showstream.php:220 lib/userprofile.php:102
 msgid "Photo"
 msgstr "相片"
 
 #: actions/showstream.php:317 actions/showstream.php:309
 #: actions/showstream.php:274 actions/showstream.php:354
+#: lib/userprofile.php:236
 #, fuzzy
 msgid "User actions"
 msgstr "未知动作"
 
 #: actions/showstream.php:342 actions/showstream.php:307
-#: actions/showstream.php:390
+#: actions/showstream.php:390 lib/userprofile.php:272
 #, fuzzy
 msgid "Send a direct message to this user"
 msgstr "无法向此用户发送消息。"
 
 #: actions/showstream.php:343 actions/showstream.php:308
-#: actions/showstream.php:391
+#: actions/showstream.php:391 lib/userprofile.php:273
 #, fuzzy
 msgid "Message"
 msgstr "新消息"
@@ -5655,7 +5688,7 @@ msgstr "%s 及好友"
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr "您可以在这里上传个人头像。"
 
-#: actions/avatarsettings.php:373
+#: actions/avatarsettings.php:373 actions/avatarsettings.php:387
 #, fuzzy
 msgid "Avatar deleted."
 msgstr "头像已更新。"
@@ -5788,10 +5821,12 @@ msgid ""
 msgstr ""
 
 #: actions/register.php:432 actions/register.php:479 actions/register.php:489
+#: actions/register.php:495
 msgid "Creative Commons Attribution 3.0"
 msgstr ""
 
 #: actions/register.php:433 actions/register.php:480 actions/register.php:490
+#: actions/register.php:496
 #, fuzzy
 msgid ""
 " except this private data: password, email address, IM address, and phone "
@@ -5826,44 +5861,48 @@ msgid "%s's profile"
 msgstr "个人信息"
 
 #: actions/showstream.php:163 actions/showstream.php:128
+#: actions/showstream.php:129
 #, fuzzy, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "%s 的通告聚合"
 
 #: actions/showstream.php:170 actions/showstream.php:135
+#: actions/showstream.php:136
 #, fuzzy, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "%s 的通告聚合"
 
 #: actions/showstream.php:177 actions/showstream.php:142
+#: actions/showstream.php:143
 #, fuzzy, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "%s 的通告聚合"
 
 #: actions/showstream.php:182 actions/showstream.php:147
+#: actions/showstream.php:148
 #, fuzzy, php-format
 msgid "FOAF for %s"
 msgstr "%s 的发件箱"
 
 #: actions/showstream.php:237 actions/showstream.php:202
-#: actions/showstream.php:234
+#: actions/showstream.php:234 lib/userprofile.php:116
 #, fuzzy
 msgid "Edit Avatar"
 msgstr "头像"
 
 #: actions/showstream.php:316 actions/showstream.php:281
-#: actions/showstream.php:366
+#: actions/showstream.php:366 lib/userprofile.php:248
 #, fuzzy
 msgid "Edit profile settings"
 msgstr "个人设置"
 
 #: actions/showstream.php:317 actions/showstream.php:282
-#: actions/showstream.php:367
+#: actions/showstream.php:367 lib/userprofile.php:249
 msgid "Edit"
 msgstr ""
 
 #: actions/showstream.php:542 actions/showstream.php:388
-#: actions/showstream.php:487
+#: actions/showstream.php:487 actions/showstream.php:234
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5908,6 +5947,9 @@ msgstr ""
 #: actions/apistatusesupdate.php:125 actions/apisubscriptions.php:87
 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#: actions/apiaccountupdateprofileimage.php:91
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apistatusesupdate.php:139
 #, fuzzy
 msgid "No such user!"
 msgstr "未找到用户"
@@ -5964,36 +6006,6 @@ msgid ""
 "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 ""
@@ -6161,6 +6173,7 @@ 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
+#: actions/showstream.php:202
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -6342,7 +6355,8 @@ 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
+#: lib/designsettings.php:461 lib/designsettings.php:434
+#: lib/designsettings.php:464
 #, fuzzy
 msgid "Couldn't update your design."
 msgstr "无法更新用户。"
@@ -6438,7 +6452,9 @@ msgid "Message sent"
 msgstr "新消息"
 
 #: actions/newnotice.php:93 lib/designsettings.php:281
-#: actions/newnotice.php:94
+#: actions/newnotice.php:94 actions/apiaccountupdateprofileimage.php:97
+#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254
+#: lib/designsettings.php:283
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s bytes) due to its "
@@ -6606,7 +6622,7 @@ msgstr "您已得到确认。请输入新密码。"
 msgid "Password recover"
 msgstr "请求恢复密码"
 
-#: actions/register.php:86
+#: actions/register.php:86 actions/register.php:92
 #, fuzzy
 msgid "Sorry, invalid invitation code."
 msgstr "验证码出错。"
@@ -6708,28 +6724,31 @@ msgstr "admin管理员"
 msgid "Not a local notice"
 msgstr "没有这个用户。"
 
-#: actions/showstream.php:72
+#: actions/showstream.php:72 actions/showstream.php:73
 #, fuzzy, php-format
 msgid " tagged %s"
 msgstr "带 %s 标签的通告"
 
-#: actions/showstream.php:121
+#: actions/showstream.php:121 actions/showstream.php:122
 #, fuzzy, php-format
 msgid "Notice feed for %s tagged %s (RSS 1.0)"
 msgstr "%s 的通告聚合"
 
 #: actions/showstream.php:350 actions/showstream.php:444
+#: actions/showstream.php:191
 #, 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
+#: actions/showstream.php:196
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
 msgstr ""
 
 #: actions/showstream.php:357 actions/showstream.php:451
+#: actions/showstream.php:198
 #, php-format
 msgid ""
 "You can try to nudge %s or [post something to his or her attention](%%%%"
@@ -6737,6 +6756,7 @@ msgid ""
 msgstr ""
 
 #: actions/showstream.php:393 actions/showstream.php:492
+#: actions/showstream.php:239
 #, fuzzy, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -6889,6 +6909,7 @@ msgid "Problem saving notice. Too long."
 msgstr "保存通告时出错。"
 
 #: classes/User.php:319 classes/User.php:327 classes/User.php:334
+#: classes/User.php:333
 #, fuzzy, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "发送给 %1$s 的 %2$s 消息"
@@ -6999,10 +7020,12 @@ msgid "Save design"
 msgstr ""
 
 #: lib/designsettings.php:378 lib/designsettings.php:369
+#: lib/designsettings.php:372
 msgid "Bad default color settings: "
 msgstr ""
 
 #: lib/designsettings.php:474 lib/designsettings.php:465
+#: lib/designsettings.php:468
 msgid "Design defaults restored."
 msgstr ""
 
@@ -7209,16 +7232,18 @@ msgid "Status deleted."
 msgstr "头像已更新。"
 
 #: actions/apistatusesupdate.php:132
+#: actions/apiaccountupdateprofileimage.php:99
 msgid "Unable to handle that much POST data!"
 msgstr ""
 
 #: actions/apistatusesupdate.php:145 actions/newnotice.php:155
-#: scripts/maildaemon.php:71
+#: scripts/maildaemon.php:71 actions/apistatusesupdate.php:152
 #, fuzzy, php-format
 msgid "That's too long. Max notice size is %d chars."
 msgstr "超出长度限制。不能超过 140 个字符。"
 
 #: actions/apistatusesupdate.php:209 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:216
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
@@ -7283,7 +7308,7 @@ msgstr "%2$s 上 %1$s 的更新！"
 msgid "IM is not available."
 msgstr "这个页面不提供您想要的媒体类型"
 
-#: actions/login.php:259
+#: actions/login.php:259 actions/login.php:286
 #, fuzzy, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -7317,21 +7342,24 @@ msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
 msgstr ""
 
 #: actions/profilesettings.php:122 actions/register.php:454
+#: actions/register.php:460
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d chars"
 msgstr "用不超过140个字符描述您自己和您的爱好"
 
 #: actions/profilesettings.php:125 actions/register.php:457
+#: actions/register.php:463
 #, fuzzy
 msgid "Describe yourself and your interests"
 msgstr "用不超过140个字符描述您自己和您的爱好"
 
 #: actions/profilesettings.php:221 actions/register.php:217
+#: actions/register.php:223
 #, fuzzy, php-format
 msgid "Bio is too long (max %d chars)."
 msgstr "自述过长(不能超过140字符)。"
 
-#: actions/register.php:336
+#: actions/register.php:336 actions/register.php:342
 msgid ""
 "With this form you can create  a new account. You can then post notices and "
 "link up to friends and colleagues. "
@@ -7374,17 +7402,17 @@ msgid "Replies to %1$s on %2$s!"
 msgstr "发送给 %1$s 的 %2$s 消息"
 
 #: actions/showfavorites.php:170
-#, fuzzy, php-format
+#, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
 msgstr "%s 好友的聚合"
 
 #: actions/showfavorites.php:177
-#, fuzzy, php-format
+#, php-format
 msgid "Feed for favorites of %s (RSS 2.0)"
 msgstr "%s 好友的聚合"
 
 #: actions/showfavorites.php:184
-#, fuzzy, php-format
+#, php-format
 msgid "Feed for favorites of %s (Atom)"
 msgstr "%s 好友的聚合"
 
@@ -7397,7 +7425,7 @@ msgid ""
 msgstr ""
 
 #: actions/showgroup.php:345
-#, fuzzy, php-format
+#, php-format
 msgid "FOAF for %s group"
 msgstr "%s 的发件箱"
 
@@ -7531,41 +7559,6 @@ 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 "No configuration file found. "
@@ -7600,7 +7593,7 @@ msgid "Describe the group or topic in %d characters"
 msgstr "用不超过140个字符描述您自己和您的爱好"
 
 #: lib/jabber.php:192
-#, fuzzy, php-format
+#, php-format
 msgid "notice id: %s"
 msgstr "新通告"
 
@@ -7660,7 +7653,6 @@ 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 "无法获取收藏的通告。"
 
@@ -7668,3 +7660,59 @@ msgstr "无法获取收藏的通告。"
 #, fuzzy
 msgid "Duplicate notice"
 msgstr "删除通告"
+
+#: actions/login.php:110 actions/login.php:120
+#, fuzzy
+msgid "Invalid or expired token."
+msgstr "通告内容不正确"
+
+#: lib/command.php:597
+#, fuzzy, php-format
+msgid "Could not create login token for %s"
+msgstr "无法创建 OpenID 表单：%s"
+
+#: lib/command.php:602
+#, php-format
+msgid "This link is useable only once, and is good for only 2 minutes: %s"
+msgstr ""
+
+#: lib/imagefile.php:75
+#, fuzzy, php-format
+msgid "That file is too big. The maximum file size is %s."
+msgstr "你可以给你的组上载一个logo图。"
+
+#: lib/command.php:613
+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"
+"login - Get a link to login to the web interface\n"
+"drop <group> - leave group\n"
+"stats - get your stats\n"
+"stop - same as 'off'\n"
+"quit - same as 'off'\n"
+"sub <nickname> - same as 'follow'\n"
+"unsub <nickname> - same as 'leave'\n"
+"last <nickname> - same as 'get'\n"
+"on <nickname> - not yet implemented.\n"
+"off <nickname> - not yet implemented.\n"
+"nudge <nickname> - remind a user to update.\n"
+"invite <phone number> - not yet implemented.\n"
+"track <word> - not yet implemented.\n"
+"untrack <word> - not yet implemented.\n"
+"track off - not yet implemented.\n"
+"untrack all - not yet implemented.\n"
+"tracks - not yet implemented.\n"
+"tracking - not yet implemented.\n"
+msgstr ""
diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.mo b/locale/zh_TW/LC_MESSAGES/statusnet.mo
index 1ce207269..01220f3f1 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 41343732d..b6512494c 100644
--- a/locale/zh_TW/LC_MESSAGES/statusnet.po
+++ b/locale/zh_TW/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-06 13:16+0000\n"
-"PO-Revision-Date: 2009-11-06 15:44:55+0000\n"
+"POT-Creation-Date: 2009-11-08 11:53+0000\n"
+"PO-Revision-Date: 2009-11-08 11:57:29+0000\n"
 "Language-Team: Traditional Chinese\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r58648); Translate extension (2009-08-03)\n"
+"X-Generator: MediaWiki 1.16alpha(r58760); 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"
@@ -179,7 +179,7 @@ msgid "%s updates from everyone!"
 msgstr ""
 
 #: ../actions/register.php:213 actions/register.php:497
-#: actions/register.php:545 actions/register.php:555
+#: actions/register.php:545 actions/register.php:555 actions/register.php:561
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -215,6 +215,7 @@ msgstr "1-64個小寫英文字母或數字，勿加標點符號或空格"
 
 #: ../actions/register.php:152 actions/register.php:166
 #: actions/register.php:368 actions/register.php:414 actions/register.php:418
+#: actions/register.php:424
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr ""
 
@@ -231,6 +232,7 @@ msgstr "6個或6個以上字元，別忘了自己密碼喔"
 
 #: ../actions/register.php:154 actions/register.php:168
 #: actions/register.php:373 actions/register.php:419 actions/register.php:423
+#: actions/register.php:429
 msgid "6 or more characters. Required."
 msgstr ""
 
@@ -403,7 +405,7 @@ msgstr "所有符合 \"%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
+#: actions/login.php:79 actions/register.php:137
 msgid "Already logged in."
 msgstr "已登入"
 
@@ -426,7 +428,7 @@ 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/login.php:226
-#: actions/register.php:473
+#: actions/register.php:473 actions/login.php:253 actions/register.php:479
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "未來在同一部電腦自動登入"
 
@@ -448,6 +450,7 @@ msgstr "個人圖像"
 
 #: ../actions/avatar.php:113 actions/profilesettings.php:350
 #: actions/avatarsettings.php:395 actions/avatarsettings.php:346
+#: actions/avatarsettings.php:360
 msgid "Avatar updated."
 msgstr "更新個人圖像"
 
@@ -482,7 +485,7 @@ msgstr "之前的內容»"
 #: 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
+#: actions/register.php:459 actions/register.php:465
 msgid "Bio"
 msgstr "自我介紹"
 
@@ -511,6 +514,7 @@ msgstr "無法讀取此%sURL的圖像"
 #: actions/passwordsettings.php:169 actions/recoverpassword.php:347
 #: actions/passwordsettings.php:174 actions/recoverpassword.php:365
 #: actions/passwordsettings.php:180 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:185
 msgid "Can't save new password."
 msgstr "無法存取新密碼"
 
@@ -573,6 +577,7 @@ msgstr ""
 #: actions/recoverpassword.php:236 actions/register.php:422
 #: actions/passwordsettings.php:111 actions/recoverpassword.php:239
 #: actions/register.php:426 actions/smssettings.php:134
+#: actions/register.php:432
 msgid "Confirm"
 msgstr "確認"
 
@@ -602,7 +607,7 @@ msgid "Confirmation code not found."
 msgstr "確認碼遺失"
 
 #: ../actions/register.php:202 actions/register.php:473
-#: actions/register.php:521 actions/register.php:531
+#: actions/register.php:521 actions/register.php:531 actions/register.php:537
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -826,6 +831,7 @@ 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
+#: classes/Notice.php:1120
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "增加回覆時,資料庫發生錯誤: %s"
@@ -848,7 +854,8 @@ msgstr "請在140個字以內描述你自己與你的興趣"
 #: 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
+#: lib/accountsettingsaction.php:117 actions/register.php:437
+#: actions/register.php:441
 msgid "Email"
 msgstr "電子信箱"
 
@@ -863,7 +870,7 @@ msgid "Email Settings"
 msgstr ""
 
 #: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
-#: actions/register.php:200 actions/register.php:206
+#: actions/register.php:200 actions/register.php:206 actions/register.php:212
 msgid "Email address already exists."
 msgstr "此電子信箱已註冊過了"
 
@@ -949,7 +956,7 @@ msgstr "儲存使用者發生錯誤"
 
 #: ../actions/password.php:80 actions/profilesettings.php:399
 #: actions/passwordsettings.php:164 actions/passwordsettings.php:169
-#: actions/passwordsettings.php:175
+#: actions/passwordsettings.php:175 actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
 msgstr "儲存使用者發生錯誤;使用者名稱無效"
 
@@ -961,6 +968,7 @@ msgstr "儲存使用者發生錯誤;使用者名稱無效"
 #: actions/login.php:120 actions/recoverpassword.php:372
 #: actions/register.php:235 actions/login.php:122
 #: actions/recoverpassword.php:375 actions/register.php:242
+#: actions/login.php:149 actions/register.php:248
 msgid "Error setting user."
 msgstr "使用者設定發生錯誤"
 
@@ -992,6 +1000,7 @@ msgstr "常見問題"
 
 #: ../actions/avatar.php:115 actions/profilesettings.php:352
 #: actions/avatarsettings.php:397 actions/avatarsettings.php:349
+#: actions/avatarsettings.php:363
 msgid "Failed updating avatar."
 msgstr "無法上傳個人圖像"
 
@@ -1026,6 +1035,7 @@ msgid "Find people on this site"
 msgstr ""
 
 #: ../actions/login.php:122 actions/login.php:247 actions/login.php:255
+#: actions/login.php:282
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -1041,6 +1051,7 @@ msgstr "為安全起見，請先重新輸入你的使用者名稱與密碼再更
 #: actions/showstream.php:220 lib/groupeditform.php:157
 #: actions/profilesettings.php:111 actions/register.php:441
 #: actions/showgroup.php:247 actions/showstream.php:267
+#: actions/register.php:447 lib/userprofile.php:149
 msgid "Full name"
 msgstr "全名"
 
@@ -1054,7 +1065,7 @@ msgstr "全名"
 #: 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
+#: actions/register.php:214 actions/register.php:220
 msgid "Full name is too long (max 255 chars)."
 msgstr "全名過長（最多255字元）"
 
@@ -1075,7 +1086,7 @@ msgstr "主頁"
 #: 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
+#: actions/register.php:446 actions/register.php:452
 msgid "Homepage"
 msgstr "個人首頁"
 
@@ -1087,7 +1098,7 @@ msgstr "個人首頁"
 #: 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
+#: actions/register.php:211 actions/register.php:217
 msgid "Homepage is not a valid URL."
 msgstr "個人首頁位址錯誤"
 
@@ -1153,7 +1164,7 @@ 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/login.php:116
+#: actions/facebookhome.php:129 actions/login.php:116 actions/login.php:143
 msgid "Incorrect username or password."
 msgstr "使用者名稱或密碼錯誤"
 
@@ -1231,6 +1242,7 @@ msgstr "尺寸錯誤"
 #: 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
+#: actions/register.php:243 actions/register.php:264
 msgid "Invalid username or password."
 msgstr "使用者名稱或密碼無效"
 
@@ -1302,7 +1314,7 @@ msgstr ""
 #: 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
+#: lib/profilelist.php:218 actions/register.php:470 lib/userprofile.php:164
 msgid "Location"
 msgstr "地點"
 
@@ -1316,7 +1328,7 @@ msgstr "地點"
 #: 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
+#: actions/register.php:221 actions/register.php:227
 msgid "Location is too long (max 255 chars)."
 msgstr "地點過長（共255個字）"
 
@@ -1330,6 +1342,7 @@ msgstr "地點過長（共255個字）"
 #: 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
+#: actions/login.php:204 actions/login.php:257
 #, php-format
 msgid "Login"
 msgstr "登入"
@@ -1355,12 +1368,13 @@ msgstr "登出"
 
 #: ../actions/register.php:166 actions/register.php:180
 #: actions/register.php:393 actions/register.php:439 actions/register.php:443
+#: actions/register.php:449
 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 actions/login.php:236
+#: lib/facebookaction.php:327 actions/login.php:236 actions/login.php:263
 msgid "Lost or forgotten password?"
 msgstr "遺失或忘記密碼了嗎？"
 
@@ -1400,7 +1414,7 @@ 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:487
+#: actions/register.php:477 actions/register.php:487 actions/register.php:493
 msgid "My text and files are available under "
 msgstr ""
 
@@ -1458,7 +1472,8 @@ msgstr "新密碼已儲存成功。你已登入。"
 #: 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
+#: actions/showgroup.php:236 actions/showstream.php:249 actions/login.php:246
+#: actions/register.php:423 lib/userprofile.php:131
 msgid "Nickname"
 msgstr "暱稱"
 
@@ -1472,7 +1487,7 @@ msgstr "暱稱"
 #: 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
+#: actions/register.php:202 actions/register.php:208
 msgid "Nickname already in use. Try another one."
 msgstr "此暱稱已有人使用。再試試看別的吧。"
 
@@ -1488,7 +1503,7 @@ msgstr "此暱稱已有人使用。再試試看別的吧。"
 #: 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
+#: actions/register.php:199 actions/register.php:205
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr "暱稱請用小寫字母或數字，勿加空格。"
 
@@ -1727,7 +1742,8 @@ msgstr ""
 #: 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
+#: lib/api.php:954 lib/api.php:982 lib/api.php:1092 lib/api.php:963
+#: lib/api.php:991 lib/api.php:1101
 msgid "Not a supported data format."
 msgstr ""
 
@@ -1748,7 +1764,7 @@ 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
+#: actions/register.php:189 actions/register.php:195 actions/register.php:201
 msgid "Not a valid email address."
 msgstr "此信箱無效"
 
@@ -1760,7 +1776,7 @@ msgstr "此信箱無效"
 #: 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
+#: actions/register.php:204 actions/register.php:210
 msgid "Not a valid nickname."
 msgstr ""
 
@@ -1799,6 +1815,7 @@ msgstr ""
 #: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
 #: actions/twitapistatuses.php:309 actions/twitapistatuses.php:327
 #: actions/twitapistatuses.php:284 actions/apistatusesupdate.php:186
+#: actions/apistatusesupdate.php:193
 msgid "Not found"
 msgstr ""
 
@@ -1945,7 +1962,8 @@ msgstr ""
 #: 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
+#: lib/accountsettingsaction.php:114 actions/login.php:249
+#: actions/register.php:428
 msgid "Password"
 msgstr ""
 
@@ -1974,6 +1992,7 @@ msgstr ""
 #: actions/passwordsettings.php:173 actions/recoverpassword.php:200
 #: actions/passwordsettings.php:178 actions/recoverpassword.php:208
 #: actions/passwordsettings.php:184 actions/recoverpassword.php:211
+#: actions/passwordsettings.php:191
 msgid "Password saved."
 msgstr ""
 
@@ -1982,6 +2001,7 @@ msgstr ""
 #: actions/passwordsettings.php:145 actions/register.php:183
 #: actions/passwordsettings.php:150 actions/register.php:220
 #: actions/passwordsettings.php:156 actions/register.php:227
+#: actions/register.php:233
 msgid "Passwords don't match."
 msgstr ""
 
@@ -2142,19 +2162,19 @@ msgstr ""
 #: 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
+#: lib/logingroupnav.php:85 actions/register.php:114 actions/register.php:502
 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
+#: actions/register.php:129 actions/register.php:135
 msgid "Registration not allowed."
 msgstr ""
 
 #: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67 actions/register.php:106
+#: actions/register.php:67 actions/register.php:106 actions/register.php:112
 msgid "Registration successful"
 msgstr ""
 
@@ -2168,6 +2188,7 @@ msgstr ""
 #: 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
+#: actions/login.php:252 actions/register.php:477
 msgid "Remember me"
 msgstr ""
 
@@ -2264,6 +2285,7 @@ msgstr ""
 
 #: ../actions/register.php:156 actions/register.php:170
 #: actions/register.php:377 actions/register.php:423 actions/register.php:427
+#: actions/register.php:433
 msgid "Same as password above. Required."
 msgstr ""
 
@@ -2419,6 +2441,7 @@ msgstr ""
 #: actions/remotesubscribe.php:113 actions/showstream.php:376
 #: lib/subscribeform.php:139 actions/showstream.php:345
 #: actions/remotesubscribe.php:137 actions/showstream.php:439
+#: lib/userprofile.php:321
 msgid "Subscribe"
 msgstr ""
 
@@ -2465,6 +2488,7 @@ msgstr ""
 #: actions/profilesettings.php:123 actions/showstream.php:255
 #: lib/subscriptionlist.php:106 lib/subscriptionlist.php:108
 #: actions/profilesettings.php:138 actions/showstream.php:327
+#: lib/userprofile.php:209
 msgid "Tags"
 msgstr ""
 
@@ -2673,6 +2697,7 @@ msgstr ""
 #: actions/apifriendshipsdestroy.php:91 actions/apigroupcreate.php:104
 #: actions/apigroupjoin.php:91 actions/apigroupleave.php:91
 #: actions/apistatusesupdate.php:109
+#: actions/apiaccountupdateprofileimage.php:84
 msgid "This method requires a POST."
 msgstr ""
 
@@ -2703,7 +2728,7 @@ msgstr ""
 
 #: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
 #: actions/twitapifriendships.php:132 actions/twitapifriendships.php:139
-#: actions/apifriendshipsexists.php:103
+#: actions/apifriendshipsexists.php:103 actions/apifriendshipsexists.php:94
 msgid "Two user ids or screen_names must be supplied."
 msgstr ""
 
@@ -2711,7 +2736,7 @@ msgstr ""
 #: 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
+#: actions/register.php:448 actions/register.php:454
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr ""
 
@@ -2733,6 +2758,7 @@ msgstr ""
 #: actions/twittersettings.php:322 lib/designsettings.php:301
 #: actions/emailsettings.php:255 actions/grouplogo.php:319
 #: actions/imsettings.php:220 actions/smssettings.php:248
+#: actions/avatarsettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr ""
 
@@ -2837,7 +2863,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
+#: actions/register.php:436 actions/register.php:438 actions/register.php:442
 msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
 
@@ -2865,7 +2891,8 @@ 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
+#: actions/apiusershow.php:108 actions/apiaccountupdateprofileimage.php:124
+#: actions/apiaccountupdateprofileimage.php:130
 msgid "User has no profile."
 msgstr ""
 
@@ -2894,7 +2921,7 @@ msgstr ""
 #: 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
+#: actions/register.php:466 actions/register.php:472
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr ""
 
@@ -2990,7 +3017,7 @@ 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:192
+#: actions/register.php:186 actions/register.php:192 actions/register.php:198
 msgid "You can't register if you don't agree to the license."
 msgstr ""
 
@@ -3053,56 +3080,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:816
+#: lib/util.php:770 lib/util.php:816 lib/util.php:844
 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:828
+#: lib/util.php:782 lib/util.php:828 lib/util.php:856
 #, 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:824
+#: lib/util.php:778 lib/util.php:824 lib/util.php:852
 #, 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:820
+#: lib/util.php:774 lib/util.php:820 lib/util.php:848
 #, 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:832
+#: lib/util.php:786 lib/util.php:832 lib/util.php:860
 #, 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:826
+#: lib/util.php:780 lib/util.php:826 lib/util.php:854
 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:818
+#: lib/util.php:772 lib/util.php:818 lib/util.php:846
 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:830
+#: lib/util.php:784 lib/util.php:830 lib/util.php:858
 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:834
+#: lib/util.php:788 lib/util.php:834 lib/util.php:862
 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:822
+#: lib/util.php:776 lib/util.php:822 lib/util.php:850
 msgid "about an hour ago"
 msgstr ""
 
@@ -3171,7 +3198,9 @@ msgstr ""
 #: 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
+#: actions/userauthorization.php:52 actions/login.php:131
+#: actions/register.php:165 actions/avatarsettings.php:265
+#: lib/designsettings.php:294
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
@@ -3391,6 +3420,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
+#: actions/register.php:230
 msgid "Password must be 6 or more characters."
 msgstr ""
 
@@ -3930,13 +3960,13 @@ msgid "There was a problem with your session token. "
 msgstr ""
 
 #: actions/avatarsettings.php:303 actions/grouplogo.php:360
-#: actions/avatarsettings.php:308
+#: actions/avatarsettings.php:308 actions/avatarsettings.php:322
 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
+#: actions/grouplogo.php:377 actions/avatarsettings.php:337
 msgid "Lost our file data."
 msgstr ""
 
@@ -4409,7 +4439,7 @@ msgid "%s left group %s"
 msgstr ""
 
 #: actions/login.php:225 lib/facebookaction.php:304 actions/login.php:208
-#: actions/login.php:216
+#: actions/login.php:216 actions/login.php:243
 msgid "Login to site"
 msgstr ""
 
@@ -4590,7 +4620,8 @@ 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
+#: actions/register.php:398 actions/register.php:85 actions/register.php:189
+#: actions/register.php:404
 msgid "Sorry, only invited people can register."
 msgstr ""
 
@@ -4676,7 +4707,7 @@ msgstr "無此通知"
 #: 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
+#: lib/profilelist.php:230 lib/userprofile.php:177
 msgid "URL"
 msgstr ""
 
@@ -4687,7 +4718,7 @@ msgstr ""
 #: 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
+#: lib/profilelist.php:245 lib/userprofile.php:194
 msgid "Note"
 msgstr ""
 
@@ -4735,6 +4766,7 @@ msgid "Only the sender and recipient "
 msgstr ""
 
 #: actions/showstream.php:73 actions/showstream.php:78
+#: actions/showstream.php:79
 #, php-format
 msgid "%s, page %d"
 msgstr ""
@@ -4746,29 +4778,30 @@ msgstr "無此通知"
 
 #: actions/showstream.php:236 actions/tagother.php:77
 #: actions/showstream.php:220 actions/showstream.php:185
-#: actions/showstream.php:193
+#: actions/showstream.php:193 lib/userprofile.php:75
 #, 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
+#: actions/showstream.php:220 lib/userprofile.php:102
 msgid "Photo"
 msgstr ""
 
 #: actions/showstream.php:317 actions/showstream.php:309
 #: actions/showstream.php:274 actions/showstream.php:354
+#: lib/userprofile.php:236
 msgid "User actions"
 msgstr ""
 
 #: actions/showstream.php:342 actions/showstream.php:307
-#: actions/showstream.php:390
+#: actions/showstream.php:390 lib/userprofile.php:272
 msgid "Send a direct message to this user"
 msgstr ""
 
 #: actions/showstream.php:343 actions/showstream.php:308
-#: actions/showstream.php:391
+#: actions/showstream.php:391 lib/userprofile.php:273
 msgid "Message"
 msgstr ""
 
@@ -5497,7 +5530,7 @@ msgstr "%s與好友"
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr ""
 
-#: actions/avatarsettings.php:373
+#: actions/avatarsettings.php:373 actions/avatarsettings.php:387
 #, fuzzy
 msgid "Avatar deleted."
 msgstr "更新個人圖像"
@@ -5621,10 +5654,12 @@ msgid ""
 msgstr ""
 
 #: actions/register.php:432 actions/register.php:479 actions/register.php:489
+#: actions/register.php:495
 msgid "Creative Commons Attribution 3.0"
 msgstr ""
 
 #: actions/register.php:433 actions/register.php:480 actions/register.php:490
+#: actions/register.php:496
 #, fuzzy
 msgid ""
 " except this private data: password, email address, IM address, and phone "
@@ -5659,44 +5694,48 @@ msgid "%s's profile"
 msgstr "無此通知"
 
 #: actions/showstream.php:163 actions/showstream.php:128
+#: actions/showstream.php:129
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr ""
 
 #: actions/showstream.php:170 actions/showstream.php:135
+#: actions/showstream.php:136
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr ""
 
 #: actions/showstream.php:177 actions/showstream.php:142
+#: actions/showstream.php:143
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr ""
 
 #: actions/showstream.php:182 actions/showstream.php:147
+#: actions/showstream.php:148
 #, php-format
 msgid "FOAF for %s"
 msgstr ""
 
 #: actions/showstream.php:237 actions/showstream.php:202
-#: actions/showstream.php:234
+#: actions/showstream.php:234 lib/userprofile.php:116
 #, fuzzy
 msgid "Edit Avatar"
 msgstr "個人圖像"
 
 #: actions/showstream.php:316 actions/showstream.php:281
-#: actions/showstream.php:366
+#: actions/showstream.php:366 lib/userprofile.php:248
 #, fuzzy
 msgid "Edit profile settings"
 msgstr "線上即時通設定"
 
 #: actions/showstream.php:317 actions/showstream.php:282
-#: actions/showstream.php:367
+#: actions/showstream.php:367 lib/userprofile.php:249
 msgid "Edit"
 msgstr ""
 
 #: actions/showstream.php:542 actions/showstream.php:388
-#: actions/showstream.php:487
+#: actions/showstream.php:487 actions/showstream.php:234
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5739,6 +5778,9 @@ msgstr ""
 #: actions/apistatusesupdate.php:125 actions/apisubscriptions.php:87
 #: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
 #: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#: actions/apiaccountupdateprofileimage.php:91
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apistatusesupdate.php:139
 #, fuzzy
 msgid "No such user!"
 msgstr "無此使用者"
@@ -5787,36 +5829,6 @@ msgid ""
 "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 ""
@@ -5985,6 +5997,7 @@ 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
+#: actions/showstream.php:202
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -6160,7 +6173,8 @@ 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
+#: lib/designsettings.php:461 lib/designsettings.php:434
+#: lib/designsettings.php:464
 #, fuzzy
 msgid "Couldn't update your design."
 msgstr "無法更新使用者"
@@ -6250,7 +6264,9 @@ msgid "Message sent"
 msgstr ""
 
 #: actions/newnotice.php:93 lib/designsettings.php:281
-#: actions/newnotice.php:94
+#: actions/newnotice.php:94 actions/apiaccountupdateprofileimage.php:97
+#: actions/apistatusesupdate.php:122 actions/avatarsettings.php:254
+#: lib/designsettings.php:283
 #, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s bytes) due to its "
@@ -6411,7 +6427,7 @@ msgstr ""
 msgid "Password recover"
 msgstr ""
 
-#: actions/register.php:86
+#: actions/register.php:86 actions/register.php:92
 #, fuzzy
 msgid "Sorry, invalid invitation code."
 msgstr "確認碼發生錯誤"
@@ -6509,28 +6525,31 @@ msgstr ""
 msgid "Not a local notice"
 msgstr "無此使用者"
 
-#: actions/showstream.php:72
+#: actions/showstream.php:72 actions/showstream.php:73
 #, php-format
 msgid " tagged %s"
 msgstr ""
 
-#: actions/showstream.php:121
+#: actions/showstream.php:121 actions/showstream.php:122
 #, php-format
 msgid "Notice feed for %s tagged %s (RSS 1.0)"
 msgstr ""
 
 #: actions/showstream.php:350 actions/showstream.php:444
+#: actions/showstream.php:191
 #, 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
+#: actions/showstream.php:196
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
 msgstr ""
 
 #: actions/showstream.php:357 actions/showstream.php:451
+#: actions/showstream.php:198
 #, php-format
 msgid ""
 "You can try to nudge %s or [post something to his or her attention](%%%%"
@@ -6538,6 +6557,7 @@ msgid ""
 msgstr ""
 
 #: actions/showstream.php:393 actions/showstream.php:492
+#: actions/showstream.php:239
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -6683,6 +6703,7 @@ msgid "Problem saving notice. Too long."
 msgstr "儲存使用者發生錯誤"
 
 #: classes/User.php:319 classes/User.php:327 classes/User.php:334
+#: classes/User.php:333
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr ""
@@ -6791,10 +6812,12 @@ msgid "Save design"
 msgstr ""
 
 #: lib/designsettings.php:378 lib/designsettings.php:369
+#: lib/designsettings.php:372
 msgid "Bad default color settings: "
 msgstr ""
 
 #: lib/designsettings.php:474 lib/designsettings.php:465
+#: lib/designsettings.php:468
 msgid "Design defaults restored."
 msgstr ""
 
@@ -6998,16 +7021,18 @@ msgid "Status deleted."
 msgstr "更新個人圖像"
 
 #: actions/apistatusesupdate.php:132
+#: actions/apiaccountupdateprofileimage.php:99
 msgid "Unable to handle that much POST data!"
 msgstr ""
 
 #: actions/apistatusesupdate.php:145 actions/newnotice.php:155
-#: scripts/maildaemon.php:71
+#: scripts/maildaemon.php:71 actions/apistatusesupdate.php:152
 #, php-format
 msgid "That's too long. Max notice size is %d chars."
 msgstr ""
 
 #: actions/apistatusesupdate.php:209 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:216
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
@@ -7067,7 +7092,7 @@ msgstr "&s的微型部落格"
 msgid "IM is not available."
 msgstr "個人首頁位址錯誤"
 
-#: actions/login.php:259
+#: actions/login.php:259 actions/login.php:286
 #, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -7099,21 +7124,24 @@ msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
 msgstr ""
 
 #: actions/profilesettings.php:122 actions/register.php:454
+#: actions/register.php:460
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d chars"
 msgstr "請在140個字以內描述你自己與你的興趣"
 
 #: actions/profilesettings.php:125 actions/register.php:457
+#: actions/register.php:463
 #, fuzzy
 msgid "Describe yourself and your interests"
 msgstr "請在140個字以內描述你自己與你的興趣"
 
 #: actions/profilesettings.php:221 actions/register.php:217
+#: actions/register.php:223
 #, fuzzy, php-format
 msgid "Bio is too long (max %d chars)."
 msgstr "自我介紹過長(共140個字元)"
 
-#: actions/register.php:336
+#: actions/register.php:336 actions/register.php:342
 msgid ""
 "With this form you can create  a new account. You can then post notices and "
 "link up to friends and colleagues. "
@@ -7268,7 +7296,7 @@ msgid "Site content license"
 msgstr "新訊息"
 
 #: lib/command.php:88
-#, fuzzy, php-format
+#, php-format
 msgid "Could not find a user with nickname %s"
 msgstr "無法更新使用者"
 
@@ -7301,45 +7329,9 @@ 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. "
@@ -7439,3 +7431,58 @@ msgstr "無法更新使用者"
 #, fuzzy
 msgid "Duplicate notice"
 msgstr "新訊息"
+
+#: actions/login.php:110 actions/login.php:120
+msgid "Invalid or expired token."
+msgstr ""
+
+#: lib/command.php:597
+#, fuzzy, php-format
+msgid "Could not create login token for %s"
+msgstr "無法從 %s 建立OpenID"
+
+#: lib/command.php:602
+#, php-format
+msgid "This link is useable only once, and is good for only 2 minutes: %s"
+msgstr ""
+
+#: lib/imagefile.php:75
+#, php-format
+msgid "That file is too big. The maximum file size is %s."
+msgstr ""
+
+#: lib/command.php:613
+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"
+"login - Get a link to login to the web interface\n"
+"drop <group> - leave group\n"
+"stats - get your stats\n"
+"stop - same as 'off'\n"
+"quit - same as 'off'\n"
+"sub <nickname> - same as 'follow'\n"
+"unsub <nickname> - same as 'leave'\n"
+"last <nickname> - same as 'get'\n"
+"on <nickname> - not yet implemented.\n"
+"off <nickname> - not yet implemented.\n"
+"nudge <nickname> - remind a user to update.\n"
+"invite <phone number> - not yet implemented.\n"
+"track <word> - not yet implemented.\n"
+"untrack <word> - not yet implemented.\n"
+"track off - not yet implemented.\n"
+"untrack all - not yet implemented.\n"
+"tracks - not yet implemented.\n"
+"tracking - not yet implemented.\n"
+msgstr ""
diff --git a/plugins/OpenID/OpenIDPlugin.php b/plugins/OpenID/OpenIDPlugin.php
index 2309eea9d..e4aed2ddb 100644
--- a/plugins/OpenID/OpenIDPlugin.php
+++ b/plugins/OpenID/OpenIDPlugin.php
@@ -298,4 +298,10 @@ class OpenIDPlugin extends Plugin
                                    new ColumnDef('modified', 'timestamp')));
         return true;
     }
+
+    function onUserDeleteRelated($user, &$tables)
+    {
+        $tables[] = 'User_openid';
+        return true;
+    }
 }
diff --git a/plugins/UserFlag/UserFlagPlugin.php b/plugins/UserFlag/UserFlagPlugin.php
index fbe5fd351..2376bb859 100644
--- a/plugins/UserFlag/UserFlagPlugin.php
+++ b/plugins/UserFlag/UserFlagPlugin.php
@@ -102,7 +102,7 @@ class UserFlagPlugin extends Plugin
             $action->elementStart('li', 'entity_flag');
 
             if (User_flag_profile::exists($profile->id, $user->id)) {
-                $action->element('span', array(),
+                $action->element('p', array(),
                                  _('Flagged for review'));
             } else {
                 $form = new FlagProfileForm($action, $profile,
@@ -130,4 +130,15 @@ class UserFlagPlugin extends Plugin
 
         return true;
     }
+
+    function onEndShowStatusNetStyles($action)
+    {
+        $action->elementStart('style', array('type' => 'text/css'));
+        $action->raw('.entity_flag input, .entity_flag p {'.
+            ' background:url('.common_path('plugins/UserFlag/flag.gif').') 5px 5px no-repeat;'.
+            ' }');
+        $action->elementEnd('style');
+
+        return true;
+    }
 }
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 1bab7d965..c3ff4d92c 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -618,7 +618,8 @@ font-style:italic;
 .entity_actions {
 float:right;
 margin-left:2.35%;
-max-width:25%;
+margin-bottom:18px;
+width:21%;
 }
 .entity_actions h2 {
 display:none;
@@ -627,7 +628,7 @@ display:none;
 list-style-type:none;
 }
 .entity_actions li {
-margin-bottom:4px;
+margin-bottom:7px;
 }
 .entity_actions li:first-child {
 border-top:0;
@@ -646,30 +647,29 @@ text-align:left;
 width:100%;
 }
 .entity_actions a,
-.entity_nudge p,
+.entity_actions p,
 .entity_remote_subscribe {
 text-decoration:none;
 font-weight:bold;
 display:block;
 }
+.entity_actions a,
+.entity_actions input {
+border-radius:4px;
+-moz-border-radius:4px;
+-webkit-border-radius:4px;
+}
 
-.form_user_block input.submit,
-.form_user_unblock input.submit,
-.form_group_block input.submit,
-.form_group_unblock input.submit,
-.entity_send-a-message a,
-.entity_edit a,
-.form_user_nudge input.submit,
-.entity_nudge p,
-.form_make_admin input.submit {
+.entity_actions a,
+.entity_actions input,
+.entity_actions p {
 border:0;
-padding-left:20px;
+padding-left:23px;
 }
 
-.entity_edit a,
-.entity_send-a-message a,
-.entity_nudge p {
-padding:4px 4px 4px 23px;
+.entity_actions a,
+.entity_actions p {
+padding:1px 4px 1px 26px;
 }
 
 .entity_remote_subscribe {
@@ -687,8 +687,8 @@ margin-bottom:18px;
 
 .entity_send-a-message button {
 position:absolute;
-top:0;
-right:0;
+top:3px;
+right:3px;
 }
 
 .entity_send-a-message .form_notice {
@@ -700,7 +700,7 @@ width:65%;
 z-index:2;
  border-radius:7px;
 -moz-border-radius:7px;
--webkit-radius-border:7px;
+-webkit-border-radius:7px;
 border-width:1px;
 border-style:solid;
 }
@@ -973,11 +973,14 @@ border:0;
 .notice-options .notice_reply,
 .notice-options .notice_delete {
 text-decoration:none;
-padding-left:16px;
 }
 .notice-options form input.submit {
 width:16px;
-padding:2px 0;
+height:16px;
+padding:0;
+border-radius:0;
+-moz-border-radius:0;
+-webkit-border-radius:0;
 }
 .notice-options .form_favor legend,
 .notice-options .form_disfavor legend {
@@ -988,6 +991,10 @@ display:none;
 border:0;
 padding:0;
 }
+.notice-options a {
+width:16px;
+height:16px;
+}
 
 .notice .attachment {
 position:relative;
diff --git a/theme/base/images/icons/icons-01.gif b/theme/base/images/icons/icons-01.gif
new file mode 100644
index 000000000..f19d6a3f6
--- /dev/null
+++ b/theme/base/images/icons/icons-01.gif
diff --git a/theme/base/images/icons/icons-01.png b/theme/base/images/icons/icons-01.png
deleted file mode 100644
index f83c30177..000000000
--- a/theme/base/images/icons/icons-01.png
+++ /dev/null
diff --git a/theme/base/images/icons/twotone/green/minus.gif b/theme/base/images/icons/twotone/green/minus.gif
new file mode 100644
index 000000000..461cd8cb2
--- /dev/null
+++ b/theme/base/images/icons/twotone/green/minus.gif
diff --git a/theme/base/images/icons/twotone/green/plus.gif b/theme/base/images/icons/twotone/green/plus.gif
new file mode 100644
index 000000000..4407d0b2d
--- /dev/null
+++ b/theme/base/images/icons/twotone/green/plus.gif
diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index 910f915a8..fee5316c1 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -29,7 +29,9 @@ input, textarea, select,
 border-color:#AAAAAA;
 }
 #filter_tags ul li,
-.entity_send-a-message .form_notice {
+.entity_send-a-message .form_notice,
+.pagination .nav_prev a,
+.pagination .nav_next a {
 border-color:#DDDDDD;
 }
 
@@ -40,33 +42,47 @@ background:none;
 input.submit,
 .form_notice.warning #notice_text-count,
 .form_settings .form_note,
-.entity_remote_subscribe {
+.entity_remote_subscribe,
+.entity_actions .form_notice input.submit {
 background-color:#9BB43E;
 }
-
-input:focus, textarea:focus, select:focus,
-.form_notice.warning #notice_data-text {
-border-color:#9BB43E;
+input.submit,
+.form_notice.warning #notice_text-count,
+.form_settings .form_note,
+.entity_remote_subscribe,
+.entity_actions a,
+.entity_actions input,
+button.close {
+background-color:#9BB43E;
 box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
 -moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
 -webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
 }
-input.submit,
+.entity_actions a,
+.entity_actions input,
+.entity_actions p {
+border-color:transparent;
+background-color:transparent;
+}
+input:focus, textarea:focus, select:focus,
+.form_notice.warning #notice_data-text,
+.form_notice.warning #notice_text-count,
+.form_settings .form_note,
 .entity_remote_subscribe {
+border-color:#9BB43E;
+}
+input.submit,
+.entity_remote_subscribe,
+.entity_actions .form_notice input.submit {
 color:#FFFFFF;
 }
 
 a,
-div.notice-options input,
-.form_user_block input.submit,
-.form_user_unblock input.submit,
-.form_group_block input.submit,
-.form_group_unblock input.submit,
-.entity_send-a-message a,
-.form_user_nudge input.submit,
-.entity_nudge p,
 .form_settings input.form_action-primary,
-.form_make_admin input.submit {
+.notice-options input,
+.entity_actions a,
+.entity_actions input,
+.entity_actions p {
 color:#002FA7;
 }
 
@@ -116,8 +132,12 @@ opacity:0;
 #new_group a,
 .pagination .nav_prev a,
 .pagination .nav_next a,
-button.close {
-background-image:url(../../base/images/icons/icons-01.png);
+button.close,
+.form_group_leave input.submit,
+.form_user_unsubscribe input.submit,
+.form_group_join input.submit,
+.form_user_subscribe input.submit {
+background-image:url(../../base/images/icons/icons-01.gif);
 background-repeat:no-repeat;
 background-color:transparent;
 }
@@ -195,23 +215,26 @@ background-position:0 1px;
 }
 
 .form_group_join input.submit,
-.form_group_leave input.submit
+.form_group_leave input.submit,
 .form_user_subscribe input.submit,
 .form_user_unsubscribe input.submit {
-background-color:#9BB43E;
+background-color:#AAAAAA;
 color:#FFFFFF;
 }
-.form_user_unsubscribe input.submit,
 .form_group_leave input.submit,
-.form_user_authorization input.reject {
-background-color:#87B4C8;
+.form_user_unsubscribe input.submit {
+background-position:5px -1246px;
+}
+.form_group_join input.submit,
+.form_user_subscribe input.submit {
+background-position:5px -1181px;
 }
 
 .entity_edit a {
-background-position: 0 -718px;
+background-position: 5px -718px;
 }
 .entity_send-a-message a {
-background-position: 0 -849px;
+background-position: 5px -852px;
 }
 .entity_send-a-message .form_notice {
 box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7);
@@ -221,16 +244,16 @@ box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7);
 
 .entity_nudge p,
 .form_user_nudge input.submit {
-background-position: 0 -785px;
+background-position: 5px -785px;
 }
 .form_user_block input.submit,
 .form_user_unblock input.submit,
 .form_group_block input.submit,
 .form_group_unblock input.submit {
-background-position: 0 -918px;
+background-position: 5px -918px;
 }
 .form_make_admin input.submit {
-background-position: 0 -983px;
+background-position: 5px -983px;
 }
 
 /* NOTICES */
@@ -241,16 +264,16 @@ background-position:0 -394px;
 background:none;
 }
 .notice-options .notice_reply {
-background-position:0 -589px;
+background-position:0 -592px;
 }
 .notice-options form.form_favor input.submit {
-background-position:0 -457px;
+background-position:0 -460px;
 }
 .notice-options form.form_disfavor input.submit {
-background-position:0 -523px;
+background-position:0 -526px;
 }
 .notice-options .notice_delete {
-background-position:0 -655px;
+background-position:0 -658px;
 }
 
 .notices div.entry-content,
@@ -261,9 +284,12 @@ opacity:0.4;
 .notices li:hover div.notice-options {
 opacity:1;
 }
-div.notice-options a,
-div.notice-options input {
+.notice-options a,
+.notice-options input {
 font-family:sans-serif;
+box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
+-moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
+-webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
 }
 #content .notices li:hover {
 background-color:rgba(240, 240, 240, 0.2);
@@ -293,7 +319,9 @@ background-position:0 -1054px;
 .pagination .nav_prev a,
 .pagination .nav_next a {
 background-repeat:no-repeat;
-border-color:#C8D1D5;
+box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
+-moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
+-webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
 }
 .pagination .nav_prev a {
 background-position:10% -187px;
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 2aa087331..ae9cb2b19 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -29,7 +29,9 @@ input, textarea, select,
 border-color:#AAAAAA;
 }
 #filter_tags ul li,
-.entity_send-a-message .form_notice {
+.entity_send-a-message .form_notice,
+.pagination .nav_prev a,
+.pagination .nav_next a {
 border-color:#DDDDDD;
 }
 
@@ -40,33 +42,46 @@ background:none;
 input.submit,
 .form_notice.warning #notice_text-count,
 .form_settings .form_note,
-.entity_remote_subscribe {
+.entity_remote_subscribe,
+.entity_actions .form_notice input.submit {
 background-color:#9BB43E;
 }
-
-input:focus, textarea:focus, select:focus,
-.form_notice.warning #notice_data-text {
-border-color:#9BB43E;
+input.submit,
+.form_notice.warning #notice_text-count,
+.form_settings .form_note,
+.entity_remote_subscribe,
+.entity_actions a,
+.entity_actions input,
+button.close {
 box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
 -moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
 -webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
 }
-input.submit,
+.entity_actions a,
+.entity_actions input,
+.entity_actions p {
+border-color:transparent;
+background-color:transparent;
+}
+input:focus, textarea:focus, select:focus,
+.form_notice.warning #notice_data-text,
+.form_notice.warning #notice_text-count,
+.form_settings .form_note,
 .entity_remote_subscribe {
+border-color:#9BB43E;
+}
+input.submit,
+.entity_remote_subscribe,
+.entity_actions .form_notice input.submit {
 color:#FFFFFF;
 }
 
 a,
-div.notice-options input,
-.form_user_block input.submit,
-.form_user_unblock input.submit,
-.form_group_block input.submit,
-.form_group_unblock input.submit,
-.entity_send-a-message a,
-.form_user_nudge input.submit,
-.entity_nudge p,
 .form_settings input.form_action-primary,
-.form_make_admin input.submit {
+.notice-options input,
+.entity_actions a,
+.entity_actions input,
+.entity_actions p {
 color:#002FA7;
 }
 
@@ -116,8 +131,13 @@ opacity:0;
 #new_group a,
 .pagination .nav_prev a,
 .pagination .nav_next a,
-button.close {
-background-image:url(../../base/images/icons/icons-01.png);
+button.close,
+.form_group_leave input.submit,
+.form_user_unsubscribe input.submit,
+.form_group_join input.submit,
+.form_user_subscribe input.submit,
+.entity_subscribe a {
+background-image:url(../../base/images/icons/icons-01.gif);
 background-repeat:no-repeat;
 background-color:transparent;
 }
@@ -195,23 +215,28 @@ background-position:0 1px;
 }
 
 .form_group_join input.submit,
-.form_group_leave input.submit
+.form_group_leave input.submit,
 .form_user_subscribe input.submit,
-.form_user_unsubscribe input.submit {
-background-color:#9BB43E;
+.form_user_unsubscribe input.submit,
+.entity_subscribe a {
+background-color:#AAAAAA;
 color:#FFFFFF;
 }
-.form_user_unsubscribe input.submit,
 .form_group_leave input.submit,
-.form_user_authorization input.reject {
-background-color:#87B4C8;
+.form_user_unsubscribe input.submit {
+background-position:5px -1246px;
+}
+.form_group_join input.submit,
+.form_user_subscribe input.submit,
+.entity_subscribe a {
+background-position:5px -1181px;
 }
 
 .entity_edit a {
-background-position: 0 -718px;
+background-position: 5px -718px;
 }
 .entity_send-a-message a {
-background-position: 0 -849px;
+background-position: 5px -852px;
 }
 .entity_send-a-message .form_notice {
 box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7);
@@ -221,16 +246,16 @@ box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7);
 
 .entity_nudge p,
 .form_user_nudge input.submit {
-background-position: 0 -785px;
+background-position: 5px -785px;
 }
 .form_user_block input.submit,
 .form_user_unblock input.submit,
 .form_group_block input.submit,
 .form_group_unblock input.submit {
-background-position: 0 -918px;
+background-position: 5px -918px;
 }
 .form_make_admin input.submit {
-background-position: 0 -983px;
+background-position: 5px -983px;
 }
 
 /* NOTICES */
@@ -241,16 +266,16 @@ background-position:0 -394px;
 background:none;
 }
 .notice-options .notice_reply {
-background-position:0 -589px;
+background-position:0 -592px;
 }
 .notice-options form.form_favor input.submit {
-background-position:0 -457px;
+background-position:0 -460px;
 }
 .notice-options form.form_disfavor input.submit {
-background-position:0 -523px;
+background-position:0 -526px;
 }
 .notice-options .notice_delete {
-background-position:0 -655px;
+background-position:0 -658px;
 }
 
 .notices div.entry-content,
@@ -261,9 +286,12 @@ opacity:0.4;
 .notices li:hover div.notice-options {
 opacity:1;
 }
-div.notice-options a,
-div.notice-options input {
+.notice-options a,
+.notice-options input {
 font-family:sans-serif;
+box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
+-moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
+-webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
 }
 #content .notices li:hover {
 background-color:rgba(240, 240, 240, 0.2);
@@ -293,7 +321,9 @@ background-position:0 -1054px;
 .pagination .nav_prev a,
 .pagination .nav_next a {
 background-repeat:no-repeat;
-border-color:#CEE1E9;
+box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
+-moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
+-webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
 }
 .pagination .nav_prev a {
 background-position:10% -187px;
author	Evan Prodromou <evan@status.net>	2009-11-08 17:06:41 -0500
committer	Evan Prodromou <evan@status.net>	2009-11-08 17:06:41 -0500
commit	111f6a775daf9334adb05c9f8e539d682238f4dd (patch)
tree	ce98d1968560538272e53a79ef4551b194eb1ab8
parent	b7e2e3fd2b7e36f75c810a599334c2ca8abcca55 (diff)
parent	da444f8a15043f326aa9a629ba5f0b25bc35b1e5 (diff)