From b139be6caf39628834ca34f5f7e58c1e08a3ebf3 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <shiny@cpan.org>
Date: Wed, 9 Dec 2009 13:09:38 +1300
Subject: [PATCH 01/62] added missing table: location_namespace

---
 db/08to09_pg.sql    | 10 ++++++++++
 db/statusnet_pg.sql | 10 ++++++++++
 2 files changed, 20 insertions(+)

diff --git a/db/08to09_pg.sql b/db/08to09_pg.sql
index 0bd47dea56..ee590b52f9 100644
--- a/db/08to09_pg.sql
+++ b/db/08to09_pg.sql
@@ -39,6 +39,16 @@ create table profile_role (
 
 );
 
+create table location_namespace (
+
+    id integer /*comment 'identity for this namespace'*/,
+    description text /* comment 'description of the namespace'*/ ,
+    created integer not null /*comment 'date the record was created*/ ,
+   /* modified timestamp comment 'date this record was modified',*/
+    primary key (id)
+
+);
+
 create table login_token (
     user_id integer not null /* comment 'user owning this token'*/ references "user" (id),
     token char(32) not null /* comment 'token useable for logging in'*/,
diff --git a/db/statusnet_pg.sql b/db/statusnet_pg.sql
index 81b329d1e5..92546c814d 100644
--- a/db/statusnet_pg.sql
+++ b/db/statusnet_pg.sql
@@ -572,6 +572,16 @@ create table profile_role (
 
 );
 
+create table location_namespace (
+
+    id integer /*comment 'identity for this namespace'*/,
+    description text /* comment 'description of the namespace'*/ ,
+    created integer not null /*comment 'date the record was created*/ ,
+   /* modified timestamp comment 'date this record was modified',*/
+    primary key (id)
+
+);
+
 create table login_token (
     user_id integer not null /* comment 'user owning this token'*/ references "user" (id),
     token char(32) not null /* comment 'token useable for logging in'*/,

From 3e9c2d779a3d3e014e8900060c3a2632d9e7f138 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <shiny@cpan.org>
Date: Wed, 9 Dec 2009 13:12:29 +1300
Subject: [PATCH 02/62] add missing table "forward"

---
 db/08to09_pg.sql    | 8 ++++++++
 db/statusnet_pg.sql | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/db/08to09_pg.sql b/db/08to09_pg.sql
index ee590b52f9..4f8281bc3e 100644
--- a/db/08to09_pg.sql
+++ b/db/08to09_pg.sql
@@ -79,3 +79,11 @@ ALTER TABLE profile ADD COLUMN lat decimal(10,7) /*comment 'latitude'*/ ;
 ALTER TABLE profile ADD COLUMN lon decimal(10,7) /*comment 'longitude'*/;
 ALTER TABLE profile ADD COLUMN location_id integer /* comment 'location id if possible'*/;
 ALTER TABLE profile ADD COLUMN location_ns integer /* comment 'namespace for location'*/;
+
+CREATE TABLE forward (
+    profile_id integer not null /*comment 'profile who forwarded the notice'*/ references profile (id),
+    notice_id integer not null /*comment 'notice they forwarded'*/ references notice (id),
+    created timestamp not null /*comment 'date this record was created'*/ DEFAULT CURRENT_TIMESTAMP,
+    PRIMARY KEY (profile_id, notice_id)
+);
+
diff --git a/db/statusnet_pg.sql b/db/statusnet_pg.sql
index 92546c814d..6bcc278859 100644
--- a/db/statusnet_pg.sql
+++ b/db/statusnet_pg.sql
@@ -582,6 +582,8 @@ create table location_namespace (
 
 );
 
+
+
 create table login_token (
     user_id integer not null /* comment 'user owning this token'*/ references "user" (id),
     token char(32) not null /* comment 'token useable for logging in'*/,
@@ -591,3 +593,9 @@ create table login_token (
     primary key (user_id)
 );
 
+CREATE TABLE forward (
+    profile_id integer not null /*comment 'profile who forwarded the notice'*/ references profile (id),
+    notice_id integer not null /*comment 'notice they forwarded'*/ references notice (id),
+    created timestamp not null /*comment 'date this record was created'*/ DEFAULT CURRENT_TIMESTAMP,
+    PRIMARY KEY (profile_id, notice_id)
+);

From 789378838b9a3ad6bff906d70c8316527aed9e98 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <shiny@cpan.org>
Date: Wed, 9 Dec 2009 13:26:59 +1300
Subject: [PATCH 03/62] that pesky table named user - now quoted

---
 classes/Forward.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/classes/Forward.php b/classes/Forward.php
index e9b83a58bf..09b2d6a4ee 100644
--- a/classes/Forward.php
+++ b/classes/Forward.php
@@ -77,7 +77,8 @@ class Forward extends Memcached_DataObject
 
         $user = new User();
 
-        $user->query('SELECT user.* FROM user JOIN subscription ON user.id = subscription.subscriber '.
+        $usertable = common_database_tablename('user');
+        $user->query("SELECT $usertable.* FROM $usertable INNER JOIN subscription ON $usertable.id = subscription.subscriber ".
                      'WHERE subscription.subscribed = '.$this->profile_id);
 
         $ni = array();

From 2f59f0ddb5cc6030671af7e751e0ae85e4751497 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Tue, 8 Dec 2009 17:35:27 -0800
Subject: [PATCH 04/62] Compat fix for PHP 5.2.4 -- drop unneeded new param to
 debug_backtrace(), caused error spew on older PHP (introduced PHP 5.2.5) Fix
 for regression in 4b5e977a7b1c390555d880d3dc7f8b8c6744646c

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

diff --git a/lib/language.php b/lib/language.php
index ab46f1a656..916cee7ed4 100644
--- a/lib/language.php
+++ b/lib/language.php
@@ -153,7 +153,7 @@ if (!function_exists('npgettext')) {
  */
 function _m($msg/*, ...*/)
 {
-    $domain = _mdomain(debug_backtrace(false));
+    $domain = _mdomain(debug_backtrace());
     $args = func_get_args();
     switch(count($args)) {
     case 1: return dgettext($domain, $msg);

From 45408142e9d7431dd4a664262d4806c655cc5c68 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Tue, 8 Dec 2009 21:02:54 -0500
Subject: [PATCH 05/62] reorder notices when not using memcached

---
 classes/Notice.php | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/classes/Notice.php b/classes/Notice.php
index bcd7947bd1..c36c5a9c6b 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -788,10 +788,24 @@ class Notice extends Memcached_DataObject
                 return $notice;
             }
             $notice->whereAdd('id in (' . implode(', ', $ids) . ')');
-            $notice->orderBy('id DESC');
 
             $notice->find();
-            return $notice;
+
+            $temp = array();
+
+            while ($notice->fetch()) {
+                $temp[$notice->id] = clone($notice);
+            }
+
+            $wrapped = array();
+
+            foreach ($ids as $id) {
+                if (array_key_exists($id, $temp)) {
+                    $wrapped[] = $temp[$id];
+                }
+            }
+
+            return new ArrayWrapper($wrapped);
         }
     }
 

From 559415826a234c9d993535bc30f132af1e247160 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Wed, 9 Dec 2009 11:00:30 +0100
Subject: [PATCH 06/62] Added a todo list for Realtime plugin

---
 plugins/Realtime/README | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 plugins/Realtime/README

diff --git a/plugins/Realtime/README b/plugins/Realtime/README
new file mode 100644
index 0000000000..f5e4f91cf3
--- /dev/null
+++ b/plugins/Realtime/README
@@ -0,0 +1,9 @@
+== TODO ==
+* i18n
+* Change in context URL to conversation (try not to construct the URL in JS)
+* Update mark behaviour (on notice send)
+* Pause, Send a notice ~ should not update counter
+* Pause ~ retain up to 50-100 most recent notices
+* Add geo data
+* Make it work for Conversation page (perhaps a little tricky)
+* IE is updating the counter in document title all the time (Not sure if this is still an issue)

From 83830c26e746f9bccb149940ce67904d7e536851 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Wed, 9 Dec 2009 11:37:53 +0100
Subject: [PATCH 07/62] Added todo item to Realtime plugin

---
 plugins/Realtime/README | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/Realtime/README b/plugins/Realtime/README
index f5e4f91cf3..524382696b 100644
--- a/plugins/Realtime/README
+++ b/plugins/Realtime/README
@@ -7,3 +7,5 @@
 * Add geo data
 * Make it work for Conversation page (perhaps a little tricky)
 * IE is updating the counter in document title all the time (Not sure if this is still an issue)
+* Reconsider the timestamp approach
+

From 4db184e5b4843ec15c7b4e48b3461f9d6fd87822 Mon Sep 17 00:00:00 2001
From: Eric Helgeson <erichelgeson@gmail.com>
Date: Wed, 9 Dec 2009 22:31:07 -0500
Subject: [PATCH 08/62] New Events for avatar settings

---
 EVENTS.txt                 |  12 +++++
 actions/avatarsettings.php | 108 +++++++++++++++++++------------------
 2 files changed, 69 insertions(+), 51 deletions(-)

diff --git a/EVENTS.txt b/EVENTS.txt
index e0516f8f45..96250f64c7 100644
--- a/EVENTS.txt
+++ b/EVENTS.txt
@@ -290,6 +290,18 @@ StartRegistrationTry: before validating and saving a new user
 EndRegistrationTry: after saving a new user (note: no profile or user object!)
 - $action: action object being shown
 
+StartAvatarFormData: before displaying avatar form
+- $action: action object being shown
+
+EndAvatarFormData: after displaying avatar form
+- $action: action object being shown
+
+StartAvatarSaveForm: before saving the avatar
+- $action: action object being shown
+
+EndAvatarSaveForm: after saving the avatar
+- $action: action object being shown
+
 StartNewQueueManager: before trying to start a new queue manager; good for plugins implementing new queue manager classes
 - $qm: empty queue manager to set
 
diff --git a/actions/avatarsettings.php b/actions/avatarsettings.php
index 879e44842f..cf45255520 100644
--- a/actions/avatarsettings.php
+++ b/actions/avatarsettings.php
@@ -118,53 +118,56 @@ class AvatarsettingsAction extends AccountSettingsAction
         $this->elementStart('fieldset');
         $this->element('legend', null, _('Avatar settings'));
         $this->hidden('token', common_session_token());
+        
+        if (Event::handle('StartAvatarFormData', array($this))) {
+            $this->elementStart('ul', 'form_data');
+            if ($original) {
+                $this->elementStart('li', array('id' => 'avatar_original',
+                                                'class' => 'avatar_view'));
+                $this->element('h2', null, _("Original"));
+                $this->elementStart('div', array('id'=>'avatar_original_view'));
+                $this->element('img', array('src' => $original->url,
+                                            'width' => $original->width,
+                                            'height' => $original->height,
+                                            'alt' => $user->nickname));
+                $this->elementEnd('div');
+                $this->elementEnd('li');
+            }
 
-        $this->elementStart('ul', 'form_data');
-        if ($original) {
-            $this->elementStart('li', array('id' => 'avatar_original',
-                                            'class' => 'avatar_view'));
-            $this->element('h2', null, _("Original"));
-            $this->elementStart('div', array('id'=>'avatar_original_view'));
-            $this->element('img', array('src' => $original->url,
-                                        'width' => $original->width,
-                                        'height' => $original->height,
-                                        'alt' => $user->nickname));
-            $this->elementEnd('div');
+            $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
+
+            if ($avatar) {
+                $this->elementStart('li', array('id' => 'avatar_preview',
+                                                'class' => 'avatar_view'));
+                $this->element('h2', null, _("Preview"));
+                $this->elementStart('div', array('id'=>'avatar_preview_view'));
+                $this->element('img', array('src' => $original->url,
+                                            'width' => AVATAR_PROFILE_SIZE,
+                                            'height' => AVATAR_PROFILE_SIZE,
+                                            'alt' => $user->nickname));
+                $this->elementEnd('div');
+                $this->submit('delete', _('Delete'));
+                $this->elementEnd('li');
+            }
+
+            $this->elementStart('li', array ('id' => 'settings_attach'));
+            $this->element('input', array('name' => 'avatarfile',
+                                          'type' => 'file',
+                                          'id' => 'avatarfile'));
+            $this->element('input', array('name' => 'MAX_FILE_SIZE',
+                                          'type' => 'hidden',
+                                          'id' => 'MAX_FILE_SIZE',
+                                          'value' => ImageFile::maxFileSizeInt()));
             $this->elementEnd('li');
-        }
+            $this->elementEnd('ul');
 
-        $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
-
-        if ($avatar) {
-            $this->elementStart('li', array('id' => 'avatar_preview',
-                                            'class' => 'avatar_view'));
-            $this->element('h2', null, _("Preview"));
-            $this->elementStart('div', array('id'=>'avatar_preview_view'));
-            $this->element('img', array('src' => $original->url,
-                                        'width' => AVATAR_PROFILE_SIZE,
-                                        'height' => AVATAR_PROFILE_SIZE,
-                                        'alt' => $user->nickname));
-            $this->elementEnd('div');
-            $this->submit('delete', _('Delete'));
+            $this->elementStart('ul', 'form_actions');
+            $this->elementStart('li');
+            $this->submit('upload', _('Upload'));
             $this->elementEnd('li');
+            $this->elementEnd('ul');
         }
-
-        $this->elementStart('li', array ('id' => 'settings_attach'));
-        $this->element('input', array('name' => 'avatarfile',
-                                      'type' => 'file',
-                                      'id' => 'avatarfile'));
-        $this->element('input', array('name' => 'MAX_FILE_SIZE',
-                                      'type' => 'hidden',
-                                      'id' => 'MAX_FILE_SIZE',
-                                      'value' => ImageFile::maxFileSizeInt()));
-        $this->elementEnd('li');
-        $this->elementEnd('ul');
-
-        $this->elementStart('ul', 'form_actions');
-        $this->elementStart('li');
-        $this->submit('upload', _('Upload'));
-        $this->elementEnd('li');
-        $this->elementEnd('ul');
+        Event::handle('EndAvatarFormData', array($this));
 
         $this->elementEnd('fieldset');
         $this->elementEnd('form');
@@ -266,15 +269,18 @@ class AvatarsettingsAction extends AccountSettingsAction
                                'Try again, please.'));
             return;
         }
-
-        if ($this->arg('upload')) {
-            $this->uploadAvatar();
-        } else if ($this->arg('crop')) {
-            $this->cropAvatar();
-        } else if ($this->arg('delete')) {
-            $this->deleteAvatar();
-        } else {
-            $this->showForm(_('Unexpected form submission.'));
+        
+        if (Event::handle('StartAvatarSaveForm', array($this))) {
+            if ($this->arg('upload')) {
+                $this->uploadAvatar();
+                } else if ($this->arg('crop')) {
+                    $this->cropAvatar();
+                } else if ($this->arg('delete')) {
+                    $this->deleteAvatar();
+                } else {
+                    $this->showForm(_('Unexpected form submission.'));
+                }
+            Event::handle('EndAvatarSaveForm', array($this));
         }
     }
 

From 155659dd1fee44c011962432a3e2ef6d523f1a7d Mon Sep 17 00:00:00 2001
From: Eric Helgeson <erichelgeson@gmail.com>
Date: Wed, 9 Dec 2009 22:32:57 -0500
Subject: [PATCH 09/62] Initial GravatarPlugin

---
 plugins/Gravatar/GravatarPlugin.php | 176 ++++++++++++++++++++++++++++
 plugins/Gravatar/README             |  13 ++
 2 files changed, 189 insertions(+)
 create mode 100644 plugins/Gravatar/GravatarPlugin.php
 create mode 100644 plugins/Gravatar/README

diff --git a/plugins/Gravatar/GravatarPlugin.php b/plugins/Gravatar/GravatarPlugin.php
new file mode 100644
index 0000000000..b18f627266
--- /dev/null
+++ b/plugins/Gravatar/GravatarPlugin.php
@@ -0,0 +1,176 @@
+<?php
+/*
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2009, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * @package GravatarPlugin
+ * @maintainer Eric Helgeson <erichelgeson@gmail.com>
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) {
+    // This check helps protect against security problems;
+    // your code file can't be executed directly from the web.
+    exit(1);
+}
+
+class GravatarPlugin extends Plugin
+{
+    function onInitializePlugin() {
+        return true;
+    }
+    
+    function onStartAvatarFormData($action) {
+        $user = common_current_user();
+        $hasGravatar = $this->hasGravatar($user->id);
+        
+        if($hasGravatar) {
+            return false;
+        }
+    }
+    
+    function onEndAvatarFormData(&$action) {
+        $user = common_current_user();
+        $hasGravatar = $this->hasGravatar($user->id);
+
+        if(!empty($user->email) && !$hasGravatar) { //and not gravatar already set
+            $action->elementStart('form', array('method' => 'post',
+                                                'id' => 'form_settings_gravatar_add',
+                                                'class' => 'form_settings',
+                                                'action' =>
+                                                common_local_url('avatarsettings')));
+            $action->elementStart('fieldset', array('id' => 'settings_gravatar_add'));
+            $action->element('legend', null, _m('Set Gravatar'));
+            $action->hidden('token', common_session_token());
+            $action->element('p', 'form_guide',
+                             _m('If you want to use your Gravatar image, click "Add".'));
+            $action->element('input', array('type' => 'submit',
+                                            'id' => 'settings_gravatar_add_action-submit',
+                                            'name' => 'add',
+                                            'class' => 'submit',
+                                            'value' => _m('Add')));
+            $action->elementEnd('fieldset');
+            $action->elementEnd('form');
+        } elseif($hasGravatar) {
+            $action->elementStart('form', array('method' => 'post',
+                                                'id' => 'form_settings_gravatar_remove',
+                                                'class' => 'form_settings',
+                                                'action' =>
+                                                common_local_url('avatarsettings')));
+            $action->elementStart('fieldset', array('id' => 'settings_gravatar_remove'));
+            $action->element('legend', null, _m('Remove Gravatar'));
+            $action->hidden('token', common_session_token());
+            $action->element('p', 'form_guide',
+                             _m('If you want to remove your Gravatar image, click "Remove".'));
+            $action->element('input', array('type' => 'submit',
+                                            'id' => 'settings_gravatar_remove_action-submit',
+                                            'name' => 'remove',
+                                            'class' => 'submit',
+                                            'value' => _m('Remove')));
+            $action->elementEnd('fieldset');
+            $action->elementEnd('form');
+        } else {
+            $action->element('p', 'form_guide',
+                             _m('To use a Gravatar first enter in an email address.'));
+        }
+    }
+    
+    function onStartAvatarSaveForm($action) {
+        if ($action->arg('add')) {
+            $result = $this->gravatar_save();
+            $action->showForm($result['message'], $result['success']);
+            return false;
+        } else if ($action->arg('remove')) {
+            $result = $this->gravatar_remove();
+            $action->showForm($result['message'], $result['success']);
+            return false;
+        } else {
+            return true;
+        }
+    }
+
+    function hasGravatar($id) {
+        $avatar = new Avatar();
+        $avatar->profile_id = $id;
+        if ($avatar->find()) {
+            while ($avatar->fetch()) {
+                if($avatar->filename == null) {
+                    return true;
+                }
+            }
+        }
+        return false;
+     }
+ 
+
+    function gravatar_save()
+    {
+        $cur = common_current_user();
+        
+        if(empty($cur->email)) {
+            return array('message' => _m('You do not have a email set in your profile.'),
+                         'success' => false);
+        }
+        //Get rid of previous Avatar
+        $this->gravatar_remove();
+        
+        foreach (array(AVATAR_PROFILE_SIZE, AVATAR_STREAM_SIZE, AVATAR_MINI_SIZE) as $size) {
+            $gravatar = new Avatar();
+            $gravatar->profile_id = $cur->id;
+            $gravatar->width = $size;
+            $gravatar->height = $size;
+            $gravatar->original = false; //No file, so no original
+            $gravatar->mediatype = 'img';//XXX: Unsure what to put here
+            //$gravatar->filename = null;//No filename. Remote
+            $gravatar->url = $this->gravatar_url($cur->email, $size);
+            $gravatar->created = DB_DataObject_Cast::dateTime(); # current time
+
+            if (!$gravatar->insert()) {
+                return array('message' => _m('Failed to save Gravatar to the DB.'),
+                             'success' => false);
+            }
+        }
+        return array('message' => _m('Gravatar added.'),
+                     'success' => true);
+     }
+
+    function gravatar_remove()
+    {
+        $user = common_current_user();
+        $profile = $user->getProfile();
+
+        $avatar = $profile->getOriginalAvatar();
+        if($avatar) $avatar->delete();
+        $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
+        if($avatar) $avatar->delete();
+        $avatar = $profile->getAvatar(AVATAR_STREAM_SIZE);
+        if($avatar) $avatar->delete();
+        $avatar = $profile->getAvatar(AVATAR_MINI_SIZE);
+        if($avatar) $avatar->delete();
+
+        return array('message' => _m('Gravatar removed.'),
+                     'success' => true);
+    }
+ 
+    function gravatar_url($email, $size) {
+        $url = "http://www.gravatar.com/avatar.php?gravatar_id=".
+                md5(strtolower($email)).
+                "&default=".urlencode(Avatar::defaultImage($size)).
+                "&size=".$size;
+            return $url;
+    }
+}
diff --git a/plugins/Gravatar/README b/plugins/Gravatar/README
new file mode 100644
index 0000000000..9337e24a0a
--- /dev/null
+++ b/plugins/Gravatar/README
@@ -0,0 +1,13 @@
+GravatarPlugin 0.1
+
+About
+This will allow users to use their Gravatar Avatar with your StatusNet install.
+
+Configuration
+add this to your config.php:
+addPlugin('Gravatar', array());
+
+ToDo:
+Site default all on for gravatar by default
+Migration Script
+Localize
\ No newline at end of file

From 1e166e1bc4a8b16ad2ef8e99db6a112f47803eda Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Thu, 10 Dec 2009 14:16:07 +0100
Subject: [PATCH 10/62] Updated FormNoticeEnhancements and Counter to use the
 max text value from HTML. It also allows each .form_notice to have its own
 counter.

---
 js/util.js          | 38 ++++++++++++++++++++++----------------
 lib/messageform.php |  2 --
 lib/noticeform.php  |  2 --
 3 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/js/util.js b/js/util.js
index 67df73507b..60865d3520 100644
--- a/js/util.js
+++ b/js/util.js
@@ -57,21 +57,28 @@ var SN = { // StatusNet
     U: { // Utils
         FormNoticeEnhancements: function(form) {
             form_id = form.attr('id');
-            $('#'+form_id+' #'+SN.C.S.NoticeDataText).unbind('keyup');
-            $('#'+form_id+' #'+SN.C.S.NoticeDataText).unbind('keydown');
-            if (maxLength > 0) {
-                $('#'+form_id+' #'+SN.C.S.NoticeDataText).bind('keyup', function(e) {
+
+            if (jQuery.data(form[0], 'ElementData') === undefined) {
+                MaxLength = $('#'+form_id+' #'+SN.C.S.NoticeTextCount).text();
+                if (typeof(MaxLength) == 'undefined') {
+                     MaxLength = SN.C.I.MaxLength;
+                }
+                jQuery.data(form[0], 'ElementData', {MaxLength:MaxLength});
+
+                SN.U.Counter(form);
+
+                NDT = $('#'+form_id+' #'+SN.C.S.NoticeDataText);
+
+                NDT.bind('keyup', function(e) {
                     SN.U.Counter(form);
                 });
-                // run once in case there's something in there
-                SN.U.Counter(form);
+
+                NDT.bind('keydown', function(e) {
+                    SN.U.SubmitOnReturn(e, form);
+                });
             }
 
-            $('#'+form_id+' #'+SN.C.S.NoticeDataText).bind('keydown', function(e) {
-                SN.U.SubmitOnReturn(e, form);
-            });
-
-            if($('body')[0].id != 'conversation') {
+            if ($('body')[0].id != 'conversation') {
                 $('#'+form_id+' textarea').focus();
             }
         },
@@ -91,15 +98,14 @@ var SN = { // StatusNet
         Counter: function(form) {
             SN.C.I.FormNoticeCurrent = form;
             form_id = form.attr('id');
-            if (typeof(maxLength) == "undefined") {
-                 maxLength = SN.C.I.MaxLength;
-            }
 
-            if (maxLength <= 0) {
+            var MaxLength = jQuery.data(form[0], 'ElementData').MaxLength;
+
+            if (MaxLength <= 0) {
                 return;
             }
 
-            var remaining = maxLength - $('#'+form_id+' #'+SN.C.S.NoticeDataText).val().length;
+            var remaining = MaxLength - $('#'+form_id+' #'+SN.C.S.NoticeDataText).val().length;
             var counter = $('#'+form_id+' #'+SN.C.S.NoticeTextCount);
 
             if (remaining.toString() != counter.text()) {
diff --git a/lib/messageform.php b/lib/messageform.php
index 4df193c6d1..0c568e1bd8 100644
--- a/lib/messageform.php
+++ b/lib/messageform.php
@@ -154,8 +154,6 @@ class MessageForm extends Form
 
         $contentLimit = Message::maxContent();
 
-        $this->out->inlineScript('maxLength = ' . $contentLimit . ';');
-
         if ($contentLimit > 0) {
             $this->out->elementStart('dl', 'form_note');
             $this->out->element('dt', null, _('Available characters'));
diff --git a/lib/noticeform.php b/lib/noticeform.php
index 0dd3f2d777..593a1e9322 100644
--- a/lib/noticeform.php
+++ b/lib/noticeform.php
@@ -178,8 +178,6 @@ class NoticeForm extends Form
 
             $contentLimit = Notice::maxContent();
 
-            $this->out->inlineScript('maxLength = ' . $contentLimit . ';');
-
             if ($contentLimit > 0) {
                 $this->out->elementStart('dl', 'form_note');
                 $this->out->element('dt', null, _('Available characters'));

From b2a16407ca75a9bbe43fea74ff250bb70ba41140 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Thu, 10 Dec 2009 14:24:23 +0100
Subject: [PATCH 11/62] Updated entity_action form input styles

---
 theme/base/css/display.css     |  3 ++-
 theme/default/css/display.css  | 13 +++++++------
 theme/identica/css/display.css | 13 +++++++------
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index f622f35caf..e9dca8d02f 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -686,7 +686,8 @@ border-radius:4px;
 .entity_actions a,
 .entity_actions input,
 .entity_actions p {
-border:0;
+border-width:2px;
+border-style:solid;
 padding-left:23px;
 }
 
diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index d11bbe15e3..2d19b13a8c 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -87,11 +87,15 @@ input:focus, textarea:focus, select:focus,
 border-color:#9BB43E;
 }
 input.submit,
-.entity_remote_subscribe,
-.entity_actions .form_notice input.submit {
+.entity_remote_subscribe {
 color:#FFFFFF;
 }
-input.submit {
+.entity_actions input.submit {
+border-color:transparent;
+text-shadow:none;
+}
+input.submit,
+.form_notice input.submit {
 background:#AAAAAA url(../../base/images/illustrations/illu_pattern-01.png) 0 0 repeat-x;
 text-shadow:0 1px 0 #FFFFFF;
 color:#000000;
@@ -109,9 +113,6 @@ box-shadow:3px 3px 3px rgba(194, 194, 194, 0.1);
 -webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.1);
 text-shadow:none;
 }
-.entity_actions input.submit {
-text-shadow:none;
-}
 
 a,
 .form_settings input.form_action-primary,
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index d65ea2ef63..9b90d636aa 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -87,11 +87,15 @@ input:focus, textarea:focus, select:focus,
 border-color:#9BB43E;
 }
 input.submit,
-.entity_remote_subscribe,
-.entity_actions .form_notice input.submit {
+.entity_remote_subscribe {
 color:#FFFFFF;
 }
-input.submit {
+.entity_actions input.submit {
+border-color:transparent;
+text-shadow:none;
+}
+input.submit,
+.form_notice input.submit {
 background:#AAAAAA url(../../base/images/illustrations/illu_pattern-01.png) 0 0 repeat-x;
 text-shadow:0 1px 0 #FFFFFF;
 color:#000000;
@@ -109,9 +113,6 @@ box-shadow:3px 3px 3px rgba(194, 194, 194, 0.1);
 -webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.1);
 text-shadow:none;
 }
-.entity_actions input.submit {
-text-shadow:none;
-}
 
 a,
 .form_settings input.form_action-primary,

From c855907f5943260a2b9740948a33f4170f3dda62 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Thu, 10 Dec 2009 14:29:27 +0100
Subject: [PATCH 12/62] Calling NewDirectMessage

---
 js/util.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/js/util.js b/js/util.js
index 60865d3520..66d66c1547 100644
--- a/js/util.js
+++ b/js/util.js
@@ -463,6 +463,8 @@ var SN = { // StatusNet
                 $('.form_group_join').each(function() { SN.U.FormXHR($(this)); });
                 $('.form_group_leave').each(function() { SN.U.FormXHR($(this)); });
                 $('.form_user_nudge').each(function() { SN.U.FormXHR($(this)); });
+
+                SN.U.NewDirectMessage();
             }
         }
     }

From 61023d42d33f51b6ad24de23adbb1cefe7d8a32d Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Thu, 10 Dec 2009 14:33:31 +0100
Subject: [PATCH 13/62] Updated input background colour for XHR direct message

---
 theme/default/css/display.css  | 3 +--
 theme/identica/css/display.css | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index 2d19b13a8c..fc97101bb5 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -57,8 +57,7 @@ background:none;
 
 .form_notice.warning #notice_text-count,
 .form_settings .form_note,
-.entity_remote_subscribe,
-.entity_actions .form_notice input.submit {
+.entity_remote_subscribe {
 background-color:#9BB43E;
 }
 input.submit,
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 9b90d636aa..728ca97334 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -57,8 +57,7 @@ background:none;
 
 .form_notice.warning #notice_text-count,
 .form_settings .form_note,
-.entity_remote_subscribe,
-.entity_actions .form_notice input.submit {
+.entity_remote_subscribe {
 background-color:#9BB43E;
 }
 input.submit,

From c0aad854f7f17cf817f488e0f2ee57303ff75305 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Thu, 10 Dec 2009 14:52:05 +0100
Subject: [PATCH 14/62] If ElementData is set on the notice form, use the
 existing MaxLength

---
 js/util.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/js/util.js b/js/util.js
index 66d66c1547..71514324b1 100644
--- a/js/util.js
+++ b/js/util.js
@@ -77,6 +77,9 @@ var SN = { // StatusNet
                     SN.U.SubmitOnReturn(e, form);
                 });
             }
+            else {
+                $('#'+form_id+' #'+SN.C.S.NoticeTextCount).text(jQuery.data(form[0], 'ElementData').MaxLength);
+            }
 
             if ($('body')[0].id != 'conversation') {
                 $('#'+form_id+' textarea').focus();

From b07e1143cc8f07bf0613835debe08be227970c73 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Thu, 10 Dec 2009 13:08:24 -0500
Subject: [PATCH 15/62] Override login_token's sequenceKey() so that it behaves
 correctly

---
 classes/Login_token.php | 13 +++++++++++++
 lib/command.php         |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/classes/Login_token.php b/classes/Login_token.php
index c172b30abc..746cd7f229 100644
--- a/classes/Login_token.php
+++ b/classes/Login_token.php
@@ -39,4 +39,17 @@ class Login_token extends Memcached_DataObject
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
+
+    /*
+    DB_DataObject calculates the sequence key(s) by taking the first key returned by the keys() function.
+    In this case, the keys() function returns user_id as the first key. user_id is not a sequence, but
+    DB_DataObject's sequenceKey() will incorrectly think it is. Then, since the sequenceKey() is a numeric
+    type, but is not set to autoincrement in the database, DB_DataObject will create a _seq table and
+    manage the sequence itself. This is not the correct behavior for the user_id in this class.
+    So we override that incorrect behavior, and simply say there is no sequence key.
+    */
+    function sequenceKey()
+    {
+        return array(false,false);
+    }
 }
diff --git a/lib/command.php b/lib/command.php
index e2a6655111..af8855a7f2 100644
--- a/lib/command.php
+++ b/lib/command.php
@@ -584,7 +584,7 @@ class LoginCommand extends Command
     function execute($channel)
     {
         $disabled = common_config('logincommand','disabled');
-        if(isset($disabled)) {
+        if(isset($disabled) && $disabled) {
             $channel->error($this->user, _('Login command is disabled'));
             return;
         }

From b36ec6da87056324ce0cdf98a4745cdc992c5d52 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Thu, 10 Dec 2009 13:22:46 -0500
Subject: [PATCH 16/62] Fixed incorrect disabling of login_token.

---
 actions/login.php | 3 ++-
 lib/command.php   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/actions/login.php b/actions/login.php
index a6f86c0ca1..c775fa6924 100644
--- a/actions/login.php
+++ b/actions/login.php
@@ -77,12 +77,13 @@ class LoginAction extends Action
         parent::handle($args);
 
         $disabled = common_config('logincommand','disabled');
+        $disabled = isset($disabled) && $disabled;
 
         if (common_is_real_login()) {
             $this->clientError(_('Already logged in.'));
         } else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
             $this->checkLogin();
-        } else if (!isset($disabled) && isset($args['user_id']) && isset($args['token'])){
+        } else if (!$disabled && isset($args['user_id']) && isset($args['token'])){
             $this->checkLogin($args['user_id'],$args['token']);
         } else {
             common_ensure_session();
diff --git a/lib/command.php b/lib/command.php
index af8855a7f2..450db9da37 100644
--- a/lib/command.php
+++ b/lib/command.php
@@ -584,7 +584,8 @@ class LoginCommand extends Command
     function execute($channel)
     {
         $disabled = common_config('logincommand','disabled');
-        if(isset($disabled) && $disabled) {
+        $disabled = isset($disabled) && $disabled;
+        if($disabled) {
             $channel->error($this->user, _('Login command is disabled'));
             return;
         }

From 144faade3b3d366fc6f3a254ce6b1c36bd4f4cdb Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Thu, 10 Dec 2009 13:31:16 -0500
Subject: [PATCH 17/62] move forwarding stuff to Repeat plugin

---
 {classes => plugins/Repeat}/Forward.php | 0
 {actions => plugins/Repeat}/forward.php | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename {classes => plugins/Repeat}/Forward.php (100%)
 rename {actions => plugins/Repeat}/forward.php (100%)

diff --git a/classes/Forward.php b/plugins/Repeat/Forward.php
similarity index 100%
rename from classes/Forward.php
rename to plugins/Repeat/Forward.php
diff --git a/actions/forward.php b/plugins/Repeat/forward.php
similarity index 100%
rename from actions/forward.php
rename to plugins/Repeat/forward.php

From 198e413a58f8aa3d07ce5da365f6c47ce98ab2c0 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Thu, 10 Dec 2009 13:34:11 -0500
Subject: [PATCH 18/62] move inbox notice list to repeat plugin

---
 actions/all.php                    | 86 +-----------------------------
 plugins/Repeat/inboxnoticelist.php | 85 +++++++++++++++++++++++++++++
 2 files changed, 86 insertions(+), 85 deletions(-)
 create mode 100644 plugins/Repeat/inboxnoticelist.php

diff --git a/actions/all.php b/actions/all.php
index 2c96298faf..08fbacaef1 100644
--- a/actions/all.php
+++ b/actions/all.php
@@ -144,7 +144,7 @@ class AllAction extends ProfileAction
 
     function showContent()
     {
-        $nl = new InboxNoticeList($this->notice, $this->user, $this);
+        $nl = new NoticeList($this->notice, $this->user, $this);
 
         $cnt = $nl->show();
 
@@ -168,87 +168,3 @@ class AllAction extends ProfileAction
         }
     }
 }
-
-class InboxNoticeList extends NoticeList
-{
-    var $owner = null;
-
-    function __construct($notice, $owner, $out=null)
-    {
-        parent::__construct($notice, $out);
-        $this->owner  = $owner;
-    }
-
-    function newListItem($notice)
-    {
-        return new InboxNoticeListItem($notice, $this->owner, $this->out);
-    }
-}
-
-class InboxNoticeListItem extends NoticeListItem
-{
-    var $owner = null;
-    var $ib    = null;
-
-    function __construct($notice, $owner, $out=null)
-    {
-        parent::__construct($notice, $out);
-        $this->owner = $owner;
-
-        $this->ib = Notice_inbox::pkeyGet(array('user_id' => $owner->id,
-                                                'notice_id' => $notice->id));
-    }
-
-    function showAuthor()
-    {
-        parent::showAuthor();
-        if ($this->ib->source == NOTICE_INBOX_SOURCE_FORWARD) {
-            $this->out->element('span', 'forward', _('Fwd'));
-        }
-    }
-
-    function showEnd()
-    {
-        if ($this->ib->source == NOTICE_INBOX_SOURCE_FORWARD) {
-
-            $forward = new Forward();
-
-            // FIXME: scary join!
-
-            $forward->query('SELECT profile_id '.
-                            'FROM forward JOIN subscription ON forward.profile_id = subscription.subscribed '.
-                            'WHERE subscription.subscriber = ' . $this->owner->id . ' '.
-                            'AND forward.notice_id = ' . $this->notice->id . ' '.
-                            'ORDER BY forward.created ');
-
-            $n = 0;
-
-            $firstForwarder = null;
-
-            while ($forward->fetch()) {
-                if (empty($firstForwarder)) {
-                    $firstForwarder = Profile::staticGet('id', $forward->profile_id);
-                }
-                $n++;
-            }
-
-            $forward->free();
-            unset($forward);
-
-            $this->out->elementStart('span', 'forwards');
-
-            $link = XMLStringer::estring('a', array('href' => $firstForwarder->profileurl),
-                                         $firstForwarder->nickname);
-
-            if ($n == 1) {
-                $this->out->raw(sprintf(_('Forwarded by %s'), $link));
-            } else {
-                // XXX: use that cool ngettext thing
-                $this->out->raw(sprintf(_('Forwarded by %s and %d other(s)'), $link, $n - 1));
-            }
-
-            $this->out->elementEnd('span');
-        }
-        parent::showEnd();
-    }
-}
diff --git a/plugins/Repeat/inboxnoticelist.php b/plugins/Repeat/inboxnoticelist.php
new file mode 100644
index 0000000000..809fbe8af9
--- /dev/null
+++ b/plugins/Repeat/inboxnoticelist.php
@@ -0,0 +1,85 @@
+<?php
+
+class InboxNoticeList extends NoticeList
+{
+    var $owner = null;
+
+    function __construct($notice, $owner, $out=null)
+    {
+        parent::__construct($notice, $out);
+        $this->owner  = $owner;
+    }
+
+    function newListItem($notice)
+    {
+        return new InboxNoticeListItem($notice, $this->owner, $this->out);
+    }
+}
+
+class InboxNoticeListItem extends NoticeListItem
+{
+    var $owner = null;
+    var $ib    = null;
+
+    function __construct($notice, $owner, $out=null)
+    {
+        parent::__construct($notice, $out);
+        $this->owner = $owner;
+
+        $this->ib = Notice_inbox::pkeyGet(array('user_id' => $owner->id,
+                                                'notice_id' => $notice->id));
+    }
+
+    function showAuthor()
+    {
+        parent::showAuthor();
+        if ($this->ib->source == NOTICE_INBOX_SOURCE_FORWARD) {
+            $this->out->element('span', 'forward', _('Fwd'));
+        }
+    }
+
+    function showEnd()
+    {
+        if ($this->ib->source == NOTICE_INBOX_SOURCE_FORWARD) {
+
+            $forward = new Forward();
+
+            // FIXME: scary join!
+
+            $forward->query('SELECT profile_id '.
+                            'FROM forward JOIN subscription ON forward.profile_id = subscription.subscribed '.
+                            'WHERE subscription.subscriber = ' . $this->owner->id . ' '.
+                            'AND forward.notice_id = ' . $this->notice->id . ' '.
+                            'ORDER BY forward.created ');
+
+            $n = 0;
+
+            $firstForwarder = null;
+
+            while ($forward->fetch()) {
+                if (empty($firstForwarder)) {
+                    $firstForwarder = Profile::staticGet('id', $forward->profile_id);
+                }
+                $n++;
+            }
+
+            $forward->free();
+            unset($forward);
+
+            $this->out->elementStart('span', 'forwards');
+
+            $link = XMLStringer::estring('a', array('href' => $firstForwarder->profileurl),
+                                         $firstForwarder->nickname);
+
+            if ($n == 1) {
+                $this->out->raw(sprintf(_('Forwarded by %s'), $link));
+            } else {
+                // XXX: use that cool ngettext thing
+                $this->out->raw(sprintf(_('Forwarded by %s and %d other(s)'), $link, $n - 1));
+            }
+
+            $this->out->elementEnd('span');
+        }
+        parent::showEnd();
+    }
+}

From 37b0852fdb8b82741b327af57d898d4d89c2f177 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Thu, 10 Dec 2009 14:33:15 -0500
Subject: [PATCH 19/62] move forward form to plugin

---
 lib/noticelist.php                      | 21 ---------------------
 {lib => plugins/Repeat}/forwardform.php |  0
 2 files changed, 21 deletions(-)
 rename {lib => plugins/Repeat}/forwardform.php (100%)

diff --git a/lib/noticelist.php b/lib/noticelist.php
index d6ffc9ca9c..21cec528ff 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -212,7 +212,6 @@ class NoticeListItem extends Widget
             $this->out->elementStart('div', 'notice-options');
             $this->showFaveForm();
             $this->showReplyLink();
-            $this->showForwardForm();
             $this->showDeleteLink();
             $this->out->elementEnd('div');
         }
@@ -531,26 +530,6 @@ class NoticeListItem extends Widget
         }
     }
 
-    /**
-     * show the form to forward a notice
-     *
-     * @return void
-     */
-
-    function showForwardForm()
-    {
-        $user = common_current_user();
-        if ($user && $user->id != $this->notice->profile_id) {
-            $profile = $user->getProfile();
-            if ($profile->hasForwarded($this->notice->id)) {
-                $this->out->text(_('Forwarded'));
-            } else {
-                $ff = new ForwardForm($this->out, $this->notice);
-                $ff->show();
-            }
-        }
-    }
-
     /**
      * if the user is the author, let them delete the notice
      *
diff --git a/lib/forwardform.php b/plugins/Repeat/forwardform.php
similarity index 100%
rename from lib/forwardform.php
rename to plugins/Repeat/forwardform.php

From dd098fee776fbb794080b8f95beab16b2f31556b Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Thu, 10 Dec 2009 14:34:47 -0500
Subject: [PATCH 20/62] remove forward table from db scripts

---
 classes/statusnet.ini | 10 ----------
 db/08to09.sql         | 12 ------------
 db/statusnet.sql      | 11 -----------
 3 files changed, 33 deletions(-)

diff --git a/classes/statusnet.ini b/classes/statusnet.ini
index a5126795bd..835faeb0b4 100644
--- a/classes/statusnet.ini
+++ b/classes/statusnet.ini
@@ -1,4 +1,3 @@
-
 [avatar]
 profile_id = 129
 original = 17
@@ -196,15 +195,6 @@ id = K
 service = K
 uri = U
 
-[forward]
-profile_id = 129
-notice_id = 129
-created = 142
-
-[forward__keys]
-profile_id = K
-notice_id = K
-
 [group_alias]
 alias = 130
 group_id = 129
diff --git a/db/08to09.sql b/db/08to09.sql
index a945416ea4..64640f4ced 100644
--- a/db/08to09.sql
+++ b/db/08to09.sql
@@ -82,15 +82,3 @@ create table login_token (
 
     constraint primary key (user_id)
 ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-create table forward (
-
-    profile_id integer not null comment 'profile who forwarded the notice' references profile (id),
-    notice_id integer not null comment 'notice they forwarded' references notice (id),
-
-    created datetime not null comment 'date this record was created',
-
-    constraint primary key (profile_id, notice_id)
-
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
diff --git a/db/statusnet.sql b/db/statusnet.sql
index b500b81f2d..18abcdfdb2 100644
--- a/db/statusnet.sql
+++ b/db/statusnet.sql
@@ -585,14 +585,3 @@ create table login_token (
     constraint primary key (user_id)
 ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
 
-create table forward (
-
-    profile_id integer not null comment 'profile who forwarded the notice' references profile (id),
-    notice_id integer not null comment 'notice they forwarded' references notice (id),
-
-    created datetime not null comment 'date this record was created',
-
-    constraint primary key (profile_id, notice_id)
-
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-

From 79443d1ee2a50234e79c89f2bc41bb49935c66ca Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Thu, 10 Dec 2009 14:36:14 -0500
Subject: [PATCH 21/62] had wrong number of arguments to NoticeList in notice
 inbox

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

diff --git a/actions/all.php b/actions/all.php
index 08fbacaef1..452803d8ae 100644
--- a/actions/all.php
+++ b/actions/all.php
@@ -144,7 +144,7 @@ class AllAction extends ProfileAction
 
     function showContent()
     {
-        $nl = new NoticeList($this->notice, $this->user, $this);
+        $nl = new NoticeList($this->notice, $this);
 
         $cnt = $nl->show();
 

From a2fb1f5f9dda42b8bac689d3b5bfa86d7660416d Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Thu, 10 Dec 2009 14:37:58 -0500
Subject: [PATCH 22/62] remove form_forward from base css

---
 theme/base/css/display.css | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index e9dca8d02f..d3b9d7cdca 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -1003,13 +1003,11 @@ float:left;
 }
 .notice-options .notice_delete,
 .notice-options .notice_reply,
-.notice-options .form_forward,
 .notice-options .form_favor,
 .notice-options .form_disfavor {
 float:left;
 margin-left:20%;
 }
-.notice-options .form_forward,
 .notice-options .form_favor,
 .notice-options .form_disfavor {
 margin-left:0;
@@ -1035,12 +1033,10 @@ border-radius:0;
 -moz-border-radius:0;
 -webkit-border-radius:0;
 }
-.notice-options .form_forward legend,
 .notice-options .form_favor legend,
 .notice-options .form_disfavor legend {
 display:none;
 }
-.notice-options .form_forward fieldset,
 .notice-options .form_favor fieldset,
 .notice-options .form_disfavor fieldset {
 border:0;

From 344c99df02fb34dcca02f36bee7cb66489742105 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Thu, 10 Dec 2009 14:40:00 -0500
Subject: [PATCH 23/62] remove forward table from PostgreSQL scripts

---
 db/08to09_pg.sql    |  7 -----
 db/statusnet_pg.sql | 62 ++++++++++++++++++---------------------------
 2 files changed, 25 insertions(+), 44 deletions(-)

diff --git a/db/08to09_pg.sql b/db/08to09_pg.sql
index 4f8281bc3e..1df8c249b5 100644
--- a/db/08to09_pg.sql
+++ b/db/08to09_pg.sql
@@ -80,10 +80,3 @@ ALTER TABLE profile ADD COLUMN lon decimal(10,7) /*comment 'longitude'*/;
 ALTER TABLE profile ADD COLUMN location_id integer /* comment 'location id if possible'*/;
 ALTER TABLE profile ADD COLUMN location_ns integer /* comment 'namespace for location'*/;
 
-CREATE TABLE forward (
-    profile_id integer not null /*comment 'profile who forwarded the notice'*/ references profile (id),
-    notice_id integer not null /*comment 'notice they forwarded'*/ references notice (id),
-    created timestamp not null /*comment 'date this record was created'*/ DEFAULT CURRENT_TIMESTAMP,
-    PRIMARY KEY (profile_id, notice_id)
-);
-
diff --git a/db/statusnet_pg.sql b/db/statusnet_pg.sql
index 6bcc278859..c37fa81dee 100644
--- a/db/statusnet_pg.sql
+++ b/db/statusnet_pg.sql
@@ -64,7 +64,7 @@ create table "user" (
     emailnotifyfav integer default 1 /* comment 'Notify by email of favorites' */,
     emailnotifynudge integer default 1 /* comment 'Notify by email of nudges' */,
     emailnotifymsg integer default 1 /* comment 'Notify by email of direct messages' */,
-    emailnotifyattn integer default 1 /* command 'Notify by email of @-replies' */, 
+    emailnotifyattn integer default 1 /* command 'Notify by email of @-replies' */,
     emailmicroid integer default 1 /* comment 'whether to publish email microid' */,
     language varchar(50) /* comment 'preferred language' */,
     timezone varchar(50) /* comment 'timezone' */,
@@ -82,7 +82,7 @@ create table "user" (
     uri varchar(255) unique /* comment 'universally unique identifier, usually a tag URI' */,
     autosubscribe integer default 0 /* comment 'automatically subscribe to users who subscribe to us' */,
     urlshorteningservice varchar(50) default 'ur1.ca' /* comment 'service to use for auto-shortening URLs' */,
-    inboxed integer default 0 /* comment 'has an inbox been created for this user?' */, 
+    inboxed integer default 0 /* comment 'has an inbox been created for this user?' */,
     design_id integer /* comment 'id of a design' */references design(id),
     viewdesigns integer default 1 /* comment 'whether to view user-provided designs'*/,
     created timestamp not null default CURRENT_TIMESTAMP /* comment 'date this record was created' */,
@@ -298,7 +298,7 @@ create table foreign_user (
      nickname varchar(255) /* comment 'nickname on foreign service' */,
      created timestamp not null default CURRENT_TIMESTAMP /* comment 'date this record was created' */,
      modified timestamp /* comment 'date this record was modified' */,
-     
+
      primary key (id, service)
 );
 
@@ -308,7 +308,7 @@ create table foreign_link (
      service int not null /* comment 'foreign key to service' */ references foreign_service (id),
      credentials varchar(255) /* comment 'authc credentials, typically a password' */,
      noticesync int not null default 1 /* comment 'notice synchronisation, bit 1 = sync outgoing, bit 2 = sync incoming, bit 3 = filter local replies' */,
-     friendsync int not null default 2 /* comment 'friend synchronisation, bit 1 = sync outgoing, bit 2 = sync incoming */, 
+     friendsync int not null default 2 /* comment 'friend synchronisation, bit 1 = sync outgoing, bit 2 = sync incoming */,
      profilesync int not null default 1 /* comment 'profile synchronization, bit 1 = sync outgoing, bit 2 = sync incoming' */,
      last_noticesync timestamp default null /* comment 'last time notices were imported' */,
      last_friendsync timestamp default null /* comment 'last time friends were imported' */,
@@ -324,7 +324,7 @@ create table foreign_subscription (
      subscriber int not null /* comment 'subscriber on foreign service' */ ,
      subscribed int not null /* comment 'subscribed user' */ ,
      created timestamp not null default CURRENT_TIMESTAMP /* comment 'date this record was created' */,
-     
+
      primary key (service, subscriber, subscribed)
 );
 create index foreign_subscription_subscriber_idx on foreign_subscription using btree(subscriber);
@@ -354,7 +354,7 @@ create table message (
     created timestamp not null default CURRENT_TIMESTAMP /* comment 'date this record was created' */,
     modified timestamp /* comment 'date this record was modified' */,
     source varchar(32) /* comment 'source of comment, like "web", "im", or "clientname"' */
-    
+
 );
 create index message_from_idx on message using btree(from_profile);
 create index message_to_idx on message using btree(to_profile);
@@ -409,7 +409,6 @@ create table user_group (
     mini_logo varchar(255) /* comment 'mini logo' */,
     design_id integer /*comment 'id of a design' */ references design(id),
 
-
     created timestamp not null default CURRENT_TIMESTAMP /* comment 'date this record was created' */,
     modified timestamp /* comment 'date this record was modified' */
 
@@ -447,16 +446,15 @@ create table group_inbox (
 );
 create index group_inbox_created_idx on group_inbox using btree(created);
 
-
 /*attachments and URLs stuff */
 create sequence file_seq;
 create table file (
     id bigint default nextval('file_seq') primary key /* comment 'unique identifier' */,
-    url varchar(255) unique, 
-    mimetype varchar(50), 
-    size integer, 
-    title varchar(255), 
-    date integer, 
+    url varchar(255) unique,
+    mimetype varchar(50),
+    size integer,
+    title varchar(255),
+    date integer,
     protected integer,
     filename text /* comment 'if a local file, name of the file' */,
     modified timestamp default CURRENT_TIMESTAMP /* comment 'date this record was modified'*/
@@ -467,38 +465,38 @@ create table file_oembed (
     file_id bigint default nextval('file_oembed_seq') primary key /* comment 'unique identifier' */,
     version varchar(20),
     type varchar(20),
-    mimetype varchar(50), 
+    mimetype varchar(50),
     provider varchar(50),
     provider_url varchar(255),
     width integer,
     height integer,
     html text,
     title varchar(255),
-    author_name varchar(50), 
-    author_url varchar(255), 
-    url varchar(255) 
+    author_name varchar(50),
+    author_url varchar(255),
+    url varchar(255)
 );
 
 create sequence file_redirection_seq;
 create table file_redirection (
-    url varchar(255) primary key, 
-    file_id bigint, 
-    redirections integer, 
+    url varchar(255) primary key,
+    file_id bigint,
+    redirections integer,
     httpcode integer
 );
 
 create sequence file_thumbnail_seq;
 create table file_thumbnail (
-    file_id bigint primary key, 
-    url varchar(255) unique, 
-    width integer, 
-    height integer 
+    file_id bigint primary key,
+    url varchar(255) unique,
+    width integer,
+    height integer
 );
 
 create sequence file_to_post_seq;
 create table file_to_post (
-    file_id bigint, 
-    post_id bigint, 
+    file_id bigint,
+    post_id bigint,
 
     primary key (file_id, post_id)
 );
@@ -527,7 +525,7 @@ create table session (
     id varchar(32) primary key /* comment 'session ID'*/,
     session_data text /* comment 'session data'*/,
     created timestamp not null DEFAULT CURRENT_TIMESTAMP /* comment 'date this record was created'*/,
-    modified integer DEFAULT extract(epoch from CURRENT_TIMESTAMP) /* comment 'date this record was modified'*/ 
+    modified integer DEFAULT extract(epoch from CURRENT_TIMESTAMP) /* comment 'date this record was modified'*/
 );
 
 create index session_modified_idx on session (modified);
@@ -543,7 +541,6 @@ create table deleted_notice (
 
 CREATE index deleted_notice_profile_id_idx on deleted_notice (profile_id);
 
-
 /* Textsearch stuff */
 
 create index textsearch_idx on profile using gist(textsearch);
@@ -551,7 +548,6 @@ create index noticecontent_idx on notice using gist(to_tsvector('english',conten
 create trigger textsearchupdate before insert or update on profile for each row
 execute procedure tsvector_update_trigger(textsearch, 'pg_catalog.english', nickname, fullname, location, bio, homepage);
 
-
 create table config (
 
     section varchar(32) /* comment 'configuration section'*/,
@@ -582,8 +578,6 @@ create table location_namespace (
 
 );
 
-
-
 create table login_token (
     user_id integer not null /* comment 'user owning this token'*/ references "user" (id),
     token char(32) not null /* comment 'token useable for logging in'*/,
@@ -593,9 +587,3 @@ create table login_token (
     primary key (user_id)
 );
 
-CREATE TABLE forward (
-    profile_id integer not null /*comment 'profile who forwarded the notice'*/ references profile (id),
-    notice_id integer not null /*comment 'notice they forwarded'*/ references notice (id),
-    created timestamp not null /*comment 'date this record was created'*/ DEFAULT CURRENT_TIMESTAMP,
-    PRIMARY KEY (profile_id, notice_id)
-);

From 14f7c784a6fa11625df128309c0f211ca36101c1 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Thu, 10 Dec 2009 14:40:26 -0500
Subject: [PATCH 24/62] Add table() and keys() overrides to User_username

---
 plugins/Authentication/User_username.php | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/plugins/Authentication/User_username.php b/plugins/Authentication/User_username.php
index f30f60d839..853fd5cb86 100644
--- a/plugins/Authentication/User_username.php
+++ b/plugins/Authentication/User_username.php
@@ -43,4 +43,19 @@ class User_username extends Memcached_DataObject
             return false;
         }
     }
+
+    function table() {
+        return array(
+            'user_id'     => DB_DATAOBJECT_INT,
+            'username'   => DB_DATAOBJECT_STR,
+            'provider_name'   => DB_DATAOBJECT_STR ,
+            'created'   => DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME
+        );
+    }
+
+    // now define the keys.
+    function keys() {
+        return array('provider_name', 'username');
+    }
+
 }

From 433106dfc512605f93a1354034c23452fbb3956b Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Thu, 10 Dec 2009 14:40:48 -0500
Subject: [PATCH 25/62] remove 'has forwarded' method from Profile

---
 classes/Profile.php | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/classes/Profile.php b/classes/Profile.php
index 4c14f62a06..4b2e090064 100644
--- a/classes/Profile.php
+++ b/classes/Profile.php
@@ -716,12 +716,4 @@ class Profile extends Memcached_DataObject
         }
         return $result;
     }
-
-    function hasForwarded($notice_id)
-    {
-        $forward = Forward::pkeyGet(array('profile_id' => $this->id,
-                                          'notice_id' => $notice_id));
-
-        return (!empty($forward));
-    }
 }

From 038fbddd02d2f144936357ed2ed40c09b1441c6b Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Thu, 10 Dec 2009 14:41:18 -0500
Subject: [PATCH 26/62] remove NoticeForward from util.js

---
 js/util.js | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/js/util.js b/js/util.js
index 71514324b1..336cd8cfe5 100644
--- a/js/util.js
+++ b/js/util.js
@@ -315,10 +315,6 @@ var SN = { // StatusNet
             $('.form_disfavor').each(function() { SN.U.FormXHR($(this)); });
         },
 
-        NoticeForward: function() {
-            $('.form_forward').each(function() { SN.U.FormXHR($(this)); });
-        },
-
         NoticeAttachments: function() {
             $('.notice a.attachment').each(function() {
                 SN.U.NoticeWithAttachment($(this).closest('.notice'));
@@ -452,7 +448,6 @@ var SN = { // StatusNet
         Notices: function() {
             if ($('body.user_in').length > 0) {
                 SN.U.NoticeFavor();
-                SN.U.NoticeForward();
                 SN.U.NoticeReply();
             }
 

From eceb5e8a0fbf798e42fb9c1d0598d9dc0f4b7550 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Thu, 10 Dec 2009 14:42:13 -0500
Subject: [PATCH 27/62] remove forward action from router

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

diff --git a/lib/router.php b/lib/router.php
index 398135a3e2..37525319f7 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -99,7 +99,7 @@ class Router
                           'groupblock', 'groupunblock',
                           'sandbox', 'unsandbox',
                           'silence', 'unsilence',
-                          'deleteuser', 'forward');
+                          'deleteuser');
 
             foreach ($main as $a) {
                 $m->connect('main/'.$a, array('action' => $a));

From c10fa99b04ef544e1ea082a694ad714f9246df86 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Thu, 10 Dec 2009 15:16:44 -0500
Subject: [PATCH 28/62] remove the Repeat plugin (for now)

---
 plugins/Repeat/Forward.php         | 127 -------------------------
 plugins/Repeat/forward.php         | 122 ------------------------
 plugins/Repeat/forwardform.php     | 147 -----------------------------
 plugins/Repeat/inboxnoticelist.php |  85 -----------------
 4 files changed, 481 deletions(-)
 delete mode 100644 plugins/Repeat/Forward.php
 delete mode 100644 plugins/Repeat/forward.php
 delete mode 100644 plugins/Repeat/forwardform.php
 delete mode 100644 plugins/Repeat/inboxnoticelist.php

diff --git a/plugins/Repeat/Forward.php b/plugins/Repeat/Forward.php
deleted file mode 100644
index 09b2d6a4ee..0000000000
--- a/plugins/Repeat/Forward.php
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php
-/*
- * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2009, StatusNet, Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.     See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.     If not, see <http://www.gnu.org/licenses/>.
- */
-
-if (!defined('STATUSNET')) {
-    exit(1);
-}
-
-/**
- * Table Definition for location_namespace
- */
-
-require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
-
-class Forward extends Memcached_DataObject
-{
-    ###START_AUTOCODE
-    /* the code below is auto generated do not remove the above tag */
-
-    public $__table = 'forward';                         // table name
-    public $profile_id;                      // int(4)  primary_key not_null
-    public $notice_id;                       // int(4)  primary_key not_null
-    public $created;                         // datetime   not_null default_0000-00-00%2000%3A00%3A00
-
-    /* Static get */
-    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Forward',$k,$v); }
-
-    /* the code above is auto generated do not remove the tag below */
-    ###END_AUTOCODE
-
-    function &pkeyGet($kv)
-    {
-        return Memcached_DataObject::pkeyGet('Forward', $kv);
-    }
-
-    static function saveNew($profile_id, $notice_id)
-    {
-        $forward = new Forward();
-
-        $forward->profile_id = $profile_id;
-        $forward->notice_id  = $notice_id;
-        $forward->created    = common_sql_now();
-
-        $forward->query('BEGIN');
-
-        if (!$forward->insert()) {
-            throw new ServerException(_("Couldn't insert forward."));
-        }
-
-        $ni = $forward->addToInboxes();
-
-        $forward->query('COMMIT');
-
-        $forward->blowCache($ni);
-
-        return $forward;
-    }
-
-    function addToInboxes()
-    {
-        $inbox = new Notice_inbox();
-
-        $user = new User();
-
-        $usertable = common_database_tablename('user');
-        $user->query("SELECT $usertable.* FROM $usertable INNER JOIN subscription ON $usertable.id = subscription.subscriber ".
-                     'WHERE subscription.subscribed = '.$this->profile_id);
-
-        $ni = array();
-
-        $notice = Notice::staticGet('id', $this->notice_id);
-
-        $author = Profile::staticGet('id', $notice->profile_id);
-
-        while ($user->fetch()) {
-            $inbox = Notice_inbox::pkeyGet(array('user_id' => $user->id,
-                                                 'notice_id' => $this->notice_id));
-
-            if (empty($inbox)) {
-                if (!$user->hasBlocked($author)) {
-                    $ni[$user->id] = NOTICE_INBOX_SOURCE_FORWARD;
-                }
-            } else {
-                $inbox->free();
-            }
-        }
-
-        $user->free();
-        $author->free();
-
-        unset($user);
-        unset($author);
-
-        Notice_inbox::bulkInsert($this->notice_id, $this->created, $ni);
-
-        return $ni;
-    }
-
-    function blowCache($ni)
-    {
-        $cache = common_memcache();
-
-        if (!empty($cache)) {
-            foreach ($ni as $id => $source) {
-                $cache->delete(common_cache_key('notice_inbox:by_user:'.$id));
-                $cache->delete(common_cache_key('notice_inbox:by_user_own:'.$id));
-                $cache->delete(common_cache_key('notice_inbox:by_user:'.$id.';last'));
-                $cache->delete(common_cache_key('notice_inbox:by_user_own:'.$id.';last'));
-            }
-        }
-    }
-}
diff --git a/plugins/Repeat/forward.php b/plugins/Repeat/forward.php
deleted file mode 100644
index 194833fe0c..0000000000
--- a/plugins/Repeat/forward.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-
-/**
- * Forward action.
- *
- * PHP version 5
- *
- * @category Action
- * @package  StatusNet
- * @author   Evan Prodromou <evan@status.net>
- * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://status.net/
- *
- * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2008, 2009, StatusNet, Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-if (!defined('STATUSNET')) {
-    exit(1);
-}
-
-/**
- * Forward action
- *
- * @category Action
- * @package  StatusNet
- * @author   Evan Prodromou <evan@status.net>
- * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://status.net/
- */
-
-class ForwardAction extends Action
-{
-    var $user = null;
-    var $notice = null;
-
-    function prepare($args)
-    {
-        parent::prepare($args);
-
-        $this->user = common_current_user();
-
-        if (empty($this->user)) {
-            $this->clientError(_("Only logged-in users can forward notices."));
-            return false;
-        }
-
-        $id = $this->trimmed('notice');
-
-        if (empty($id)) {
-            $this->clientError(_("No notice specified."));
-            return false;
-        }
-
-        $this->notice = Notice::staticGet('id', $id);
-
-        if (empty($this->notice)) {
-            $this->clientError(_("No notice specified."));
-            return false;
-        }
-
-        if ($this->user->id == $this->notice->profile_id) {
-            $this->clientError(_("You can't forward your own notice."));
-            return false;
-        }
-
-        $token  = $this->trimmed('token-'.$id);
-
-        if (empty($token) || $token != common_session_token()) {
-            $this->clientError(_("There was a problem with your session token. Try again, please."));
-            return false;
-        }
-
-        $profile = $this->user->getProfile();
-
-        if ($profile->hasForwarded($id)) {
-            $this->clientError(_("You already forwarded that notice."));
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Class handler.
-     *
-     * @param array $args query arguments
-     *
-     * @return void
-     */
-
-    function handle($args)
-    {
-        $forward = Forward::saveNew($this->user->id, $this->notice->id);
-
-        if ($this->boolean('ajax')) {
-            $this->startHTML('text/xml;charset=utf-8');
-            $this->elementStart('head');
-            $this->element('title', null, _('Forwarded'));
-            $this->elementEnd('head');
-            $this->elementStart('body');
-            $this->element('p', array('id' => 'forward_response'), _('Forwarded!'));
-            $this->elementEnd('body');
-            $this->elementEnd('html');
-        } else {
-            // FIXME!
-        }
-    }
-}
diff --git a/plugins/Repeat/forwardform.php b/plugins/Repeat/forwardform.php
deleted file mode 100644
index 2052856ae6..0000000000
--- a/plugins/Repeat/forwardform.php
+++ /dev/null
@@ -1,147 +0,0 @@
-<?php
-/**
- * StatusNet, the distributed open-source microblogging tool
- *
- * Form for forwarding a notice
- *
- * PHP version 5
- *
- * LICENCE: This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * @category  Form
- * @package   StatusNet
- * @author    Evan Prodromou <evan@status.net>
- * @copyright 2009 StatusNet, Inc.
- * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://status.net/
- */
-
-if (!defined('STATUSNET') && !defined('LACONICA')) {
-    exit(1);
-}
-
-require_once INSTALLDIR.'/lib/form.php';
-
-/**
- * Form for forwarding a notice
- *
- * @category Form
- * @package  StatusNet
- * @author   Evan Prodromou <evan@status.net>
- * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://status.net/
- */
-
-class ForwardForm extends Form
-{
-    /**
-     * Notice to forward
-     */
-
-    var $notice = null;
-
-    /**
-     * Constructor
-     *
-     * @param HTMLOutputter $out    output channel
-     * @param Notice        $notice notice to forward
-     */
-
-    function __construct($out=null, $notice=null)
-    {
-        parent::__construct($out);
-
-        $this->notice = $notice;
-    }
-
-    /**
-     * ID of the form
-     *
-     * @return int ID of the form
-     */
-
-    function id()
-    {
-        return 'forward-' . $this->notice->id;
-    }
-
-    /**
-     * Action of the form
-     *
-     * @return string URL of the action
-     */
-
-    function action()
-    {
-        return common_local_url('forward');
-    }
-
-    /**
-     * Include a session token for CSRF protection
-     *
-     * @return void
-     */
-
-    function sessionToken()
-    {
-        $this->out->hidden('token-' . $this->notice->id,
-                           common_session_token());
-    }
-
-    /**
-     * Legend of the Form
-     *
-     * @return void
-     */
-    function formLegend()
-    {
-        $this->out->element('legend', null, _('Forward this notice'));
-    }
-
-    /**
-     * Data elements
-     *
-     * @return void
-     */
-
-    function formData()
-    {
-        $this->out->hidden('notice-n'.$this->notice->id,
-                           $this->notice->id,
-                           'notice');
-    }
-
-    /**
-     * Action elements
-     *
-     * @return void
-     */
-
-    function formActions()
-    {
-        $this->out->submit('forward-submit-' . $this->notice->id,
-                           _('Forward'), 'submit', null, _('Forward this notice'));
-    }
-
-    /**
-     * Class of the form.
-     *
-     * @return string the form's class
-     */
-
-    function formClass()
-    {
-        return 'form_forward';
-    }
-}
diff --git a/plugins/Repeat/inboxnoticelist.php b/plugins/Repeat/inboxnoticelist.php
deleted file mode 100644
index 809fbe8af9..0000000000
--- a/plugins/Repeat/inboxnoticelist.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-
-class InboxNoticeList extends NoticeList
-{
-    var $owner = null;
-
-    function __construct($notice, $owner, $out=null)
-    {
-        parent::__construct($notice, $out);
-        $this->owner  = $owner;
-    }
-
-    function newListItem($notice)
-    {
-        return new InboxNoticeListItem($notice, $this->owner, $this->out);
-    }
-}
-
-class InboxNoticeListItem extends NoticeListItem
-{
-    var $owner = null;
-    var $ib    = null;
-
-    function __construct($notice, $owner, $out=null)
-    {
-        parent::__construct($notice, $out);
-        $this->owner = $owner;
-
-        $this->ib = Notice_inbox::pkeyGet(array('user_id' => $owner->id,
-                                                'notice_id' => $notice->id));
-    }
-
-    function showAuthor()
-    {
-        parent::showAuthor();
-        if ($this->ib->source == NOTICE_INBOX_SOURCE_FORWARD) {
-            $this->out->element('span', 'forward', _('Fwd'));
-        }
-    }
-
-    function showEnd()
-    {
-        if ($this->ib->source == NOTICE_INBOX_SOURCE_FORWARD) {
-
-            $forward = new Forward();
-
-            // FIXME: scary join!
-
-            $forward->query('SELECT profile_id '.
-                            'FROM forward JOIN subscription ON forward.profile_id = subscription.subscribed '.
-                            'WHERE subscription.subscriber = ' . $this->owner->id . ' '.
-                            'AND forward.notice_id = ' . $this->notice->id . ' '.
-                            'ORDER BY forward.created ');
-
-            $n = 0;
-
-            $firstForwarder = null;
-
-            while ($forward->fetch()) {
-                if (empty($firstForwarder)) {
-                    $firstForwarder = Profile::staticGet('id', $forward->profile_id);
-                }
-                $n++;
-            }
-
-            $forward->free();
-            unset($forward);
-
-            $this->out->elementStart('span', 'forwards');
-
-            $link = XMLStringer::estring('a', array('href' => $firstForwarder->profileurl),
-                                         $firstForwarder->nickname);
-
-            if ($n == 1) {
-                $this->out->raw(sprintf(_('Forwarded by %s'), $link));
-            } else {
-                // XXX: use that cool ngettext thing
-                $this->out->raw(sprintf(_('Forwarded by %s and %d other(s)'), $link, $n - 1));
-            }
-
-            $this->out->elementEnd('span');
-        }
-        parent::showEnd();
-    }
-}

From 2c9b30a31b97a4d03d0f246c9ad938e44c1efc23 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Thu, 10 Dec 2009 15:17:16 -0500
Subject: [PATCH 29/62] Revert "remove the Repeat plugin (for now)"

This reverts commit c10fa99b04ef544e1ea082a694ad714f9246df86.
---
 plugins/Repeat/Forward.php         | 127 +++++++++++++++++++++++++
 plugins/Repeat/forward.php         | 122 ++++++++++++++++++++++++
 plugins/Repeat/forwardform.php     | 147 +++++++++++++++++++++++++++++
 plugins/Repeat/inboxnoticelist.php |  85 +++++++++++++++++
 4 files changed, 481 insertions(+)
 create mode 100644 plugins/Repeat/Forward.php
 create mode 100644 plugins/Repeat/forward.php
 create mode 100644 plugins/Repeat/forwardform.php
 create mode 100644 plugins/Repeat/inboxnoticelist.php

diff --git a/plugins/Repeat/Forward.php b/plugins/Repeat/Forward.php
new file mode 100644
index 0000000000..09b2d6a4ee
--- /dev/null
+++ b/plugins/Repeat/Forward.php
@@ -0,0 +1,127 @@
+<?php
+/*
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2009, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.     See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.     If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+/**
+ * Table Definition for location_namespace
+ */
+
+require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
+
+class Forward extends Memcached_DataObject
+{
+    ###START_AUTOCODE
+    /* the code below is auto generated do not remove the above tag */
+
+    public $__table = 'forward';                         // table name
+    public $profile_id;                      // int(4)  primary_key not_null
+    public $notice_id;                       // int(4)  primary_key not_null
+    public $created;                         // datetime   not_null default_0000-00-00%2000%3A00%3A00
+
+    /* Static get */
+    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Forward',$k,$v); }
+
+    /* the code above is auto generated do not remove the tag below */
+    ###END_AUTOCODE
+
+    function &pkeyGet($kv)
+    {
+        return Memcached_DataObject::pkeyGet('Forward', $kv);
+    }
+
+    static function saveNew($profile_id, $notice_id)
+    {
+        $forward = new Forward();
+
+        $forward->profile_id = $profile_id;
+        $forward->notice_id  = $notice_id;
+        $forward->created    = common_sql_now();
+
+        $forward->query('BEGIN');
+
+        if (!$forward->insert()) {
+            throw new ServerException(_("Couldn't insert forward."));
+        }
+
+        $ni = $forward->addToInboxes();
+
+        $forward->query('COMMIT');
+
+        $forward->blowCache($ni);
+
+        return $forward;
+    }
+
+    function addToInboxes()
+    {
+        $inbox = new Notice_inbox();
+
+        $user = new User();
+
+        $usertable = common_database_tablename('user');
+        $user->query("SELECT $usertable.* FROM $usertable INNER JOIN subscription ON $usertable.id = subscription.subscriber ".
+                     'WHERE subscription.subscribed = '.$this->profile_id);
+
+        $ni = array();
+
+        $notice = Notice::staticGet('id', $this->notice_id);
+
+        $author = Profile::staticGet('id', $notice->profile_id);
+
+        while ($user->fetch()) {
+            $inbox = Notice_inbox::pkeyGet(array('user_id' => $user->id,
+                                                 'notice_id' => $this->notice_id));
+
+            if (empty($inbox)) {
+                if (!$user->hasBlocked($author)) {
+                    $ni[$user->id] = NOTICE_INBOX_SOURCE_FORWARD;
+                }
+            } else {
+                $inbox->free();
+            }
+        }
+
+        $user->free();
+        $author->free();
+
+        unset($user);
+        unset($author);
+
+        Notice_inbox::bulkInsert($this->notice_id, $this->created, $ni);
+
+        return $ni;
+    }
+
+    function blowCache($ni)
+    {
+        $cache = common_memcache();
+
+        if (!empty($cache)) {
+            foreach ($ni as $id => $source) {
+                $cache->delete(common_cache_key('notice_inbox:by_user:'.$id));
+                $cache->delete(common_cache_key('notice_inbox:by_user_own:'.$id));
+                $cache->delete(common_cache_key('notice_inbox:by_user:'.$id.';last'));
+                $cache->delete(common_cache_key('notice_inbox:by_user_own:'.$id.';last'));
+            }
+        }
+    }
+}
diff --git a/plugins/Repeat/forward.php b/plugins/Repeat/forward.php
new file mode 100644
index 0000000000..194833fe0c
--- /dev/null
+++ b/plugins/Repeat/forward.php
@@ -0,0 +1,122 @@
+<?php
+
+/**
+ * Forward action.
+ *
+ * PHP version 5
+ *
+ * @category Action
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://status.net/
+ *
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2008, 2009, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+/**
+ * Forward action
+ *
+ * @category Action
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://status.net/
+ */
+
+class ForwardAction extends Action
+{
+    var $user = null;
+    var $notice = null;
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+
+        $this->user = common_current_user();
+
+        if (empty($this->user)) {
+            $this->clientError(_("Only logged-in users can forward notices."));
+            return false;
+        }
+
+        $id = $this->trimmed('notice');
+
+        if (empty($id)) {
+            $this->clientError(_("No notice specified."));
+            return false;
+        }
+
+        $this->notice = Notice::staticGet('id', $id);
+
+        if (empty($this->notice)) {
+            $this->clientError(_("No notice specified."));
+            return false;
+        }
+
+        if ($this->user->id == $this->notice->profile_id) {
+            $this->clientError(_("You can't forward your own notice."));
+            return false;
+        }
+
+        $token  = $this->trimmed('token-'.$id);
+
+        if (empty($token) || $token != common_session_token()) {
+            $this->clientError(_("There was a problem with your session token. Try again, please."));
+            return false;
+        }
+
+        $profile = $this->user->getProfile();
+
+        if ($profile->hasForwarded($id)) {
+            $this->clientError(_("You already forwarded that notice."));
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Class handler.
+     *
+     * @param array $args query arguments
+     *
+     * @return void
+     */
+
+    function handle($args)
+    {
+        $forward = Forward::saveNew($this->user->id, $this->notice->id);
+
+        if ($this->boolean('ajax')) {
+            $this->startHTML('text/xml;charset=utf-8');
+            $this->elementStart('head');
+            $this->element('title', null, _('Forwarded'));
+            $this->elementEnd('head');
+            $this->elementStart('body');
+            $this->element('p', array('id' => 'forward_response'), _('Forwarded!'));
+            $this->elementEnd('body');
+            $this->elementEnd('html');
+        } else {
+            // FIXME!
+        }
+    }
+}
diff --git a/plugins/Repeat/forwardform.php b/plugins/Repeat/forwardform.php
new file mode 100644
index 0000000000..2052856ae6
--- /dev/null
+++ b/plugins/Repeat/forwardform.php
@@ -0,0 +1,147 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Form for forwarding a notice
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Form
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) {
+    exit(1);
+}
+
+require_once INSTALLDIR.'/lib/form.php';
+
+/**
+ * Form for forwarding a notice
+ *
+ * @category Form
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+
+class ForwardForm extends Form
+{
+    /**
+     * Notice to forward
+     */
+
+    var $notice = null;
+
+    /**
+     * Constructor
+     *
+     * @param HTMLOutputter $out    output channel
+     * @param Notice        $notice notice to forward
+     */
+
+    function __construct($out=null, $notice=null)
+    {
+        parent::__construct($out);
+
+        $this->notice = $notice;
+    }
+
+    /**
+     * ID of the form
+     *
+     * @return int ID of the form
+     */
+
+    function id()
+    {
+        return 'forward-' . $this->notice->id;
+    }
+
+    /**
+     * Action of the form
+     *
+     * @return string URL of the action
+     */
+
+    function action()
+    {
+        return common_local_url('forward');
+    }
+
+    /**
+     * Include a session token for CSRF protection
+     *
+     * @return void
+     */
+
+    function sessionToken()
+    {
+        $this->out->hidden('token-' . $this->notice->id,
+                           common_session_token());
+    }
+
+    /**
+     * Legend of the Form
+     *
+     * @return void
+     */
+    function formLegend()
+    {
+        $this->out->element('legend', null, _('Forward this notice'));
+    }
+
+    /**
+     * Data elements
+     *
+     * @return void
+     */
+
+    function formData()
+    {
+        $this->out->hidden('notice-n'.$this->notice->id,
+                           $this->notice->id,
+                           'notice');
+    }
+
+    /**
+     * Action elements
+     *
+     * @return void
+     */
+
+    function formActions()
+    {
+        $this->out->submit('forward-submit-' . $this->notice->id,
+                           _('Forward'), 'submit', null, _('Forward this notice'));
+    }
+
+    /**
+     * Class of the form.
+     *
+     * @return string the form's class
+     */
+
+    function formClass()
+    {
+        return 'form_forward';
+    }
+}
diff --git a/plugins/Repeat/inboxnoticelist.php b/plugins/Repeat/inboxnoticelist.php
new file mode 100644
index 0000000000..809fbe8af9
--- /dev/null
+++ b/plugins/Repeat/inboxnoticelist.php
@@ -0,0 +1,85 @@
+<?php
+
+class InboxNoticeList extends NoticeList
+{
+    var $owner = null;
+
+    function __construct($notice, $owner, $out=null)
+    {
+        parent::__construct($notice, $out);
+        $this->owner  = $owner;
+    }
+
+    function newListItem($notice)
+    {
+        return new InboxNoticeListItem($notice, $this->owner, $this->out);
+    }
+}
+
+class InboxNoticeListItem extends NoticeListItem
+{
+    var $owner = null;
+    var $ib    = null;
+
+    function __construct($notice, $owner, $out=null)
+    {
+        parent::__construct($notice, $out);
+        $this->owner = $owner;
+
+        $this->ib = Notice_inbox::pkeyGet(array('user_id' => $owner->id,
+                                                'notice_id' => $notice->id));
+    }
+
+    function showAuthor()
+    {
+        parent::showAuthor();
+        if ($this->ib->source == NOTICE_INBOX_SOURCE_FORWARD) {
+            $this->out->element('span', 'forward', _('Fwd'));
+        }
+    }
+
+    function showEnd()
+    {
+        if ($this->ib->source == NOTICE_INBOX_SOURCE_FORWARD) {
+
+            $forward = new Forward();
+
+            // FIXME: scary join!
+
+            $forward->query('SELECT profile_id '.
+                            'FROM forward JOIN subscription ON forward.profile_id = subscription.subscribed '.
+                            'WHERE subscription.subscriber = ' . $this->owner->id . ' '.
+                            'AND forward.notice_id = ' . $this->notice->id . ' '.
+                            'ORDER BY forward.created ');
+
+            $n = 0;
+
+            $firstForwarder = null;
+
+            while ($forward->fetch()) {
+                if (empty($firstForwarder)) {
+                    $firstForwarder = Profile::staticGet('id', $forward->profile_id);
+                }
+                $n++;
+            }
+
+            $forward->free();
+            unset($forward);
+
+            $this->out->elementStart('span', 'forwards');
+
+            $link = XMLStringer::estring('a', array('href' => $firstForwarder->profileurl),
+                                         $firstForwarder->nickname);
+
+            if ($n == 1) {
+                $this->out->raw(sprintf(_('Forwarded by %s'), $link));
+            } else {
+                // XXX: use that cool ngettext thing
+                $this->out->raw(sprintf(_('Forwarded by %s and %d other(s)'), $link, $n - 1));
+            }
+
+            $this->out->elementEnd('span');
+        }
+        parent::showEnd();
+    }
+}

From 08901c98c4129c1d7707acb470e18f1056f2502e Mon Sep 17 00:00:00 2001
From: Eric Helgeson <erichelgeson@gmail.com>
Date: Thu, 10 Dec 2009 21:06:54 -0500
Subject: [PATCH 30/62] Changing avatar should broadcast the profile via OMB.

---
 plugins/Gravatar/GravatarPlugin.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/plugins/Gravatar/GravatarPlugin.php b/plugins/Gravatar/GravatarPlugin.php
index b18f627266..3c61a682ed 100644
--- a/plugins/Gravatar/GravatarPlugin.php
+++ b/plugins/Gravatar/GravatarPlugin.php
@@ -92,11 +92,23 @@ class GravatarPlugin extends Plugin
     function onStartAvatarSaveForm($action) {
         if ($action->arg('add')) {
             $result = $this->gravatar_save();
+
+            if($result['success']===true) {
+                common_broadcast_profile(common_current_user()->getProfile());
+            }
+
             $action->showForm($result['message'], $result['success']);
+
             return false;
         } else if ($action->arg('remove')) {
             $result = $this->gravatar_remove();
+
+            if($result['success']===true) {
+                common_broadcast_profile(common_current_user()->getProfile());
+            }
+
             $action->showForm($result['message'], $result['success']);
+
             return false;
         } else {
             return true;

From 85473ecf94e92cd0e6503e4d27ea26452076aafd Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Fri, 11 Dec 2009 13:55:54 +0100
Subject: [PATCH 31/62] Removed styles from entity_remote_subscribe (doesn't
 need special treatment) in default and identica themes

---
 theme/base/css/display.css     | 11 +----------
 theme/default/css/display.css  | 13 ++++---------
 theme/identica/css/display.css | 13 ++++---------
 3 files changed, 9 insertions(+), 28 deletions(-)

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index d3b9d7cdca..e88e1f2226 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -670,8 +670,7 @@ display:block;
 text-align:left;
 width:100%;
 }
-.entity_actions a,
-.entity_remote_subscribe {
+.entity_actions a {
 text-decoration:none;
 font-weight:bold;
 display:block;
@@ -696,14 +695,6 @@ padding-left:23px;
 padding:2px 4px 1px 26px;
 }
 
-.entity_remote_subscribe {
-padding:4px;
-border-width:2px;
-border-style:solid;
-border-radius:4px;
--moz-border-radius:4px;
--webkit-border-radius:4px;
-}
 .entity_actions .accept {
 margin-bottom:18px;
 }
diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index fc97101bb5..d4fcb23434 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -30,8 +30,7 @@ border-radius:4px;
 input, textarea, select, option {
 font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
 }
-input, textarea, select,
-.entity_remote_subscribe {
+input, textarea, select {
 border-color:#AAAAAA;
 }
 
@@ -56,14 +55,12 @@ background:none;
 }
 
 .form_notice.warning #notice_text-count,
-.form_settings .form_note,
-.entity_remote_subscribe {
+.form_settings .form_note {
 background-color:#9BB43E;
 }
 input.submit,
 .form_notice.warning #notice_text-count,
 .form_settings .form_note,
-.entity_remote_subscribe,
 .entity_actions a,
 .entity_actions input,
 .entity_moderation p,
@@ -81,12 +78,10 @@ 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 {
+.form_settings .form_note {
 border-color:#9BB43E;
 }
-input.submit,
-.entity_remote_subscribe {
+input.submit {
 color:#FFFFFF;
 }
 .entity_actions input.submit {
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 728ca97334..0e8fa6d793 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -30,8 +30,7 @@ border-radius:4px;
 input, textarea, select, option {
 font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
 }
-input, textarea, select,
-.entity_remote_subscribe {
+input, textarea, select {
 border-color:#AAAAAA;
 }
 
@@ -56,14 +55,12 @@ background:none;
 }
 
 .form_notice.warning #notice_text-count,
-.form_settings .form_note,
-.entity_remote_subscribe {
+.form_settings .form_note {
 background-color:#9BB43E;
 }
 input.submit,
 .form_notice.warning #notice_text-count,
 .form_settings .form_note,
-.entity_remote_subscribe,
 .entity_actions a,
 .entity_actions input,
 .entity_moderation p,
@@ -81,12 +78,10 @@ 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 {
+.form_settings .form_note {
 border-color:#9BB43E;
 }
-input.submit,
-.entity_remote_subscribe {
+input.submit {
 color:#FFFFFF;
 }
 .entity_actions input.submit {

From a5724cca4956e3fcfe359bd72b4d874832b31393 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Fri, 11 Dec 2009 10:10:25 -0500
Subject: [PATCH 32/62] do some moving around of forwarding stuff

---
 .../Repeat/forward.php => actions/repeat.php  |   0
 .../forwardform.php => lib/repeatform.php     |   0
 plugins/Repeat/Forward.php                    | 127 ------------------
 plugins/Repeat/inboxnoticelist.php            |  85 ------------
 4 files changed, 212 deletions(-)
 rename plugins/Repeat/forward.php => actions/repeat.php (100%)
 rename plugins/Repeat/forwardform.php => lib/repeatform.php (100%)
 delete mode 100644 plugins/Repeat/Forward.php
 delete mode 100644 plugins/Repeat/inboxnoticelist.php

diff --git a/plugins/Repeat/forward.php b/actions/repeat.php
similarity index 100%
rename from plugins/Repeat/forward.php
rename to actions/repeat.php
diff --git a/plugins/Repeat/forwardform.php b/lib/repeatform.php
similarity index 100%
rename from plugins/Repeat/forwardform.php
rename to lib/repeatform.php
diff --git a/plugins/Repeat/Forward.php b/plugins/Repeat/Forward.php
deleted file mode 100644
index 09b2d6a4ee..0000000000
--- a/plugins/Repeat/Forward.php
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php
-/*
- * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2009, StatusNet, Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.     See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.     If not, see <http://www.gnu.org/licenses/>.
- */
-
-if (!defined('STATUSNET')) {
-    exit(1);
-}
-
-/**
- * Table Definition for location_namespace
- */
-
-require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
-
-class Forward extends Memcached_DataObject
-{
-    ###START_AUTOCODE
-    /* the code below is auto generated do not remove the above tag */
-
-    public $__table = 'forward';                         // table name
-    public $profile_id;                      // int(4)  primary_key not_null
-    public $notice_id;                       // int(4)  primary_key not_null
-    public $created;                         // datetime   not_null default_0000-00-00%2000%3A00%3A00
-
-    /* Static get */
-    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Forward',$k,$v); }
-
-    /* the code above is auto generated do not remove the tag below */
-    ###END_AUTOCODE
-
-    function &pkeyGet($kv)
-    {
-        return Memcached_DataObject::pkeyGet('Forward', $kv);
-    }
-
-    static function saveNew($profile_id, $notice_id)
-    {
-        $forward = new Forward();
-
-        $forward->profile_id = $profile_id;
-        $forward->notice_id  = $notice_id;
-        $forward->created    = common_sql_now();
-
-        $forward->query('BEGIN');
-
-        if (!$forward->insert()) {
-            throw new ServerException(_("Couldn't insert forward."));
-        }
-
-        $ni = $forward->addToInboxes();
-
-        $forward->query('COMMIT');
-
-        $forward->blowCache($ni);
-
-        return $forward;
-    }
-
-    function addToInboxes()
-    {
-        $inbox = new Notice_inbox();
-
-        $user = new User();
-
-        $usertable = common_database_tablename('user');
-        $user->query("SELECT $usertable.* FROM $usertable INNER JOIN subscription ON $usertable.id = subscription.subscriber ".
-                     'WHERE subscription.subscribed = '.$this->profile_id);
-
-        $ni = array();
-
-        $notice = Notice::staticGet('id', $this->notice_id);
-
-        $author = Profile::staticGet('id', $notice->profile_id);
-
-        while ($user->fetch()) {
-            $inbox = Notice_inbox::pkeyGet(array('user_id' => $user->id,
-                                                 'notice_id' => $this->notice_id));
-
-            if (empty($inbox)) {
-                if (!$user->hasBlocked($author)) {
-                    $ni[$user->id] = NOTICE_INBOX_SOURCE_FORWARD;
-                }
-            } else {
-                $inbox->free();
-            }
-        }
-
-        $user->free();
-        $author->free();
-
-        unset($user);
-        unset($author);
-
-        Notice_inbox::bulkInsert($this->notice_id, $this->created, $ni);
-
-        return $ni;
-    }
-
-    function blowCache($ni)
-    {
-        $cache = common_memcache();
-
-        if (!empty($cache)) {
-            foreach ($ni as $id => $source) {
-                $cache->delete(common_cache_key('notice_inbox:by_user:'.$id));
-                $cache->delete(common_cache_key('notice_inbox:by_user_own:'.$id));
-                $cache->delete(common_cache_key('notice_inbox:by_user:'.$id.';last'));
-                $cache->delete(common_cache_key('notice_inbox:by_user_own:'.$id.';last'));
-            }
-        }
-    }
-}
diff --git a/plugins/Repeat/inboxnoticelist.php b/plugins/Repeat/inboxnoticelist.php
deleted file mode 100644
index 809fbe8af9..0000000000
--- a/plugins/Repeat/inboxnoticelist.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-
-class InboxNoticeList extends NoticeList
-{
-    var $owner = null;
-
-    function __construct($notice, $owner, $out=null)
-    {
-        parent::__construct($notice, $out);
-        $this->owner  = $owner;
-    }
-
-    function newListItem($notice)
-    {
-        return new InboxNoticeListItem($notice, $this->owner, $this->out);
-    }
-}
-
-class InboxNoticeListItem extends NoticeListItem
-{
-    var $owner = null;
-    var $ib    = null;
-
-    function __construct($notice, $owner, $out=null)
-    {
-        parent::__construct($notice, $out);
-        $this->owner = $owner;
-
-        $this->ib = Notice_inbox::pkeyGet(array('user_id' => $owner->id,
-                                                'notice_id' => $notice->id));
-    }
-
-    function showAuthor()
-    {
-        parent::showAuthor();
-        if ($this->ib->source == NOTICE_INBOX_SOURCE_FORWARD) {
-            $this->out->element('span', 'forward', _('Fwd'));
-        }
-    }
-
-    function showEnd()
-    {
-        if ($this->ib->source == NOTICE_INBOX_SOURCE_FORWARD) {
-
-            $forward = new Forward();
-
-            // FIXME: scary join!
-
-            $forward->query('SELECT profile_id '.
-                            'FROM forward JOIN subscription ON forward.profile_id = subscription.subscribed '.
-                            'WHERE subscription.subscriber = ' . $this->owner->id . ' '.
-                            'AND forward.notice_id = ' . $this->notice->id . ' '.
-                            'ORDER BY forward.created ');
-
-            $n = 0;
-
-            $firstForwarder = null;
-
-            while ($forward->fetch()) {
-                if (empty($firstForwarder)) {
-                    $firstForwarder = Profile::staticGet('id', $forward->profile_id);
-                }
-                $n++;
-            }
-
-            $forward->free();
-            unset($forward);
-
-            $this->out->elementStart('span', 'forwards');
-
-            $link = XMLStringer::estring('a', array('href' => $firstForwarder->profileurl),
-                                         $firstForwarder->nickname);
-
-            if ($n == 1) {
-                $this->out->raw(sprintf(_('Forwarded by %s'), $link));
-            } else {
-                // XXX: use that cool ngettext thing
-                $this->out->raw(sprintf(_('Forwarded by %s and %d other(s)'), $link, $n - 1));
-            }
-
-            $this->out->elementEnd('span');
-        }
-        parent::showEnd();
-    }
-}

From f5bfa11db2df2362ec5f81699b26942d52e9b60b Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Fri, 11 Dec 2009 10:10:53 -0500
Subject: [PATCH 33/62] Revert "remove NoticeForward from util.js"

This reverts commit 038fbddd02d2f144936357ed2ed40c09b1441c6b.
---
 js/util.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/js/util.js b/js/util.js
index 336cd8cfe5..71514324b1 100644
--- a/js/util.js
+++ b/js/util.js
@@ -315,6 +315,10 @@ var SN = { // StatusNet
             $('.form_disfavor').each(function() { SN.U.FormXHR($(this)); });
         },
 
+        NoticeForward: function() {
+            $('.form_forward').each(function() { SN.U.FormXHR($(this)); });
+        },
+
         NoticeAttachments: function() {
             $('.notice a.attachment').each(function() {
                 SN.U.NoticeWithAttachment($(this).closest('.notice'));
@@ -448,6 +452,7 @@ var SN = { // StatusNet
         Notices: function() {
             if ($('body.user_in').length > 0) {
                 SN.U.NoticeFavor();
+                SN.U.NoticeForward();
                 SN.U.NoticeReply();
             }
 

From e75444b30d9c38f40f7a15422b46b5caae6bb16a Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Fri, 11 Dec 2009 10:11:06 -0500
Subject: [PATCH 34/62] Revert "remove form_forward from base css"

This reverts commit a2fb1f5f9dda42b8bac689d3b5bfa86d7660416d.
---
 theme/base/css/display.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index e88e1f2226..5abbe159da 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -994,11 +994,13 @@ float:left;
 }
 .notice-options .notice_delete,
 .notice-options .notice_reply,
+.notice-options .form_forward,
 .notice-options .form_favor,
 .notice-options .form_disfavor {
 float:left;
 margin-left:20%;
 }
+.notice-options .form_forward,
 .notice-options .form_favor,
 .notice-options .form_disfavor {
 margin-left:0;
@@ -1024,10 +1026,12 @@ border-radius:0;
 -moz-border-radius:0;
 -webkit-border-radius:0;
 }
+.notice-options .form_forward legend,
 .notice-options .form_favor legend,
 .notice-options .form_disfavor legend {
 display:none;
 }
+.notice-options .form_forward fieldset,
 .notice-options .form_favor fieldset,
 .notice-options .form_disfavor fieldset {
 border:0;

From 1204178660d34088f49bdaeb21189651c48c591e Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Fri, 11 Dec 2009 10:12:34 -0500
Subject: [PATCH 35/62] rename forward form to repeat form in JS

---
 js/util.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/js/util.js b/js/util.js
index 71514324b1..f60b5d3137 100644
--- a/js/util.js
+++ b/js/util.js
@@ -315,8 +315,8 @@ var SN = { // StatusNet
             $('.form_disfavor').each(function() { SN.U.FormXHR($(this)); });
         },
 
-        NoticeForward: function() {
-            $('.form_forward').each(function() { SN.U.FormXHR($(this)); });
+        NoticeRepeat: function() {
+            $('.form_repeat').each(function() { SN.U.FormXHR($(this)); });
         },
 
         NoticeAttachments: function() {
@@ -452,7 +452,7 @@ var SN = { // StatusNet
         Notices: function() {
             if ($('body.user_in').length > 0) {
                 SN.U.NoticeFavor();
-                SN.U.NoticeForward();
+                SN.U.NoticeRepeat();
                 SN.U.NoticeReply();
             }
 

From 63642dccf1d2ad6a42eafed5d4ede86635b554a2 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Fri, 11 Dec 2009 10:13:33 -0500
Subject: [PATCH 36/62] rename form_forward to form_repeat in CSS

---
 theme/base/css/display.css | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 5abbe159da..7446a42cdd 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -994,13 +994,13 @@ float:left;
 }
 .notice-options .notice_delete,
 .notice-options .notice_reply,
-.notice-options .form_forward,
+.notice-options .form_repeat,
 .notice-options .form_favor,
 .notice-options .form_disfavor {
 float:left;
 margin-left:20%;
 }
-.notice-options .form_forward,
+.notice-options .form_repeat,
 .notice-options .form_favor,
 .notice-options .form_disfavor {
 margin-left:0;
@@ -1026,12 +1026,12 @@ border-radius:0;
 -moz-border-radius:0;
 -webkit-border-radius:0;
 }
-.notice-options .form_forward legend,
+.notice-options .form_repeat legend,
 .notice-options .form_favor legend,
 .notice-options .form_disfavor legend {
 display:none;
 }
-.notice-options .form_forward fieldset,
+.notice-options .form_repeat fieldset,
 .notice-options .form_favor fieldset,
 .notice-options .form_disfavor fieldset {
 border:0;

From 3d06431787430f7102087ee4a8a66319fcb50350 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Fri, 11 Dec 2009 10:20:32 -0500
Subject: [PATCH 37/62] add repeat_of column to notice table

---
 db/08to09.sql       | 4 +++-
 db/08to09_pg.sql    | 1 +
 db/statusnet.sql    | 2 ++
 db/statusnet_pg.sql | 4 +++-
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/db/08to09.sql b/db/08to09.sql
index 64640f4ced..28ec3ec16b 100644
--- a/db/08to09.sql
+++ b/db/08to09.sql
@@ -4,8 +4,10 @@ alter table notice
      add column lon decimal(10,7) comment 'longitude',
      add column location_id integer comment 'location id if possible',
      add column location_ns integer comment 'namespace for location',
+     add column repeat_of integer comment 'notice this is a repeat of' references notice (id),
      drop index notice_profile_id_idx,
-     add index notice_profile_id_idx (profile_id,created,id);
+     add index notice_profile_id_idx (profile_id,created,id),
+     add index notice_repeatof_idx (repeat_of);
 
 alter table message
      modify column content text comment 'message content';
diff --git a/db/08to09_pg.sql b/db/08to09_pg.sql
index 1df8c249b5..0398952f6e 100644
--- a/db/08to09_pg.sql
+++ b/db/08to09_pg.sql
@@ -74,6 +74,7 @@ ALTER TABLE notice ADD COLUMN lat decimal(10, 7) /* comment 'latitude'*/;
 ALTER TABLE notice ADD COLUMN lon decimal(10,7) /* comment 'longitude'*/;
 ALTER TABLE notice ADD COLUMN location_id integer /* comment 'location id if possible'*/ ;
 ALTER TABLE notice ADD COLUMN location_ns integer /* comment 'namespace for location'*/;
+ALTER TABLE notice ADD COLUMN repeat_of integer / * comment 'notice this is a repeat of' */ references notice (id);
 
 ALTER TABLE profile ADD COLUMN lat decimal(10,7) /*comment 'latitude'*/ ;
 ALTER TABLE profile ADD COLUMN lon decimal(10,7) /*comment 'longitude'*/;
diff --git a/db/statusnet.sql b/db/statusnet.sql
index 18abcdfdb2..6b3c2ca068 100644
--- a/db/statusnet.sql
+++ b/db/statusnet.sql
@@ -129,11 +129,13 @@ create table notice (
     lon decimal(10,7) comment 'longitude',
     location_id integer comment 'location id if possible',
     location_ns integer comment 'namespace for location',
+    repeat_of integer comment 'notice this is a repeat of' references notice (id),
 
     index notice_profile_id_idx (profile_id,created,id),
     index notice_conversation_idx (conversation),
     index notice_created_idx (created),
     index notice_replyto_idx (reply_to),
+    index notice_repeatof_idx (repeat_of),
     FULLTEXT(content)
 ) ENGINE=MyISAM CHARACTER SET utf8 COLLATE utf8_general_ci;
 
diff --git a/db/statusnet_pg.sql b/db/statusnet_pg.sql
index c37fa81dee..020bfd9670 100644
--- a/db/statusnet_pg.sql
+++ b/db/statusnet_pg.sql
@@ -135,7 +135,9 @@ create table notice (
     lat decimal(10,7) /* comment 'latitude'*/ ,
     lon decimal(10,7) /* comment 'longitude'*/ ,
     location_id integer /* comment 'location id if possible'*/ ,
-    location_ns integer /* comment 'namespace for location'*/
+    location_ns integer /* comment 'namespace for location'*/ ,
+    repeat_of integer /* comment 'notice this is a repeat of' */ references notice (id) ,
+
 /*    FULLTEXT(content) */
 );
 

From da3089098817234627e48619f3a8b217970f8627 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Fri, 11 Dec 2009 10:22:56 -0500
Subject: [PATCH 38/62] add repeat_of column to notice class

---
 classes/Notice.php    | 14 ++++++++------
 classes/statusnet.ini |  2 ++
 2 files changed, 10 insertions(+), 6 deletions(-)
 mode change 100644 => 100755 classes/statusnet.ini

diff --git a/classes/Notice.php b/classes/Notice.php
index c36c5a9c6b..0a2f16271f 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -55,13 +55,13 @@ class Notice extends Memcached_DataObject
 
     public $__table = 'notice';                          // table name
     public $id;                              // int(4)  primary_key not_null
-    public $profile_id;                      // int(4)   not_null
+    public $profile_id;                      // int(4)  multiple_key not_null
     public $uri;                             // varchar(255)  unique_key
-    public $content;                         // text()
-    public $rendered;                        // text()
+    public $content;                         // text
+    public $rendered;                        // text
     public $url;                             // varchar(255)
-    public $created;                         // datetime()   not_null
-    public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
+    public $created;                         // datetime  multiple_key not_null default_0000-00-00%2000%3A00%3A00
+    public $modified;                        // timestamp   not_null default_CURRENT_TIMESTAMP
     public $reply_to;                        // int(4)
     public $is_local;                        // tinyint(1)
     public $source;                          // varchar(32)
@@ -70,9 +70,11 @@ class Notice extends Memcached_DataObject
     public $lon;                             // decimal(10,7)
     public $location_id;                     // int(4)
     public $location_ns;                     // int(4)
+    public $repeat_of;                       // int(4)
 
     /* Static get */
-    function staticGet($k,$v=NULL) {
+    function staticGet($k,$v=NULL)
+    {
         return Memcached_DataObject::staticGet('Notice',$k,$v);
     }
 
diff --git a/classes/statusnet.ini b/classes/statusnet.ini
old mode 100644
new mode 100755
index 835faeb0b4..ff4ef2c142
--- a/classes/statusnet.ini
+++ b/classes/statusnet.ini
@@ -1,3 +1,4 @@
+
 [avatar]
 profile_id = 129
 original = 17
@@ -306,6 +307,7 @@ lat = 1
 lon = 1
 location_id = 1
 location_ns = 1
+repeat_of = 1
 
 [notice__keys]
 id = N

From c9649f932153e6636214841858fd265b1476c05b Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Fri, 11 Dec 2009 10:23:36 -0500
Subject: [PATCH 39/62] reset executable bit on Notice.php and statusnet.ini

---
 classes/statusnet.ini | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 classes/statusnet.ini

diff --git a/classes/statusnet.ini b/classes/statusnet.ini
old mode 100755
new mode 100644

From 280b0b500f5f374094794648942571237ca8c687 Mon Sep 17 00:00:00 2001
From: Christopher Vollick <psycotica0@gmail.com>
Date: Fri, 11 Dec 2009 10:34:57 -0500
Subject: [PATCH 40/62] Added UserEmail script.

Used to query user's emails.

Mostly used for administration, to see if a user requesting something is who they say.

Also, some people assume that the admin knows this data, and says things like:
"If you could do _____ with the account connected to this email".

It'd be nice if we could do that without raw SQL.
---
 scripts/useremail.php | 77 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 77 insertions(+)
 create mode 100644 scripts/useremail.php

diff --git a/scripts/useremail.php b/scripts/useremail.php
new file mode 100644
index 0000000000..6676a87c80
--- /dev/null
+++ b/scripts/useremail.php
@@ -0,0 +1,77 @@
+#!/usr/bin/env php
+<?php
+/*
+ * StatusNet - a distributed open-source microblogging tool
+ * Copyright (C) 2008, 2009, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+
+$shortoptions = 'i:n:e:';
+$longoptions = array('id=', 'nickname=', 'email=');
+
+$helptext = <<<END_OF_USEREMAIL_HELP
+useremail.php [options]
+Queries a user's registered email address, or queries the users with a given registered email.
+
+  -i --id       id of the user to query
+  -n --nickname nickname of the user to query
+  -e --email    email address to query
+
+END_OF_USEREMAIL_HELP;
+
+require_once INSTALLDIR.'/scripts/commandline.inc';
+
+if (have_option('i', 'id')) {
+    $id = get_option_value('i', 'id');
+    $user = User::staticGet('id', $id);
+    if (empty($user)) {
+        print "Can't find user with ID $id\n";
+        exit(1);
+    }
+} else if (have_option('n', 'nickname')) {
+    $nickname = get_option_value('n', 'nickname');
+    $user = User::staticGet('nickname', $nickname);
+    if (empty($user)) {
+        print "Can't find user with nickname '$nickname'\n";
+        exit(1);
+    }
+}
+
+if (!empty($user)) {
+    if (empty($user->email)) {
+        print "No email registered for user '$user->nickname'\n";
+    } else {
+        print "$user->email\n";
+    }
+    exit(0);
+}
+
+if (have_option('e', 'email')) {
+    $user = new User();
+    $user->email = get_option_value('e', 'email');
+    $user->find(false);
+    if (!$user->fetch()) {
+        print "No users with email $user->email\n";
+        exit(0);
+    }
+    do {
+        print "$user->id $user->nickname\n";
+    } while ($user->fetch());
+} else {
+    print "You must provide either an ID, email, or a nickname.\n";
+    exit(1);
+}

From 81843f2acd5375a9072d091fd58c6a6af079295e Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Fri, 11 Dec 2009 10:49:26 -0500
Subject: [PATCH 41/62] show the repeat form in notice lists

---
 classes/Profile.php | 11 +++++++++++
 lib/noticelist.php  | 21 +++++++++++++++++++++
 lib/repeatform.php  | 26 ++++++++++++--------------
 3 files changed, 44 insertions(+), 14 deletions(-)

diff --git a/classes/Profile.php b/classes/Profile.php
index 4b2e090064..03196447b8 100644
--- a/classes/Profile.php
+++ b/classes/Profile.php
@@ -716,4 +716,15 @@ class Profile extends Memcached_DataObject
         }
         return $result;
     }
+
+    function hasRepeated($notice_id)
+    {
+        // XXX: not really a pkey, but should work
+
+        $notice = Memcached_DataObject::pkeyGet('Notice',
+                                                array('profile_id' => $this->id,
+                                                      'repeat_of' => $notice_id));
+
+        return !empty($notice);
+    }
 }
diff --git a/lib/noticelist.php b/lib/noticelist.php
index 21cec528ff..924056ece2 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -212,6 +212,7 @@ class NoticeListItem extends Widget
             $this->out->elementStart('div', 'notice-options');
             $this->showFaveForm();
             $this->showReplyLink();
+            $this->showRepeatForm();
             $this->showDeleteLink();
             $this->out->elementEnd('div');
         }
@@ -551,6 +552,26 @@ class NoticeListItem extends Widget
         }
     }
 
+    /**
+     * show the form to repeat a notice
+     *
+     * @return void
+     */
+
+    function showRepeatForm()
+    {
+        $user = common_current_user();
+        if ($user && $user->id != $this->notice->profile_id) {
+            $profile = $user->getProfile();
+            if ($profile->hasRepeated($this->notice->id)) {
+                $this->out->text(_('Repeated'));
+            } else {
+                $rf = new RepeatForm($this->out, $this->notice);
+                $rf->show();
+            }
+        }
+    }
+
     /**
      * finish the notice
      *
diff --git a/lib/repeatform.php b/lib/repeatform.php
index 2052856ae6..50e5d6dbe0 100644
--- a/lib/repeatform.php
+++ b/lib/repeatform.php
@@ -2,7 +2,7 @@
 /**
  * StatusNet, the distributed open-source microblogging tool
  *
- * Form for forwarding a notice
+ * Form for repeating a notice
  *
  * PHP version 5
  *
@@ -27,14 +27,12 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET') && !defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/form.php';
-
 /**
- * Form for forwarding a notice
+ * Form for repeating a notice
  *
  * @category Form
  * @package  StatusNet
@@ -43,10 +41,10 @@ require_once INSTALLDIR.'/lib/form.php';
  * @link     http://status.net/
  */
 
-class ForwardForm extends Form
+class RepeatForm extends Form
 {
     /**
-     * Notice to forward
+     * Notice to repeat
      */
 
     var $notice = null;
@@ -55,7 +53,7 @@ class ForwardForm extends Form
      * Constructor
      *
      * @param HTMLOutputter $out    output channel
-     * @param Notice        $notice notice to forward
+     * @param Notice        $notice notice to repeat
      */
 
     function __construct($out=null, $notice=null)
@@ -73,7 +71,7 @@ class ForwardForm extends Form
 
     function id()
     {
-        return 'forward-' . $this->notice->id;
+        return 'repeat-' . $this->notice->id;
     }
 
     /**
@@ -84,7 +82,7 @@ class ForwardForm extends Form
 
     function action()
     {
-        return common_local_url('forward');
+        return common_local_url('repeat');
     }
 
     /**
@@ -106,7 +104,7 @@ class ForwardForm extends Form
      */
     function formLegend()
     {
-        $this->out->element('legend', null, _('Forward this notice'));
+        $this->out->element('legend', null, _('Repeat this notice'));
     }
 
     /**
@@ -130,8 +128,8 @@ class ForwardForm extends Form
 
     function formActions()
     {
-        $this->out->submit('forward-submit-' . $this->notice->id,
-                           _('Forward'), 'submit', null, _('Forward this notice'));
+        $this->out->submit('repeat-submit-' . $this->notice->id,
+                           _('Repeat'), 'submit', null, _('Repeat this notice'));
     }
 
     /**
@@ -142,6 +140,6 @@ class ForwardForm extends Form
 
     function formClass()
     {
-        return 'form_forward';
+        return 'form_repeat';
     }
 }

From 79f81ad76d413908c097c121912eff233aebc483 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Fri, 11 Dec 2009 11:29:51 -0500
Subject: [PATCH 42/62] change Notice::saveNew() to use named arguments for
 little-used options

---
 actions/apistatusesupdate.php       | 29 ++++++++++++++++-------------
 actions/newnotice.php               | 10 ++++++----
 classes/Notice.php                  | 15 ++++++++++++---
 lib/command.php                     |  5 +++--
 lib/oauthstore.php                  |  5 ++---
 plugins/Facebook/facebookaction.php |  5 +++--
 6 files changed, 42 insertions(+), 27 deletions(-)

diff --git a/actions/apistatusesupdate.php b/actions/apistatusesupdate.php
index 85a7c8c084..10bbc5ace0 100644
--- a/actions/apistatusesupdate.php
+++ b/actions/apistatusesupdate.php
@@ -231,19 +231,22 @@ class ApiStatusesUpdateAction extends ApiAuthAction
                 }
             }
 
-            $this->notice = Notice::saveNew(
-                $this->user->id,
-                html_entity_decode($status_shortened, ENT_NOQUOTES, 'UTF-8'),
-                $this->source,
-                1,
-                $reply_to,
-                null,
-                null,
-                empty($location) ? null : $location->lat,
-                empty($location) ? null : $location->lon,
-                empty($location) ? null : $location->location_id,
-                empty($location) ? null : $location->location_ns
-            );
+            $content = html_entity_decode($status_shortened, ENT_NOQUOTES, 'UTF-8'),
+
+            $options = array('reply_to' => $reply_to);
+
+            if (!empty($location)) {
+                $options['lat'] = $location->lat;
+                $options['lon'] = $location->lon;
+                $options['location_id'] = $location->location_id;
+                $options['location_ns'] = $location->location_ns;
+            }
+
+            $this->notice =
+              Notice::saveNew($this->user->id,
+                              $content,
+                              $this->source,
+                              $options);
 
             if (isset($upload)) {
                 $upload->attachToNotice($this->notice);
diff --git a/actions/newnotice.php b/actions/newnotice.php
index dd6da0b01c..c6c70e3260 100644
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -187,10 +187,12 @@ class NewnoticeAction extends Action
             }
         }
 
-        $notice = Notice::saveNew($user->id, $content_shortened, 'web', 1,
-                                  ($replyto == 'false') ? null : $replyto,
-                                  null, null,
-                                  $lat, $lon, $location_id, $location_ns);
+        $notice = Notice::saveNew($user->id, $content_shortened, 'web',
+                                  array('reply_to' => ($replyto == 'false') ? null : $replyto,
+                                        'lat' => $lat,
+                                        'lon' => $lon,
+                                        'location_id' => $location_id,
+                                        'location_ns' => $location_ns));
 
         if (isset($upload)) {
             $upload->attachToNotice($notice);
diff --git a/classes/Notice.php b/classes/Notice.php
index c36c5a9c6b..4422866fa1 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -167,9 +167,18 @@ class Notice extends Memcached_DataObject
         }
     }
 
-    static function saveNew($profile_id, $content, $source=null,
-                            $is_local=Notice::LOCAL_PUBLIC, $reply_to=null, $uri=null, $created=null,
-                            $lat=null, $lon=null, $location_id=null, $location_ns=null) {
+    static function saveNew($profile_id, $content, $source, $options=null) {
+
+        if (!empty($options)) {
+            extract($options);
+            if (!isset($reply_to)) {
+                $reply_to = NULL;
+            }
+        }
+
+        if (empty($is_local)) {
+            $is_local = Notice::LOCAL_PUBLIC;
+        }
 
         $profile = Profile::staticGet($profile_id);
 
diff --git a/lib/command.php b/lib/command.php
index 450db9da37..085331f825 100644
--- a/lib/command.php
+++ b/lib/command.php
@@ -433,8 +433,9 @@ class ReplyCommand extends Command
             return;
         }
 
-        $notice = Notice::saveNew($this->user->id, $this->text, $channel->source(), 1,
-                                  $notice->id);
+        $notice = Notice::saveNew($this->user->id, $this->text, $channel->source(),
+                                  array('reply_to' => $notice->id));
+
         if ($notice) {
             $channel->output($this->user, sprintf(_('Reply to %s sent'), $recipient->nickname));
         } else {
diff --git a/lib/oauthstore.php b/lib/oauthstore.php
index e34bf8a5ed..df63cc1512 100644
--- a/lib/oauthstore.php
+++ b/lib/oauthstore.php
@@ -359,9 +359,8 @@ class StatusNetOAuthDataStore extends OAuthDataStore
         $notice = Notice::saveNew($author->id,
                                   $omb_notice->getContent(),
                                   'omb',
-                                  false,
-                                  null,
-                                  $omb_notice->getIdentifierURI());
+                                  array('is_local' => Notice::REMOTE_OMB,
+                                        'uri' => $omb_notice->getIdentifierURI()));
 
         common_broadcast_notice($notice, true);
     }
diff --git a/plugins/Facebook/facebookaction.php b/plugins/Facebook/facebookaction.php
index 705bb2780d..24bf215fd9 100644
--- a/plugins/Facebook/facebookaction.php
+++ b/plugins/Facebook/facebookaction.php
@@ -445,8 +445,9 @@ class FacebookAction extends Action
         $replyto = $this->trimmed('inreplyto');
 
         try {
-            $notice = Notice::saveNew($user->id, $content,
-                                      'web', 1, ($replyto == 'false') ? null : $replyto);
+            $notice = Notice::saveNew($user->id, $content, 'web',
+                                      array('reply_to' => ($replyto == 'false') ? null : $replyto));
+
         } catch (Exception $e) {
             $this->showPage($e->getMessage());
             return;

From 89256fa754c1e03b822b8eeac388cc822b3c58ca Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Fri, 11 Dec 2009 11:33:26 -0500
Subject: [PATCH 43/62] fix typo in API arg creation

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

diff --git a/actions/apistatusesupdate.php b/actions/apistatusesupdate.php
index 10bbc5ace0..dabbea92f5 100644
--- a/actions/apistatusesupdate.php
+++ b/actions/apistatusesupdate.php
@@ -231,7 +231,7 @@ class ApiStatusesUpdateAction extends ApiAuthAction
                 }
             }
 
-            $content = html_entity_decode($status_shortened, ENT_NOQUOTES, 'UTF-8'),
+            $content = html_entity_decode($status_shortened, ENT_NOQUOTES, 'UTF-8');
 
             $options = array('reply_to' => $reply_to);
 

From afc86a86d36dc8101c81d5d009546e4629db34a3 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Fri, 11 Dec 2009 11:51:09 -0500
Subject: [PATCH 44/62] save repeats from the form

---
 actions/repeat.php | 20 ++++++++++----------
 classes/Notice.php | 23 ++++++++++++++++++++++-
 lib/router.php     |  1 +
 3 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/actions/repeat.php b/actions/repeat.php
index 194833fe0c..a1c5f443fb 100644
--- a/actions/repeat.php
+++ b/actions/repeat.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Forward action.
+ * Repeat action.
  *
  * PHP version 5
  *
@@ -33,7 +33,7 @@ if (!defined('STATUSNET')) {
 }
 
 /**
- * Forward action
+ * Repeat action
  *
  * @category Action
  * @package  StatusNet
@@ -42,7 +42,7 @@ if (!defined('STATUSNET')) {
  * @link     http://status.net/
  */
 
-class ForwardAction extends Action
+class RepeatAction extends Action
 {
     var $user = null;
     var $notice = null;
@@ -54,7 +54,7 @@ class ForwardAction extends Action
         $this->user = common_current_user();
 
         if (empty($this->user)) {
-            $this->clientError(_("Only logged-in users can forward notices."));
+            $this->clientError(_("Only logged-in users can repeat notices."));
             return false;
         }
 
@@ -73,7 +73,7 @@ class ForwardAction extends Action
         }
 
         if ($this->user->id == $this->notice->profile_id) {
-            $this->clientError(_("You can't forward your own notice."));
+            $this->clientError(_("You can't repeat your own notice."));
             return false;
         }
 
@@ -86,8 +86,8 @@ class ForwardAction extends Action
 
         $profile = $this->user->getProfile();
 
-        if ($profile->hasForwarded($id)) {
-            $this->clientError(_("You already forwarded that notice."));
+        if ($profile->hasRepeated($id)) {
+            $this->clientError(_("You already repeated that notice."));
             return false;
         }
 
@@ -104,15 +104,15 @@ class ForwardAction extends Action
 
     function handle($args)
     {
-        $forward = Forward::saveNew($this->user->id, $this->notice->id);
+        $repeat = $this->notice->repeat($this->user->id, 'web');
 
         if ($this->boolean('ajax')) {
             $this->startHTML('text/xml;charset=utf-8');
             $this->elementStart('head');
-            $this->element('title', null, _('Forwarded'));
+            $this->element('title', null, _('Repeated'));
             $this->elementEnd('head');
             $this->elementStart('body');
-            $this->element('p', array('id' => 'forward_response'), _('Forwarded!'));
+            $this->element('p', array('id' => 'repeat_response'), _('Repeated!'));
             $this->elementEnd('body');
             $this->elementEnd('html');
         } else {
diff --git a/classes/Notice.php b/classes/Notice.php
index 2282011882..82753fbdd6 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -236,7 +236,14 @@ class Notice extends Memcached_DataObject
         $notice->source = $source;
         $notice->uri = $uri;
 
-        $notice->reply_to = self::getReplyTo($reply_to, $profile_id, $source, $final);
+        // Handle repeat case
+
+        if (isset($repeat_of)) {
+            $notice->repeat_of = $repeat_of;
+            $notice->reply_to = $repeat_of;
+        } else {
+            $notice->reply_to = self::getReplyTo($reply_to, $profile_id, $source, $final);
+        }
 
         if (!empty($notice->reply_to)) {
             $reply = Notice::staticGet('id', $notice->reply_to);
@@ -1434,4 +1441,18 @@ class Notice extends Memcached_DataObject
 
         return $location;
     }
+
+    function repeat($repeater_id, $source)
+    {
+        $author = Profile::staticGet('id', $this->profile_id);
+
+        // FIXME: truncate on long repeats...?
+
+        $content = sprintf(_('RT @%1$s %2$s'),
+                           $author->nickname,
+                           $this->content);
+
+        return self::saveNew($repeater_id, $content, $source,
+                             array('repeat_of' => $this->id));
+    }
 }
diff --git a/lib/router.php b/lib/router.php
index 37525319f7..142206c16a 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -99,6 +99,7 @@ class Router
                           'groupblock', 'groupunblock',
                           'sandbox', 'unsandbox',
                           'silence', 'unsilence',
+                          'repeat',
                           'deleteuser');
 
             foreach ($main as $a) {

From 962f391f3ebd4908ae7187673426f03e57083b02 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Fri, 11 Dec 2009 12:10:58 -0500
Subject: [PATCH 45/62] show original notice in repeat, with repeat info below

---
 lib/noticelist.php | 60 ++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 58 insertions(+), 2 deletions(-)

diff --git a/lib/noticelist.php b/lib/noticelist.php
index 924056ece2..7319a62ea7 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -147,6 +147,10 @@ class NoticeListItem extends Widget
 
     var $notice = null;
 
+    /** The notice that was repeated. */
+
+    var $repeat = null;
+
     /** The profile of the author of the notice, extracted once for convenience. */
 
     var $profile = null;
@@ -162,8 +166,13 @@ class NoticeListItem extends Widget
     function __construct($notice, $out=null)
     {
         parent::__construct($out);
-        $this->notice  = $notice;
-        $this->profile = $notice->getProfile();
+        if (!empty($notice->repeat_of)) {
+            $this->notice = Notice::staticGet('id', $notice->repeat_of);
+            $this->repeat = $notice;
+        } else {
+            $this->notice  = $notice;
+        }
+        $this->profile = $this->notice->getProfile();
     }
 
     /**
@@ -202,6 +211,7 @@ class NoticeListItem extends Widget
         $this->showNoticeSource();
         $this->showNoticeLocation();
         $this->showContext();
+        $this->showRepeat();
         $this->out->elementEnd('div');
     }
 
@@ -508,6 +518,52 @@ class NoticeListItem extends Widget
         }
     }
 
+    /**
+     * show a link to the author of repeat
+     *
+     * @return void
+     */
+
+    function showRepeat()
+    {
+        if (!empty($this->repeat)) {
+
+            $repeater = Profile::staticGet('id', $this->repeat->profile_id);
+
+            $attrs = array('href' => $repeater->profileurl,
+                           'class' => 'url');
+
+            if (!empty($repeater->fullname)) {
+                $attrs['title'] = $repeater->fullname . ' (' . $repeater->nickname . ')';
+            }
+
+            $this->out->elementStart('span', 'repeat');
+
+            $this->out->elementStart('a', $attrs);
+
+            $avatar = $repeater->getAvatar(AVATAR_MINI_SIZE);
+
+            $this->out->element('img', array('src' => ($avatar) ?
+                                             $avatar->displayUrl() :
+                                             Avatar::defaultImage(AVATAR_MINI_SIZE),
+                                             'class' => 'avatar photo',
+                                             'width' => AVATAR_MINI_SIZE,
+                                             'height' => AVATAR_MINI_SIZE,
+                                             'alt' =>
+                                             ($repeater->fullname) ?
+                                             $repeater->fullname :
+                                             $repeater->nickname));
+
+            $this->out->elementEnd('a');
+
+            $text_link = XMLStringer::estring('a', $attrs, $repeater->nickname);
+
+            $this->out->raw(sprintf(_('Repeated by %s'), $text_link));
+
+            $this->out->elementEnd('span');
+        }
+    }
+
     /**
      * show a link to reply to the current notice
      *

From 0cb1feed51522abc35bfd4252089ca8c4df52bda Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Fri, 11 Dec 2009 12:16:11 -0500
Subject: [PATCH 46/62] show repeated notice's author on profile page

---
 actions/showstream.php | 46 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/actions/showstream.php b/actions/showstream.php
index 663638c18a..74b46cc95b 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -269,4 +269,50 @@ class ProfileNoticeListItem extends NoticeListItem
     {
         return;
     }
+
+    /**
+     * show a link to the author of repeat
+     *
+     * @return void
+     */
+
+    function showRepeat()
+    {
+        if (!empty($this->repeat)) {
+
+            // FIXME: this code is almost identical to default; need to refactor
+
+            $attrs = array('href' => $this->profile->profileurl,
+                           'class' => 'url');
+
+            if (!empty($this->profile->fullname)) {
+                $attrs['title'] = $this->profile->fullname . ' (' . $this->profile->nickname . ')';
+            }
+
+            $this->out->elementStart('span', 'repeat');
+
+            $this->out->elementStart('a', $attrs);
+
+            $avatar = $this->profile->getAvatar(AVATAR_MINI_SIZE);
+
+            $this->out->element('img', array('src' => ($avatar) ?
+                                             $avatar->displayUrl() :
+                                             Avatar::defaultImage(AVATAR_MINI_SIZE),
+                                             'class' => 'avatar photo',
+                                             'width' => AVATAR_MINI_SIZE,
+                                             'height' => AVATAR_MINI_SIZE,
+                                             'alt' =>
+                                             ($this->profile->fullname) ?
+                                             $this->profile->fullname :
+                                             $this->profile->nickname));
+
+            $this->out->elementEnd('a');
+
+            $text_link = XMLStringer::estring('a', $attrs, $this->profile->nickname);
+
+            $this->out->raw(sprintf(_('Repeat of %s'), $text_link));
+
+            $this->out->elementEnd('span');
+        }
+    }
 }

From 1c370bb277d9b707a5f1956dd5e6856a9b278f5e Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Fri, 11 Dec 2009 12:39:29 -0500
Subject: [PATCH 47/62] show repeated notices correctly in API output

---
 lib/api.php | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/lib/api.php b/lib/api.php
index eacb80dbea..12e3ba5314 100644
--- a/lib/api.php
+++ b/lib/api.php
@@ -213,6 +213,20 @@ class ApiAction extends Action
     }
 
     function twitterStatusArray($notice, $include_user=true)
+    {
+        $base = $this->twitterSimpleStatusArray($notice, $include_user);
+
+        if (empty($notice->repeat_of)) {
+            return $base;
+        } else {
+            $original = Notice::staticGet('id', $notice->repeat_of);
+            $original_array = $this->twitterSimpleStatusArray($original, $include_user);
+            $original_array['retweeted_status'] = $base;
+            return $original_array;
+        }
+    }
+
+    function twitterSimpleStatusArray($notice, $include_user=true)
     {
         $profile = $notice->getProfile();
 
@@ -446,9 +460,9 @@ class ApiAction extends Action
         }
     }
 
-    function showTwitterXmlStatus($twitter_status)
+    function showTwitterXmlStatus($twitter_status, $tag='status')
     {
-        $this->elementStart('status');
+        $this->elementStart($tag);
         foreach($twitter_status as $element => $value) {
             switch ($element) {
             case 'user':
@@ -463,11 +477,14 @@ class ApiAction extends Action
             case 'geo':
                 $this->showGeoRSS($value);
                 break;
+            case 'retweeted_status':
+                $this->showTwitterXmlStatus($value, 'retweeted_status');
+                break;
             default:
                 $this->element($element, null, $value);
             }
         }
-        $this->elementEnd('status');
+        $this->elementEnd($tag);
     }
 
     function showTwitterXmlGroup($twitter_group)

From 683edfd199ae150afa74993521c4c65d76b1e19d Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Fri, 11 Dec 2009 12:40:05 -0500
Subject: [PATCH 48/62] show repeated notices correctly in API output

---
 actions/apistatusesretweet.php | 136 +++++++++++++++++++++++++++++++++
 lib/router.php                 |   5 ++
 2 files changed, 141 insertions(+)
 create mode 100644 actions/apistatusesretweet.php

diff --git a/actions/apistatusesretweet.php b/actions/apistatusesretweet.php
new file mode 100644
index 0000000000..fc71d22743
--- /dev/null
+++ b/actions/apistatusesretweet.php
@@ -0,0 +1,136 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Repeat a notice through the API
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  API
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+require_once INSTALLDIR . '/lib/apiauth.php';
+require_once INSTALLDIR . '/lib/mediafile.php';
+
+/**
+ * Repeat a notice through the API
+ *
+ * @category API
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+
+class ApiStatusesRetweetAction extends ApiAuthAction
+{
+    var $original = null;
+
+    /**
+     * Take arguments for running
+     *
+     * @param array $args $_REQUEST args
+     *
+     * @return boolean success flag
+     *
+     */
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+
+        if ($_SERVER['REQUEST_METHOD'] != 'POST') {
+            $this->clientError(_('This method requires a POST.'),
+                               400, $this->format);
+            return false;
+        }
+
+        $id = $this->trimmed('id');
+
+        $this->original = Notice::staticGet('id', $id);
+
+        if (empty($this->original)) {
+            $this->clientError(_('No such notice'),
+                               400, $this->format);
+            return false;
+        }
+
+        $this->user = $this->auth_user;
+
+        if ($this->user->id == $notice->profile_id) {
+            $this->clientError(_('Cannot repeat your own notice'));
+                               400, $this->format);
+            return false;
+        }
+
+        $profile = $this->user->getProfile();
+
+        if ($profile->hasRepeated($id)) {
+            $this->clientError(_('Already repeated that notice'),
+                               400, $this->format);
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Handle the request
+     *
+     * Make a new notice for the update, save it, and show it
+     *
+     * @param array $args $_REQUEST data (unused)
+     *
+     * @return void
+     */
+
+    function handle($args)
+    {
+        parent::handle($args);
+
+        $repeat = $this->original->repeat($this->user->id, $this->source);
+
+        common_broadcast_notice($repeat);
+
+        $this->showNotice($repeat);
+    }
+
+    /**
+     * Show the resulting notice
+     *
+     * @return void
+     */
+
+    function showNotice($notice)
+    {
+        if (!empty($notice)) {
+            if ($this->format == 'xml') {
+                $this->showSingleXmlStatus($notice);
+            } elseif ($this->format == 'json') {
+                $this->show_single_json_status($notice);
+            }
+        }
+    }
+}
diff --git a/lib/router.php b/lib/router.php
index 142206c16a..835339720d 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -359,6 +359,11 @@ class Router
                               'id' => '[0-9]+',
                               'format' => '(xml|json)'));
 
+            $m->connect('api/statuses/retweet/:id.:format',
+                        array('action' => 'ApiStatusesRetweet',
+                              'id' => '[0-9]+',
+                              'format' => '(xml|json)'));
+
             // users
 
             $m->connect('api/users/show.:format',

From e2f0fc7b3f459a38c71c730c4006db42cab4724e Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Fri, 11 Dec 2009 13:14:40 -0800
Subject: [PATCH 49/62] Make useremail.php executable

---
 scripts/useremail.php | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 scripts/useremail.php

diff --git a/scripts/useremail.php b/scripts/useremail.php
old mode 100644
new mode 100755

From 59e5958d3afa0a5613efbc1ed4546ce63946fe43 Mon Sep 17 00:00:00 2001
From: Hue Bastard <hubris@kevin.(none)>
Date: Tue, 8 Dec 2009 21:28:11 +1000
Subject: [PATCH 50/62] ticket 2055: added logos to Atom and RSS feeds

---
 actions/apitimelinefavorites.php |  6 ++++--
 actions/apitimelinefriends.php   |  6 ++++--
 actions/apitimelinegroup.php     |  7 +++++--
 actions/apitimelinementions.php  |  6 ++++--
 actions/apitimelinepublic.php    |  5 +++--
 actions/apitimelinetag.php       |  6 ++++--
 actions/apitimelineuser.php      |  6 ++++--
 lib/api.php                      | 27 +++++++++++++++++++++------
 8 files changed, 49 insertions(+), 20 deletions(-)

diff --git a/actions/apitimelinefavorites.php b/actions/apitimelinefavorites.php
index f84d7b4cb7..77e5cea1bd 100644
--- a/actions/apitimelinefavorites.php
+++ b/actions/apitimelinefavorites.php
@@ -101,6 +101,7 @@ class ApiTimelineFavoritesAction extends ApiBareAuthAction
     function showTimeline()
     {
         $profile = $this->user->getProfile();
+        $avatar     = $profile->getAvatar(AVATAR_PROFILE_SIZE);
 
         $sitename   = common_config('site', 'name');
         $title      = sprintf(
@@ -121,20 +122,21 @@ class ApiTimelineFavoritesAction extends ApiBareAuthAction
             $profile->getBestName(),
             $this->user->nickname
         );
+        $logo = ($avatar) ? $avatar->displayUrl() : Avatar::defaultImage(AVATAR_PROFILE_SIZE);
 
         switch($this->format) {
         case 'xml':
             $this->showXmlTimeline($this->notices);
             break;
         case 'rss':
-            $this->showRssTimeline($this->notices, $title, $link, $subtitle);
+            $this->showRssTimeline($this->notices, $title, $link, $subtitle, null, $logo, null, $logo);
             break;
         case 'atom':
             $selfuri = common_root_url() .
                 ltrim($_SERVER['QUERY_STRING'], 'p=');
             $this->showAtomTimeline(
                 $this->notices, $title, $id, $link, $subtitle,
-                null, $selfuri
+                null, $selfuri, $logo
             );
             break;
         case 'json':
diff --git a/actions/apitimelinefriends.php b/actions/apitimelinefriends.php
index e84f773723..09ba7a9691 100644
--- a/actions/apitimelinefriends.php
+++ b/actions/apitimelinefriends.php
@@ -110,6 +110,7 @@ class ApiTimelineFriendsAction extends ApiBareAuthAction
     function showTimeline()
     {
         $profile    = $this->user->getProfile();
+        $avatar     = $profile->getAvatar(AVATAR_PROFILE_SIZE);
         $sitename   = common_config('site', 'name');
         $title      = sprintf(_("%s and friends"), $this->user->nickname);
         $taguribase = common_config('integration', 'taguri');
@@ -121,13 +122,14 @@ class ApiTimelineFriendsAction extends ApiBareAuthAction
             _('Updates from %1$s and friends on %2$s!'),
             $this->user->nickname, $sitename
         );
+        $logo       = ($avatar) ? $avatar->displayUrl() : Avatar::defaultImage(AVATAR_PROFILE_SIZE);
 
         switch($this->format) {
         case 'xml':
             $this->showXmlTimeline($this->notices);
             break;
         case 'rss':
-            $this->showRssTimeline($this->notices, $title, $link, $subtitle);
+            $this->showRssTimeline($this->notices, $title, $link, $subtitle, null, $logo);
             break;
         case 'atom':
 
@@ -144,7 +146,7 @@ class ApiTimelineFriendsAction extends ApiBareAuthAction
 
             $this->showAtomTimeline(
                 $this->notices, $title, $id, $link,
-                $subtitle, null, $selfuri
+                $subtitle, null, $selfuri, $logo
             );
             break;
         case 'json':
diff --git a/actions/apitimelinegroup.php b/actions/apitimelinegroup.php
index de13e7eb98..22c577f397 100644
--- a/actions/apitimelinegroup.php
+++ b/actions/apitimelinegroup.php
@@ -105,6 +105,7 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction
     function showTimeline()
     {
         $sitename   = common_config('site', 'name');
+        $avatar     = $this->group->homepage_logo;
         $title      = sprintf(_("%s timeline"), $this->group->nickname);
         $taguribase = common_config('integration', 'taguri');
         $id         = "tag:$taguribase:GroupTimeline:" . $this->group->id;
@@ -117,13 +118,14 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction
             $this->group->nickname,
             $sitename
         );
+        $logo       = ($avatar) ? $avatar : User_group::defaultLogo(AVATAR_PROFILE_SIZE);
 
         switch($this->format) {
         case 'xml':
             $this->showXmlTimeline($this->notices);
             break;
         case 'rss':
-            $this->showRssTimeline($this->notices, $title, $link, $subtitle);
+            $this->showRssTimeline($this->notices, $title, $link, $subtitle, null, $logo);
             break;
         case 'atom':
             $selfuri = common_root_url() .
@@ -136,7 +138,8 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction
                 $link,
                 $subtitle,
                 null,
-                $selfuri
+                $selfuri,
+                $logo
             );
             break;
         case 'json':
diff --git a/actions/apitimelinementions.php b/actions/apitimelinementions.php
index 0956ccdceb..19f40aebc9 100644
--- a/actions/apitimelinementions.php
+++ b/actions/apitimelinementions.php
@@ -110,6 +110,7 @@ class ApiTimelineMentionsAction extends ApiBareAuthAction
     function showTimeline()
     {
         $profile = $this->user->getProfile();
+        $avatar     = $profile->getAvatar(AVATAR_PROFILE_SIZE);
 
         $sitename   = common_config('site', 'name');
         $title      = sprintf(
@@ -126,20 +127,21 @@ class ApiTimelineMentionsAction extends ApiBareAuthAction
             _('%1$s updates that reply to updates from %2$s / %3$s.'),
             $sitename, $this->user->nickname, $profile->getBestName()
         );
+        $logo = ($avatar) ? $avatar->displayUrl() : Avatar::defaultImage(AVATAR_PROFILE_SIZE);
 
         switch($this->format) {
         case 'xml':
             $this->showXmlTimeline($this->notices);
             break;
         case 'rss':
-            $this->showRssTimeline($this->notices, $title, $link, $subtitle);
+            $this->showRssTimeline($this->notices, $title, $link, $subtitle, null, $logo);
             break;
         case 'atom':
             $selfuri = common_root_url() .
                 ltrim($_SERVER['QUERY_STRING'], 'p=');
             $this->showAtomTimeline(
                 $this->notices, $title, $id, $link, $subtitle,
-                null, $selfuri
+                null, $selfuri, $logo
             );
             break;
         case 'json':
diff --git a/actions/apitimelinepublic.php b/actions/apitimelinepublic.php
index 7a85042592..633f3c36e6 100644
--- a/actions/apitimelinepublic.php
+++ b/actions/apitimelinepublic.php
@@ -103,6 +103,7 @@ class ApiTimelinePublicAction extends ApiPrivateAuthAction
     function showTimeline()
     {
         $sitename   = common_config('site', 'name');
+        $sitelogo   = (common_config('site', 'logo')) ? common_config('site', 'logo') : Theme::path('logo.png');
         $title      = sprintf(_("%s public timeline"), $sitename);
         $taguribase = common_config('integration', 'taguri');
         $id         = "tag:$taguribase:PublicTimeline";
@@ -114,13 +115,13 @@ class ApiTimelinePublicAction extends ApiPrivateAuthAction
             $this->showXmlTimeline($this->notices);
             break;
         case 'rss':
-            $this->showRssTimeline($this->notices, $title, $link, $subtitle);
+            $this->showRssTimeline($this->notices, $title, $link, $subtitle, null, $sitelogo);
             break;
         case 'atom':
             $selfuri = common_root_url() . 'api/statuses/public_timeline.atom';
             $this->showAtomTimeline(
                 $this->notices, $title, $id, $link,
-                $subtitle, null, $selfuri
+                $subtitle, null, $selfuri, $sitelogo
             );
             break;
         case 'json':
diff --git a/actions/apitimelinetag.php b/actions/apitimelinetag.php
index 452593c116..1a50520f45 100644
--- a/actions/apitimelinetag.php
+++ b/actions/apitimelinetag.php
@@ -98,6 +98,7 @@ class ApiTimelineTagAction extends ApiPrivateAuthAction
     function showTimeline()
     {
         $sitename   = common_config('site', 'name');
+        $sitelogo   = (common_config('site', 'logo')) ? common_config('site', 'logo') : Theme::path('logo.png');
         $title      = sprintf(_("Notices tagged with %s"), $this->tag);
         $link       = common_local_url(
             'tag',
@@ -116,7 +117,7 @@ class ApiTimelineTagAction extends ApiPrivateAuthAction
             $this->showXmlTimeline($this->notices);
             break;
         case 'rss':
-            $this->showRssTimeline($this->notices, $title, $link, $subtitle);
+            $this->showRssTimeline($this->notices, $title, $link, $subtitle, null, $sitelogo);
             break;
         case 'atom':
             $selfuri = common_root_url() .
@@ -129,7 +130,8 @@ class ApiTimelineTagAction extends ApiPrivateAuthAction
                 $link,
                 $subtitle,
                 null,
-                $selfuri
+                $selfuri,
+                $sitelogo
             );
             break;
         case 'json':
diff --git a/actions/apitimelineuser.php b/actions/apitimelineuser.php
index ca1d217725..14c62a52e7 100644
--- a/actions/apitimelineuser.php
+++ b/actions/apitimelineuser.php
@@ -112,6 +112,7 @@ class ApiTimelineUserAction extends ApiBareAuthAction
     function showTimeline()
     {
         $profile = $this->user->getProfile();
+        $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
 
         $sitename   = common_config('site', 'name');
         $title      = sprintf(_("%s timeline"), $this->user->nickname);
@@ -125,6 +126,7 @@ class ApiTimelineUserAction extends ApiBareAuthAction
             _('Updates from %1$s on %2$s!'),
             $this->user->nickname, $sitename
         );
+        $logo = ($avatar) ? $avatar->displayUrl() : Avatar::defaultImage(AVATAR_PROFILE_SIZE);
 
         // FriendFeed's SUP protocol
         // Also added RSS and Atom feeds
@@ -139,7 +141,7 @@ class ApiTimelineUserAction extends ApiBareAuthAction
         case 'rss':
             $this->showRssTimeline(
                 $this->notices, $title, $link,
-                $subtitle, $suplink
+                $subtitle, $suplink, $logo
             );
             break;
         case 'atom':
@@ -153,7 +155,7 @@ class ApiTimelineUserAction extends ApiBareAuthAction
             }
             $this->showAtomTimeline(
                 $this->notices, $title, $id, $link,
-                $subtitle, $suplink, $selfuri
+                $subtitle, $suplink, $selfuri, $logo
             );
             break;
         case 'json':
diff --git a/lib/api.php b/lib/api.php
index eacb80dbea..7ebe65dbb7 100644
--- a/lib/api.php
+++ b/lib/api.php
@@ -134,17 +134,19 @@ class ApiAction extends Action
         $twitter_user['protected'] = false; # not supported by StatusNet yet
         $twitter_user['followers_count'] = $profile->subscriberCount();
 
-        $user          = $profile->getUser();
         $design        = null;
+        $user          = $profile->getUser();
 
         // Note: some profiles don't have an associated user
 
-        $defaultDesign = Design::siteDesign();
-
         if (!empty($user)) {
             $design = $user->getDesign();
         }
 
+        if (empty($design)) {
+            $design = Design::siteDesign();
+        }
+
         $color = Design::toWebColor(empty($design->backgroundcolor) ? $defaultDesign->backgroundcolor : $design->backgroundcolor);
         $twitter_user['profile_background_color'] = ($color == null) ? '' : '#'.$color->hexValue();
         $color = Design::toWebColor(empty($design->textcolor) ? $defaultDesign->textcolor : $design->textcolor);
@@ -163,7 +165,7 @@ class ApiAction extends Action
 
         $timezone = 'UTC';
 
-        if (!empty($user) && !empty($user->timezone)) {
+        if ($user->timezone) {
             $timezone = $user->timezone;
         }
 
@@ -586,7 +588,7 @@ class ApiAction extends Action
         $this->endDocument('xml');
     }
 
-    function showRssTimeline($notice, $title, $link, $subtitle, $suplink=null)
+    function showRssTimeline($notice, $title, $link, $subtitle, $suplink=null, $logo=null)
     {
 
         $this->initDocument('rss');
@@ -600,6 +602,15 @@ class ApiAction extends Action
                                          'href' => $suplink,
                                          'type' => 'application/json'));
         }
+
+        if (!is_null($logo)) {
+            $this->elementStart('image');
+            $this->element('link', null, $link);
+            $this->element('title', null, $title);
+            $this->element('url', null, $logo);
+            $this->elementEnd('image');
+        }
+
         $this->element('description', null, $subtitle);
         $this->element('language', null, 'en-us');
         $this->element('ttl', null, '40');
@@ -619,7 +630,7 @@ class ApiAction extends Action
         $this->endTwitterRss();
     }
 
-    function showAtomTimeline($notice, $title, $id, $link, $subtitle=null, $suplink=null, $selfuri=null)
+    function showAtomTimeline($notice, $title, $id, $link, $subtitle=null, $suplink=null, $selfuri=null, $logo=null)
     {
 
         $this->initDocument('atom');
@@ -628,6 +639,10 @@ class ApiAction extends Action
         $this->element('id', null, $id);
         $this->element('link', array('href' => $link, 'rel' => 'alternate', 'type' => 'text/html'), null);
 
+        if (!is_null($logo)) {
+            $this->element('logo',null,$logo);
+        }
+
         if (!is_null($suplink)) {
             # For FriendFeed's SUP protocol
             $this->element('link', array('rel' => 'http://api.friendfeed.com/2008/03#sup',

From c24afa986e04794bfd230cb527ebe6fd938f3934 Mon Sep 17 00:00:00 2001
From: Hue Bastard <hubris@kevin.(none)>
Date: Tue, 8 Dec 2009 21:35:54 +1000
Subject: [PATCH 51/62] (fix clumsy double paste in b45be2b
 actions/apitimelinefavorites.php

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

diff --git a/actions/apitimelinefavorites.php b/actions/apitimelinefavorites.php
index 77e5cea1bd..008e042126 100644
--- a/actions/apitimelinefavorites.php
+++ b/actions/apitimelinefavorites.php
@@ -129,7 +129,7 @@ class ApiTimelineFavoritesAction extends ApiBareAuthAction
             $this->showXmlTimeline($this->notices);
             break;
         case 'rss':
-            $this->showRssTimeline($this->notices, $title, $link, $subtitle, null, $logo, null, $logo);
+            $this->showRssTimeline($this->notices, $title, $link, $subtitle, null, $logo);
             break;
         case 'atom':
             $selfuri = common_root_url() .

From 2f77d47fd4dfb8c726b3a5184b149e7f72c3514f Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@status.net>
Date: Fri, 11 Dec 2009 16:28:51 -0800
Subject: [PATCH 52/62] Build stub .po template for Gravatar plugin

---
 plugins/Gravatar/locale/Gravatar.po | 61 +++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)
 create mode 100644 plugins/Gravatar/locale/Gravatar.po

diff --git a/plugins/Gravatar/locale/Gravatar.po b/plugins/Gravatar/locale/Gravatar.po
new file mode 100644
index 0000000000..1df62b6661
--- /dev/null
+++ b/plugins/Gravatar/locale/Gravatar.po
@@ -0,0 +1,61 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-12-11 16:27-0800\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: GravatarPlugin.php:57
+msgid "Set Gravatar"
+msgstr ""
+
+#: GravatarPlugin.php:60
+msgid "If you want to use your Gravatar image, click \"Add\"."
+msgstr ""
+
+#: GravatarPlugin.php:65
+msgid "Add"
+msgstr ""
+
+#: GravatarPlugin.php:75
+msgid "Remove Gravatar"
+msgstr ""
+
+#: GravatarPlugin.php:78
+msgid "If you want to remove your Gravatar image, click \"Remove\"."
+msgstr ""
+
+#: GravatarPlugin.php:83
+msgid "Remove"
+msgstr ""
+
+#: GravatarPlugin.php:88
+msgid "To use a Gravatar first enter in an email address."
+msgstr ""
+
+#: GravatarPlugin.php:137
+msgid "You do not have a email set in your profile."
+msgstr ""
+
+#: GravatarPlugin.php:155
+msgid "Failed to save Gravatar to the DB."
+msgstr ""
+
+#: GravatarPlugin.php:159
+msgid "Gravatar added."
+msgstr ""
+
+#: GravatarPlugin.php:177
+msgid "Gravatar removed."
+msgstr ""

From 0c11e64c27e0ba201e02d38b3b1d4af3e0e0b82b Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Sat, 12 Dec 2009 18:21:10 +0100
Subject: [PATCH 53/62] Localisation updates for !StatusNet from
 !translatewiki.net !sntrans

---
 locale/ar/LC_MESSAGES/statusnet.po    | 529 ++++++++++----------
 locale/bg/LC_MESSAGES/statusnet.po    | 534 ++++++++++----------
 locale/ca/LC_MESSAGES/statusnet.po    | 526 ++++++++++----------
 locale/cs/LC_MESSAGES/statusnet.po    | 536 ++++++++++----------
 locale/de/LC_MESSAGES/statusnet.po    | 534 ++++++++++----------
 locale/el/LC_MESSAGES/statusnet.po    | 536 ++++++++++----------
 locale/en_GB/LC_MESSAGES/statusnet.po | 532 ++++++++++----------
 locale/es/LC_MESSAGES/statusnet.po    | 532 ++++++++++----------
 locale/fi/LC_MESSAGES/statusnet.po    | 532 ++++++++++----------
 locale/fr/LC_MESSAGES/statusnet.po    | 577 ++++++++++-----------
 locale/ga/LC_MESSAGES/statusnet.po    | 549 ++++++++++----------
 locale/he/LC_MESSAGES/statusnet.po    | 536 ++++++++++----------
 locale/hsb/LC_MESSAGES/statusnet.po   | 534 ++++++++++----------
 locale/is/LC_MESSAGES/statusnet.po    | 532 ++++++++++----------
 locale/it/LC_MESSAGES/statusnet.po    | 534 ++++++++++----------
 locale/ja/LC_MESSAGES/statusnet.po    | 671 ++++++++++++-------------
 locale/ko/LC_MESSAGES/statusnet.po    | 534 ++++++++++----------
 locale/mk/LC_MESSAGES/statusnet.po    | 540 ++++++++++----------
 locale/nb/LC_MESSAGES/statusnet.po    | 534 ++++++++++----------
 locale/nl/LC_MESSAGES/statusnet.po    | 568 ++++++++++-----------
 locale/nn/LC_MESSAGES/statusnet.po    | 532 ++++++++++----------
 locale/pl/LC_MESSAGES/statusnet.po    | 566 ++++++++++-----------
 locale/pt/LC_MESSAGES/statusnet.po    | 624 +++++++++++------------
 locale/pt_BR/LC_MESSAGES/statusnet.po | 539 ++++++++++----------
 locale/ru/LC_MESSAGES/statusnet.po    | 563 ++++++++++-----------
 locale/statusnet.po                   | 520 +++++++++----------
 locale/sv/LC_MESSAGES/statusnet.po    | 548 ++++++++++----------
 locale/te/LC_MESSAGES/statusnet.po    | 691 +++++++++++++-------------
 locale/tr/LC_MESSAGES/statusnet.po    | 538 ++++++++++----------
 locale/uk/LC_MESSAGES/statusnet.po    | 558 ++++++++++-----------
 locale/vi/LC_MESSAGES/statusnet.po    | 546 ++++++++++----------
 locale/zh_CN/LC_MESSAGES/statusnet.po | 540 ++++++++++----------
 locale/zh_TW/LC_MESSAGES/statusnet.po | 536 ++++++++++----------
 33 files changed, 9091 insertions(+), 9110 deletions(-)

diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po
index c7bb7a5e3e..fa5efc4551 100644
--- a/locale/ar/LC_MESSAGES/statusnet.po
+++ b/locale/ar/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 21:25+0000\n"
-"PO-Revision-Date: 2009-12-07 21:25:58+0000\n"
+"POT-Creation-Date: 2009-12-12 17:09+0000\n"
+"PO-Revision-Date: 2009-12-12 17:09:09+0000\n"
 "Language-Team: Arabic\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n"
+"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ar\n"
 "X-Message-Group: out-statusnet\n"
@@ -27,11 +27,11 @@ msgstr "لا صفحة كهذه"
 
 #: actions/all.php:74 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofile.php:105
 #: actions/apiaccountupdateprofilebackgroundimage.php:116
-#: actions/apiaccountupdateprofileimage.php:105
-#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
-#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
-#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
+#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90
 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
@@ -44,7 +44,7 @@ msgstr "لا صفحة كهذه"
 #: actions/repliesrss.php:38 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38
 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
-#: lib/command.php:364 lib/command.php:411 lib/command.php:466
+#: lib/command.php:364 lib/command.php:411 lib/command.php:467
 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
 #: lib/subs.php:34 lib/subs.php:116
 msgid "No such user."
@@ -56,7 +56,7 @@ msgid "%s and friends, page %d"
 msgstr ""
 
 #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
-#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100
+#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s والأصدقاء"
@@ -107,25 +107,25 @@ msgstr ""
 msgid "You and friends"
 msgstr "أنت والأصدقاء"
 
-#: actions/allrss.php:119 actions/apitimelinefriends.php:121
+#: actions/allrss.php:119 actions/apitimelinefriends.php:122
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr ""
 
 #: actions/apiaccountratelimitstatus.php:70
 #: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofile.php:97
 #: actions/apiaccountupdateprofilebackgroundimage.php:94
 #: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apiaccountupdateprofile.php:97
 #, fuzzy
 msgid "API method not found."
 msgstr "لم يوجد رمز التأكيد."
 
 #: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofile.php:89
 #: actions/apiaccountupdateprofilebackgroundimage.php:86
 #: actions/apiaccountupdateprofilecolors.php:110
-#: actions/apiaccountupdateprofileimage.php:84
-#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
+#: actions/apiaccountupdateprofileimage.php:84 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
@@ -144,9 +144,23 @@ msgstr ""
 msgid "Could not update user."
 msgstr "تعذّر تحديث المستخدم."
 
+#: actions/apiaccountupdateprofile.php:112
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+msgid "User has no profile."
+msgstr "ليس للمستخدم ملف شخصي."
+
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "تعذّر حفظ الملف الشخصي."
+
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257
 #: actions/designadminpanel.php:122 actions/newnotice.php:94
 #: lib/designsettings.php:283
 #, php-format
@@ -167,24 +181,9 @@ msgstr ""
 msgid "Could not update your design."
 msgstr "تعذّر تحديث تصميمك."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
-#: actions/apiaccountupdateprofileimage.php:130
-#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
-#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
-msgid "User has no profile."
-msgstr "ليس للمستخدم ملف شخصي."
-
-#: actions/apiaccountupdateprofile.php:147
-#, fuzzy
-msgid "Could not save profile."
-msgstr "تعذّر حفظ الملف الشخصي."
-
 #: actions/apiblockcreate.php:105
-#, fuzzy
 msgid "You cannot block yourself!"
-msgstr "لا يمكنك حذف المستخدمين."
+msgstr "لا يمكنك منع نفسك!"
 
 #: actions/apiblockcreate.php:119
 msgid "Block user failed."
@@ -194,23 +193,6 @@ msgstr "فشل منع المستخدم."
 msgid "Unblock user failed."
 msgstr "فشل إلغاء منع المستخدم."
 
-#: actions/apidirectmessagenew.php:126
-msgid "No message text!"
-msgstr "لا نص في الرسالة!"
-
-#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
-#, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr ""
-
-#: actions/apidirectmessagenew.php:146
-msgid "Recipient user not found."
-msgstr "لم يُعثر على المستخدم المستلم."
-
-#: actions/apidirectmessagenew.php:150
-msgid "Can't send direct messages to users who aren't your friend."
-msgstr ""
-
 #: actions/apidirectmessage.php:89
 #, php-format
 msgid "Direct messages from %s"
@@ -236,18 +218,35 @@ msgstr ""
 #: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
-#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
-#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149
-#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
-#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156
+#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151
+#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141
+#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
 msgid "API method not found!"
 msgstr ""
 
+#: actions/apidirectmessagenew.php:126
+msgid "No message text!"
+msgstr "لا نص في الرسالة!"
+
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr ""
+
+#: actions/apidirectmessagenew.php:146
+msgid "Recipient user not found."
+msgstr "لم يُعثر على المستخدم المستلم."
+
+#: actions/apidirectmessagenew.php:150
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr ""
+
 #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
 #: actions/apistatusesdestroy.php:113
 msgid "No status found with that ID."
@@ -390,16 +389,6 @@ msgstr ""
 msgid "Could not remove user %s to group %s."
 msgstr ""
 
-#: actions/apigrouplistall.php:90 actions/usergroups.php:62
-#, php-format
-msgid "%s groups"
-msgstr "مجموعات %s"
-
-#: actions/apigrouplistall.php:94
-#, php-format
-msgid "groups on %s"
-msgstr "مجموعات %s"
-
 #: actions/apigrouplist.php:95
 #, php-format
 msgid "%s's groups"
@@ -410,6 +399,16 @@ msgstr "مجموعات %s"
 msgid "Groups %s is a member of on %s."
 msgstr ""
 
+#: actions/apigrouplistall.php:90 actions/usergroups.php:62
+#, php-format
+msgid "%s groups"
+msgstr "مجموعات %s"
+
+#: actions/apigrouplistall.php:94
+#, php-format
+msgid "groups on %s"
+msgstr "مجموعات %s"
+
 #: actions/apistatusesdestroy.php:107
 msgid "This method requires a POST or DELETE."
 msgstr ""
@@ -445,54 +444,54 @@ msgstr ""
 msgid "Unsupported format."
 msgstr "نسق غير مدعوم."
 
-#: actions/apitimelinefavorites.php:107
+#: actions/apitimelinefavorites.php:108
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr ""
 
-#: actions/apitimelinefavorites.php:119
+#: actions/apitimelinefavorites.php:120
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr ""
 
-#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117
+#: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118
 #: actions/grouprss.php:131 actions/userrss.php:90
 #, php-format
 msgid "%s timeline"
 msgstr "مسار %s الزمني"
 
-#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125
+#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
 #: actions/userrss.php:92
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr ""
 
-#: actions/apitimelinementions.php:116
+#: actions/apitimelinementions.php:117
 #, php-format
 msgid "%1$s / Updates mentioning %2$s"
 msgstr ""
 
-#: actions/apitimelinementions.php:126
+#: actions/apitimelinementions.php:127
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr ""
 
-#: actions/apitimelinepublic.php:106 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "مسار %s الزمني العام"
 
-#: actions/apitimelinepublic.php:110 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr ""
 
-#: actions/apitimelinetag.php:101 actions/tag.php:66
+#: actions/apitimelinetag.php:102 actions/tag.php:66
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "الإشعارات الموسومة ب%s"
 
-#: actions/apitimelinetag.php:107 actions/tagrss.php:64
+#: actions/apitimelinetag.php:108 actions/tagrss.php:64
 #, php-format
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr ""
@@ -527,45 +526,45 @@ msgstr "أفتار"
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr ""
 
-#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:185
 #: actions/grouplogo.php:178 actions/remotesubscribe.php:191
 #: actions/userauthorization.php:72 actions/userrss.php:103
 msgid "User without matching profile"
 msgstr ""
 
-#: actions/avatarsettings.php:119 actions/avatarsettings.php:194
+#: actions/avatarsettings.php:119 actions/avatarsettings.php:197
 #: actions/grouplogo.php:251
 msgid "Avatar settings"
 msgstr "إعدادات الأفتار"
 
-#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/avatarsettings.php:127 actions/avatarsettings.php:205
 #: actions/grouplogo.php:199 actions/grouplogo.php:259
 msgid "Original"
 msgstr "الأصلي"
 
-#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/avatarsettings.php:142 actions/avatarsettings.php:217
 #: actions/grouplogo.php:210 actions/grouplogo.php:271
 msgid "Preview"
 msgstr "عاين"
 
-#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
+#: actions/avatarsettings.php:149 lib/deleteuserform.php:66
 #: lib/noticelist.php:550
 msgid "Delete"
 msgstr "احذف"
 
-#: actions/avatarsettings.php:165 actions/grouplogo.php:233
+#: actions/avatarsettings.php:166 actions/grouplogo.php:233
 msgid "Upload"
 msgstr "ارفع"
 
-#: actions/avatarsettings.php:228 actions/grouplogo.php:286
+#: actions/avatarsettings.php:231 actions/grouplogo.php:286
 msgid "Crop"
 msgstr ""
 
-#: actions/avatarsettings.php:265 actions/disfavor.php:74
+#: actions/avatarsettings.php:268 actions/disfavor.php:74
 #: actions/emailsettings.php:238 actions/favor.php:75
 #: actions/groupblock.php:66 actions/grouplogo.php:309
 #: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -576,33 +575,70 @@ msgstr ""
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
-#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
+#: actions/avatarsettings.php:281 actions/designadminpanel.php:103
 #: actions/emailsettings.php:256 actions/grouplogo.php:319
 #: actions/imsettings.php:220 actions/recoverpassword.php:44
 #: actions/smssettings.php:248 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr ""
 
-#: actions/avatarsettings.php:322
+#: actions/avatarsettings.php:328
 msgid "Pick a square area of the image to be your avatar"
 msgstr ""
 
-#: actions/avatarsettings.php:337 actions/grouplogo.php:377
+#: actions/avatarsettings.php:343 actions/grouplogo.php:377
 msgid "Lost our file data."
 msgstr ""
 
-#: actions/avatarsettings.php:360
+#: actions/avatarsettings.php:366
 msgid "Avatar updated."
 msgstr "رُفع الأفتار."
 
-#: actions/avatarsettings.php:363
+#: actions/avatarsettings.php:369
 msgid "Failed updating avatar."
 msgstr "فشل تحديث الأفتار."
 
-#: actions/avatarsettings.php:387
+#: actions/avatarsettings.php:393
 msgid "Avatar deleted."
 msgstr "حُذف الأفتار."
 
+#: actions/block.php:69
+msgid "You already blocked that user."
+msgstr "لقد منعت مسبقا هذا المستخدم."
+
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
+msgid "Block user"
+msgstr "امنع المستخدم"
+
+#: actions/block.php:130
+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/block.php:143 actions/deletenotice.php:145
+#: actions/deleteuser.php:147 actions/groupblock.php:178
+msgid "No"
+msgstr "لا"
+
+#: actions/block.php:143 actions/deleteuser.php:147
+msgid "Do not block this user"
+msgstr "لا تمنع هذا المستخدم"
+
+#: actions/block.php:144 actions/deletenotice.php:146
+#: actions/deleteuser.php:148 actions/groupblock.php:179
+msgid "Yes"
+msgstr "نعم"
+
+#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
+msgid "Block this user"
+msgstr "امنع هذا المستخدم"
+
+#: actions/block.php:162
+msgid "Failed to save block information."
+msgstr "فشل حفظ معلومات المنع."
+
 #: actions/blockedfromgroup.php:73 actions/editgroup.php:84
 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
 #: actions/groupmembers.php:76 actions/grouprss.php:91
@@ -643,43 +679,6 @@ msgstr "ألغِ المنع"
 msgid "Unblock this user"
 msgstr "ألغِ منع هذا المستخدم"
 
-#: actions/block.php:69
-msgid "You already blocked that user."
-msgstr "لقد منعت مسبقا هذا المستخدم."
-
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
-msgid "Block user"
-msgstr "امنع المستخدم"
-
-#: actions/block.php:130
-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/block.php:143 actions/deletenotice.php:145
-#: actions/deleteuser.php:147 actions/groupblock.php:178
-msgid "No"
-msgstr "لا"
-
-#: actions/block.php:143 actions/deleteuser.php:147
-msgid "Do not block this user"
-msgstr "لا تمنع هذا المستخدم"
-
-#: actions/block.php:144 actions/deletenotice.php:146
-#: actions/deleteuser.php:148 actions/groupblock.php:179
-msgid "Yes"
-msgstr "نعم"
-
-#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
-msgid "Block this user"
-msgstr "امنع هذا المستخدم"
-
-#: actions/block.php:162
-msgid "Failed to save block information."
-msgstr "فشل حفظ معلومات المنع."
-
 #: actions/bookmarklet.php:50
 msgid "Post to "
 msgstr ""
@@ -1137,6 +1136,14 @@ msgstr ""
 msgid "New incoming email address added."
 msgstr ""
 
+#: actions/favor.php:79
+msgid "This notice is already a favorite!"
+msgstr "هذا الإشعار مفضلة مسبقًا!"
+
+#: actions/favor.php:92 lib/disfavorform.php:140
+msgid "Disfavor favorite"
+msgstr "ألغِ تفضيل المفضلة"
+
 #: actions/favorited.php:65 lib/popularnoticesection.php:88
 #: lib/publicgroupnav.php:93
 msgid "Popular notices"
@@ -1179,14 +1186,6 @@ msgstr "إشعارات %s المُفضلة"
 msgid "Updates favored by %1$s on %2$s!"
 msgstr ""
 
-#: actions/favor.php:79
-msgid "This notice is already a favorite!"
-msgstr "هذا الإشعار مفضلة مسبقًا!"
-
-#: actions/favor.php:92 lib/disfavorform.php:140
-msgid "Disfavor favorite"
-msgstr "ألغِ تفضيل المفضلة"
-
 #: actions/featured.php:69 lib/featureduserssection.php:87
 #: lib/publicgroupnav.php:89
 msgid "Featured users"
@@ -1411,6 +1410,30 @@ msgstr "اجعل هذا المستخدم إداريًا"
 msgid "Updates from members of %1$s on %2$s!"
 msgstr ""
 
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+msgid "Groups"
+msgstr "مجموعات"
+
+#: actions/groups.php:64
+#, php-format
+msgid "Groups, page %d"
+msgstr "المجموعات، صفحة %d"
+
+#: actions/groups.php:90
+#, php-format
+msgid ""
+"%%%%site.name%%%% groups let you find and talk with people of similar "
+"interests. After you join a group you can send messages to all other members "
+"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
+"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
+"%%%%)"
+msgstr ""
+
+#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
+msgid "Create a new group"
+msgstr "أنشئ مجموعة جديدة"
+
 #: actions/groupsearch.php:52
 #, php-format
 msgid ""
@@ -1441,30 +1464,6 @@ msgid ""
 "action.newgroup%%) yourself!"
 msgstr ""
 
-#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
-msgid "Groups"
-msgstr "مجموعات"
-
-#: actions/groups.php:64
-#, php-format
-msgid "Groups, page %d"
-msgstr "المجموعات، صفحة %d"
-
-#: actions/groups.php:90
-#, php-format
-msgid ""
-"%%%%site.name%%%% groups let you find and talk with people of similar "
-"interests. After you join a group you can send messages to all other members "
-"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
-"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
-"%%%%)"
-msgstr ""
-
-#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
-msgid "Create a new group"
-msgstr "أنشئ مجموعة جديدة"
-
 #: actions/groupunblock.php:91
 msgid "Only an admin can unblock group members."
 msgstr ""
@@ -1642,7 +1641,7 @@ msgstr "رسالة شخصية"
 msgid "Optionally add a personal message to the invitation."
 msgstr ""
 
-#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:222
 msgid "Send"
 msgstr "أرسل"
 
@@ -1722,61 +1721,61 @@ msgstr ""
 msgid "%s left group %s"
 msgstr ""
 
-#: actions/login.php:82 actions/register.php:137
+#: actions/login.php:83 actions/register.php:137
 msgid "Already logged in."
 msgstr "والج بالفعل."
 
-#: actions/login.php:113 actions/login.php:123
+#: actions/login.php:114 actions/login.php:124
 msgid "Invalid or expired token."
 msgstr ""
 
-#: actions/login.php:146
+#: actions/login.php:147
 msgid "Incorrect username or password."
 msgstr "اسم المستخدم أو كلمة السر غير صحيحان."
 
-#: actions/login.php:152
+#: actions/login.php:153
 msgid "Error setting user. You are probably not authorized."
 msgstr "خطأ أثناء ضبط المستخدم. لست مُصرحًا على الأرجح."
 
-#: actions/login.php:207 actions/login.php:260 lib/action.php:458
+#: actions/login.php:208 actions/login.php:261 lib/action.php:458
 #: lib/logingroupnav.php:79
 msgid "Login"
 msgstr "لُج"
 
-#: actions/login.php:246
+#: actions/login.php:247
 msgid "Login to site"
 msgstr "لُج إلى الموقع"
 
-#: actions/login.php:249 actions/profilesettings.php:106
+#: actions/login.php:250 actions/profilesettings.php:106
 #: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
 #: lib/groupeditform.php:152 lib/userprofile.php:131
 msgid "Nickname"
 msgstr "الاسم المستعار"
 
-#: actions/login.php:252 actions/register.php:428
+#: actions/login.php:253 actions/register.php:428
 #: lib/accountsettingsaction.php:116
 msgid "Password"
 msgstr "كلمة السر"
 
-#: actions/login.php:255 actions/register.php:477
+#: actions/login.php:256 actions/register.php:477
 msgid "Remember me"
 msgstr "تذكّرني"
 
-#: actions/login.php:256 actions/register.php:479
+#: actions/login.php:257 actions/register.php:479
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 
-#: actions/login.php:266
+#: actions/login.php:267
 msgid "Lost or forgotten password?"
 msgstr "أنسيت كلمة السر؟"
 
-#: actions/login.php:285
+#: actions/login.php:286
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 msgstr ""
 
-#: actions/login.php:289
+#: actions/login.php:290
 #, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -1845,7 +1844,7 @@ msgstr "أُرسلت الرسالة"
 msgid "Direct message to %s sent"
 msgstr ""
 
-#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:242 lib/channel.php:170
 msgid "Ajax Error"
 msgstr "خطأ أجاكس"
 
@@ -1853,7 +1852,7 @@ msgstr "خطأ أجاكس"
 msgid "New notice"
 msgstr "إشعار جديد"
 
-#: actions/newnotice.php:206
+#: actions/newnotice.php:208
 msgid "Notice posted"
 msgstr "أُرسل الإشعار"
 
@@ -1927,8 +1926,8 @@ msgstr "نوع المحتوى "
 msgid "Only "
 msgstr ""
 
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996
-#: lib/api.php:1024 lib/api.php:1134
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011
+#: lib/api.php:1039 lib/api.php:1149
 msgid "Not a supported data format."
 msgstr "ليس نسق بيانات مدعوم."
 
@@ -3410,6 +3409,26 @@ msgstr "جابر"
 msgid "SMS"
 msgstr "رسائل قصيرة"
 
+#: actions/tag.php:68
+#, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr ""
+
+#: actions/tag.php:86
+#, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr ""
+
+#: actions/tag.php:92
+#, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr ""
+
+#: actions/tag.php:98
+#, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr ""
+
 #: actions/tagother.php:33
 msgid "Not logged in"
 msgstr "لست والجًا"
@@ -3454,26 +3473,6 @@ msgstr "تعذّر حفظ الوسوم."
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 
-#: actions/tag.php:68
-#, php-format
-msgid "Notices tagged with %s, page %d"
-msgstr ""
-
-#: actions/tag.php:86
-#, php-format
-msgid "Notice feed for tag %s (RSS 1.0)"
-msgstr ""
-
-#: actions/tag.php:92
-#, php-format
-msgid "Notice feed for tag %s (RSS 2.0)"
-msgstr ""
-
-#: actions/tag.php:98
-#, php-format
-msgid "Notice feed for tag %s (Atom)"
-msgstr ""
-
 #: actions/tagrss.php:35
 msgid "No such tag."
 msgstr "لا وسم كهذا."
@@ -3763,38 +3762,43 @@ msgstr ""
 msgid "DB error inserting hashtag: %s"
 msgstr ""
 
-#: classes/Notice.php:179
+#: classes/Notice.php:188
 msgid "Problem saving notice. Too long."
 msgstr "مشكلة في حفظ الإشعار. طويل جدًا."
 
-#: classes/Notice.php:183
+#: classes/Notice.php:192
 msgid "Problem saving notice. Unknown user."
 msgstr "مشكلة في حفظ الإشعار. مستخدم غير معروف."
 
-#: classes/Notice.php:188
+#: classes/Notice.php:197
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
-#: classes/Notice.php:194
+#: classes/Notice.php:203
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
 msgstr ""
 
-#: classes/Notice.php:200
+#: classes/Notice.php:209
 msgid "You are banned from posting notices on this site."
 msgstr ""
 
-#: classes/Notice.php:265 classes/Notice.php:290
+#: classes/Notice.php:274 classes/Notice.php:299
 msgid "Problem saving notice."
 msgstr "مشكلة أثناء حفظ الإشعار."
 
-#: classes/Notice.php:1124
+#: classes/Notice.php:1115
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr ""
 
+#: classes/User.php:347
+#, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr "أهلا بكم في %1$s يا @%2$s!"
+
 #: classes/User_group.php:380
 msgid "Could not create group."
 msgstr "تعذّر إنشاء المجموعة."
@@ -3803,11 +3807,6 @@ msgstr "تعذّر إنشاء المجموعة."
 msgid "Could not set group membership."
 msgstr "تعذّر ضبط عضوية المجموعة."
 
-#: classes/User.php:347
-#, php-format
-msgid "Welcome to %1$s, @%2$s!"
-msgstr "أهلا بكم في %1$s يا @%2$s!"
-
 #: lib/accountsettingsaction.php:108
 msgid "Change your profile settings"
 msgstr "غيّر إعدادات ملفك الشخصي"
@@ -4112,7 +4111,7 @@ msgstr ""
 msgid "Notice with that id does not exist"
 msgstr ""
 
-#: lib/command.php:168 lib/command.php:416 lib/command.php:471
+#: lib/command.php:168 lib/command.php:416 lib/command.php:472
 msgid "User has no last notice"
 msgstr "ليس للمستخدم إشعار أخير"
 
@@ -4159,72 +4158,72 @@ msgstr ""
 msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr ""
 
-#: lib/command.php:439
+#: lib/command.php:440
 #, php-format
 msgid "Reply to %s sent"
 msgstr "رُد على رسالة %s"
 
-#: lib/command.php:441
+#: lib/command.php:442
 msgid "Error saving notice."
 msgstr "خطأ أثناء حفظ الإشعار."
 
-#: lib/command.php:495
+#: lib/command.php:496
 msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: lib/command.php:502
+#: lib/command.php:503
 #, php-format
 msgid "Subscribed to %s"
 msgstr "مُشترك ب%s"
 
-#: lib/command.php:523
+#: lib/command.php:524
 msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: lib/command.php:530
+#: lib/command.php:531
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr ""
 
-#: lib/command.php:548 lib/command.php:571
+#: lib/command.php:549 lib/command.php:572
 msgid "Command not yet implemented."
 msgstr ""
 
-#: lib/command.php:551
+#: lib/command.php:552
 msgid "Notification off."
 msgstr ""
 
-#: lib/command.php:553
+#: lib/command.php:554
 msgid "Can't turn off notification."
 msgstr ""
 
-#: lib/command.php:574
+#: lib/command.php:575
 msgid "Notification on."
 msgstr ""
 
-#: lib/command.php:576
+#: lib/command.php:577
 msgid "Can't turn on notification."
 msgstr ""
 
-#: lib/command.php:588
+#: lib/command.php:590
 msgid "Login command is disabled"
 msgstr ""
 
-#: lib/command.php:602
+#: lib/command.php:604
 #, fuzzy, php-format
 msgid "Could not create login token for %s"
 msgstr "تعذّر إنشاء الكنى."
 
-#: lib/command.php:607
+#: lib/command.php:609
 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:623
+#: lib/command.php:625
 msgid "You are not subscribed to anyone."
 msgstr "لست مُشتركًا بأي أحد."
 
-#: lib/command.php:625
+#: lib/command.php:627
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "لست مشتركًا بأحد."
@@ -4234,11 +4233,11 @@ msgstr[3] "أنت مشترك بهؤلاء الأشخاص:"
 msgstr[4] ""
 msgstr[5] ""
 
-#: lib/command.php:645
+#: lib/command.php:647
 msgid "No one is subscribed to you."
 msgstr "لا أحد مشترك بك."
 
-#: lib/command.php:647
+#: lib/command.php:649
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "لا أحد مشترك بك."
@@ -4248,11 +4247,11 @@ msgstr[3] "هؤلاء الأشخاص مشتركون بك:"
 msgstr[4] ""
 msgstr[5] ""
 
-#: lib/command.php:667
+#: lib/command.php:669
 msgid "You are not a member of any groups."
 msgstr "لست عضوًا في أي مجموعة."
 
-#: lib/command.php:669
+#: lib/command.php:671
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "لست عضوًا في أي مجموعة."
@@ -4262,7 +4261,7 @@ msgstr[3] "أنت عضو في هذه المجموعات:"
 msgstr[4] ""
 msgstr[5] ""
 
-#: lib/command.php:683
+#: lib/command.php:685
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -4358,10 +4357,6 @@ msgstr "فضّل هذا الإشعار"
 msgid "Favor"
 msgstr "فضّل"
 
-#: lib/feedlist.php:64
-msgid "Export data"
-msgstr "تصدير البيانات"
-
 #: lib/feed.php:85
 msgid "RSS 1.0"
 msgstr "آرإس​إس 1.0"
@@ -4378,6 +4373,10 @@ msgstr "أتوم"
 msgid "FOAF"
 msgstr "FOAF"
 
+#: lib/feedlist.php:64
+msgid "Export data"
+msgstr "تصدير البيانات"
+
 #: lib/galleryaction.php:121
 msgid "Filter tags"
 msgstr "رشّح الوسوم"
@@ -4536,20 +4535,6 @@ msgstr ""
 msgid "Sign up for a new account"
 msgstr ""
 
-#: lib/mailbox.php:89
-msgid "Only the user can read their own mailboxes."
-msgstr ""
-
-#: lib/mailbox.php:139
-msgid ""
-"You have no private messages. You can send private message to engage other "
-"users in conversation. People can send you messages for your eyes only."
-msgstr ""
-
-#: lib/mailbox.php:227 lib/noticelist.php:452
-msgid "from"
-msgstr "من"
-
 #: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "تأكيد عنوان البريد الإلكتروني"
@@ -4726,6 +4711,20 @@ msgid ""
 "\n"
 msgstr ""
 
+#: lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
+msgstr ""
+
+#: lib/mailbox.php:139
+msgid ""
+"You have no private messages. You can send private message to engage other "
+"users in conversation. People can send you messages for your eyes only."
+msgstr ""
+
+#: lib/mailbox.php:227 lib/noticelist.php:452
+msgid "from"
+msgstr "من"
+
 #: lib/mediafile.php:98 lib/mediafile.php:123
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
@@ -4786,7 +4785,7 @@ msgstr "أرسل إشعارًا مباشرًا"
 msgid "To"
 msgstr "إلى"
 
-#: lib/messageform.php:161 lib/noticeform.php:185
+#: lib/messageform.php:159 lib/noticeform.php:183
 msgid "Available characters"
 msgstr "المحارف المتوفرة"
 
@@ -4799,11 +4798,11 @@ msgstr "أرسل إشعارًا"
 msgid "What's up, %s?"
 msgstr "ما الأخبار يا %s؟"
 
-#: lib/noticeform.php:192
+#: lib/noticeform.php:190
 msgid "Attach"
 msgstr "أرفق"
 
-#: lib/noticeform.php:196
+#: lib/noticeform.php:194
 msgid "Attach a file"
 msgstr "أرفق ملفًا"
 
@@ -4872,11 +4871,11 @@ msgstr "خطأ أثناء إدراج الملف الشخصي البعيد"
 msgid "Duplicate notice"
 msgstr "ضاعف الإشعار"
 
-#: lib/oauthstore.php:467 lib/subs.php:48
+#: lib/oauthstore.php:466 lib/subs.php:48
 msgid "You have been banned from subscribing."
 msgstr ""
 
-#: lib/oauthstore.php:492
+#: lib/oauthstore.php:491
 msgid "Couldn't insert new subscription."
 msgstr "تعذّر إدراج اشتراك جديد."
 
@@ -5038,20 +5037,6 @@ msgstr "الأشخاص المشتركون ب%s"
 msgid "Groups %s is a member of"
 msgstr "المجموعات التي %s عضو فيها"
 
-#: lib/subscriberspeopleselftagcloudsection.php:48
-#: lib/subscriptionspeopleselftagcloudsection.php:48
-msgid "People Tagcloud as self-tagged"
-msgstr ""
-
-#: lib/subscriberspeopletagcloudsection.php:48
-#: lib/subscriptionspeopletagcloudsection.php:48
-msgid "People Tagcloud as tagged"
-msgstr ""
-
-#: lib/subscriptionlist.php:126
-msgid "(none)"
-msgstr "(لا شيء)"
-
 #: lib/subs.php:52
 msgid "Already subscribed!"
 msgstr "مُشترك أصلا!"
@@ -5082,6 +5067,20 @@ msgstr "تعذّر حذف الاشتراك."
 msgid "Couldn't delete subscription."
 msgstr "تعذّر حذف الاشتراك."
 
+#: lib/subscriberspeopleselftagcloudsection.php:48
+#: lib/subscriptionspeopleselftagcloudsection.php:48
+msgid "People Tagcloud as self-tagged"
+msgstr ""
+
+#: lib/subscriberspeopletagcloudsection.php:48
+#: lib/subscriptionspeopletagcloudsection.php:48
+msgid "People Tagcloud as tagged"
+msgstr ""
+
+#: lib/subscriptionlist.php:126
+msgid "(none)"
+msgstr "(لا شيء)"
+
 #: lib/tagcloudsection.php:56
 msgid "None"
 msgstr "لا شيء"
diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po
index e1d9bd7776..0904420e09 100644
--- a/locale/bg/LC_MESSAGES/statusnet.po
+++ b/locale/bg/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 21:25+0000\n"
-"PO-Revision-Date: 2009-12-07 21:26:01+0000\n"
+"POT-Creation-Date: 2009-12-12 17:09+0000\n"
+"PO-Revision-Date: 2009-12-12 17:09:15+0000\n"
 "Language-Team: Bulgarian\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n"
+"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: bg\n"
 "X-Message-Group: out-statusnet\n"
@@ -26,11 +26,11 @@ msgstr "Няма такака страница."
 
 #: actions/all.php:74 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofile.php:105
 #: actions/apiaccountupdateprofilebackgroundimage.php:116
-#: actions/apiaccountupdateprofileimage.php:105
-#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
-#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
-#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
+#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90
 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
@@ -43,7 +43,7 @@ msgstr "Няма такака страница."
 #: actions/repliesrss.php:38 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38
 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
-#: lib/command.php:364 lib/command.php:411 lib/command.php:466
+#: lib/command.php:364 lib/command.php:411 lib/command.php:467
 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
 #: lib/subs.php:34 lib/subs.php:116
 msgid "No such user."
@@ -55,7 +55,7 @@ msgid "%s and friends, page %d"
 msgstr "%s и приятели, страница %d"
 
 #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
-#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100
+#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s и приятели"
@@ -106,24 +106,24 @@ msgstr ""
 msgid "You and friends"
 msgstr "Вие и приятелите"
 
-#: actions/allrss.php:119 actions/apitimelinefriends.php:121
+#: actions/allrss.php:119 actions/apitimelinefriends.php:122
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Бележки от %1$s и приятели в %2$s."
 
 #: actions/apiaccountratelimitstatus.php:70
 #: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofile.php:97
 #: actions/apiaccountupdateprofilebackgroundimage.php:94
 #: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apiaccountupdateprofile.php:97
 msgid "API method not found."
 msgstr "Не е открит методът в API."
 
 #: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofile.php:89
 #: actions/apiaccountupdateprofilebackgroundimage.php:86
 #: actions/apiaccountupdateprofilecolors.php:110
-#: actions/apiaccountupdateprofileimage.php:84
-#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
+#: actions/apiaccountupdateprofileimage.php:84 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
@@ -142,9 +142,22 @@ msgstr ""
 msgid "Could not update user."
 msgstr "Грешка при обновяване на потребителя."
 
+#: actions/apiaccountupdateprofile.php:112
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+msgid "User has no profile."
+msgstr "Потребителят няма профил."
+
+#: actions/apiaccountupdateprofile.php:147
+msgid "Could not save profile."
+msgstr "Грешка при запазване на профила."
+
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257
 #: actions/designadminpanel.php:122 actions/newnotice.php:94
 #: lib/designsettings.php:283
 #, php-format
@@ -167,19 +180,6 @@ msgstr "Грешка при записване настройките за Twitt
 msgid "Could not update your design."
 msgstr "Грешка при обновяване на потребителя."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
-#: actions/apiaccountupdateprofileimage.php:130
-#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
-#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
-msgid "User has no profile."
-msgstr "Потребителят няма профил."
-
-#: actions/apiaccountupdateprofile.php:147
-msgid "Could not save profile."
-msgstr "Грешка при запазване на профила."
-
 #: actions/apiblockcreate.php:105
 #, fuzzy
 msgid "You cannot block yourself!"
@@ -193,25 +193,6 @@ msgstr ""
 msgid "Unblock user failed."
 msgstr ""
 
-#: actions/apidirectmessagenew.php:126
-msgid "No message text!"
-msgstr "Липсва текст на съобщението"
-
-#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
-#, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr "Твърде дълго. Може да е най-много %d знака."
-
-#: actions/apidirectmessagenew.php:146
-msgid "Recipient user not found."
-msgstr "Получателят не е открит"
-
-#: actions/apidirectmessagenew.php:150
-msgid "Can't send direct messages to users who aren't your friend."
-msgstr ""
-"Не може да изпращате преки съобщения до хора, които не са в списъка ви с "
-"приятели."
-
 #: actions/apidirectmessage.php:89
 #, php-format
 msgid "Direct messages from %s"
@@ -237,18 +218,37 @@ msgstr "Всички преки съобщения, изпратени до %s"
 #: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
-#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
-#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149
-#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
-#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156
+#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151
+#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141
+#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
 msgid "API method not found!"
 msgstr "Не е открит методът в API."
 
+#: actions/apidirectmessagenew.php:126
+msgid "No message text!"
+msgstr "Липсва текст на съобщението"
+
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "Твърде дълго. Може да е най-много %d знака."
+
+#: actions/apidirectmessagenew.php:146
+msgid "Recipient user not found."
+msgstr "Получателят не е открит"
+
+#: actions/apidirectmessagenew.php:150
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr ""
+"Не може да изпращате преки съобщения до хора, които не са в списъка ви с "
+"приятели."
+
 #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
 #: actions/apistatusesdestroy.php:113
 msgid "No status found with that ID."
@@ -395,16 +395,6 @@ msgstr "Не членувате в тази група."
 msgid "Could not remove user %s to group %s."
 msgstr "Грешка при проследяване — потребителят не е намерен."
 
-#: actions/apigrouplistall.php:90 actions/usergroups.php:62
-#, php-format
-msgid "%s groups"
-msgstr "Групи на %s"
-
-#: actions/apigrouplistall.php:94
-#, fuzzy, php-format
-msgid "groups on %s"
-msgstr "Търсене на групи в сайта"
-
 #: actions/apigrouplist.php:95
 #, php-format
 msgid "%s's groups"
@@ -415,6 +405,16 @@ msgstr "Групи на %s"
 msgid "Groups %s is a member of on %s."
 msgstr "Групи, в които участва %s"
 
+#: actions/apigrouplistall.php:90 actions/usergroups.php:62
+#, php-format
+msgid "%s groups"
+msgstr "Групи на %s"
+
+#: actions/apigrouplistall.php:94
+#, fuzzy, php-format
+msgid "groups on %s"
+msgstr "Търсене на групи в сайта"
+
 #: actions/apistatusesdestroy.php:107
 msgid "This method requires a POST or DELETE."
 msgstr "Този метод изисква заявка POST или DELETE."
@@ -450,54 +450,54 @@ msgstr ""
 msgid "Unsupported format."
 msgstr "Неподдържан формат."
 
-#: actions/apitimelinefavorites.php:107
+#: actions/apitimelinefavorites.php:108
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr "%s / Отбелязани като любими от %s"
 
-#: actions/apitimelinefavorites.php:119
+#: actions/apitimelinefavorites.php:120
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr "%s бележки отбелязани като любими от %s / %s."
 
-#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117
+#: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118
 #: actions/grouprss.php:131 actions/userrss.php:90
 #, php-format
 msgid "%s timeline"
 msgstr "Поток на %s"
 
-#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125
+#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
 #: actions/userrss.php:92
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Бележки от %1$s в %2$s."
 
-#: actions/apitimelinementions.php:116
+#: actions/apitimelinementions.php:117
 #, fuzzy, php-format
 msgid "%1$s / Updates mentioning %2$s"
 msgstr "%1$s / Реплики на %2$s"
 
-#: actions/apitimelinementions.php:126
+#: actions/apitimelinementions.php:127
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s реплики на съобщения от %2$s / %3$s."
 
-#: actions/apitimelinepublic.php:106 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "Общ поток на %s"
 
-#: actions/apitimelinepublic.php:110 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr ""
 
-#: actions/apitimelinetag.php:101 actions/tag.php:66
+#: actions/apitimelinetag.php:102 actions/tag.php:66
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Бележки с етикет %s"
 
-#: actions/apitimelinetag.php:107 actions/tagrss.php:64
+#: actions/apitimelinetag.php:108 actions/tagrss.php:64
 #, fuzzy, php-format
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Бележки от %1$s в %2$s."
@@ -533,45 +533,45 @@ msgstr "Аватар"
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr "Можете да качите личен аватар тук."
 
-#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:185
 #: actions/grouplogo.php:178 actions/remotesubscribe.php:191
 #: actions/userauthorization.php:72 actions/userrss.php:103
 msgid "User without matching profile"
 msgstr "Потребител без съответстващ профил"
 
-#: actions/avatarsettings.php:119 actions/avatarsettings.php:194
+#: actions/avatarsettings.php:119 actions/avatarsettings.php:197
 #: actions/grouplogo.php:251
 msgid "Avatar settings"
 msgstr "Настройки за аватар"
 
-#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/avatarsettings.php:127 actions/avatarsettings.php:205
 #: actions/grouplogo.php:199 actions/grouplogo.php:259
 msgid "Original"
 msgstr "Оригинал"
 
-#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/avatarsettings.php:142 actions/avatarsettings.php:217
 #: actions/grouplogo.php:210 actions/grouplogo.php:271
 msgid "Preview"
 msgstr "Преглед"
 
-#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
+#: actions/avatarsettings.php:149 lib/deleteuserform.php:66
 #: lib/noticelist.php:550
 msgid "Delete"
 msgstr "Изтриване"
 
-#: actions/avatarsettings.php:165 actions/grouplogo.php:233
+#: actions/avatarsettings.php:166 actions/grouplogo.php:233
 msgid "Upload"
 msgstr "Качване"
 
-#: actions/avatarsettings.php:228 actions/grouplogo.php:286
+#: actions/avatarsettings.php:231 actions/grouplogo.php:286
 msgid "Crop"
 msgstr "Изрязване"
 
-#: actions/avatarsettings.php:265 actions/disfavor.php:74
+#: actions/avatarsettings.php:268 actions/disfavor.php:74
 #: actions/emailsettings.php:238 actions/favor.php:75
 #: actions/groupblock.php:66 actions/grouplogo.php:309
 #: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -582,33 +582,72 @@ msgstr "Изрязване"
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Имаше проблем със сесията ви в сайта. Моля, опитайте отново!"
 
-#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
+#: actions/avatarsettings.php:281 actions/designadminpanel.php:103
 #: actions/emailsettings.php:256 actions/grouplogo.php:319
 #: actions/imsettings.php:220 actions/recoverpassword.php:44
 #: actions/smssettings.php:248 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "Неочаквано изпращане на форма."
 
-#: actions/avatarsettings.php:322
+#: actions/avatarsettings.php:328
 msgid "Pick a square area of the image to be your avatar"
 msgstr "Изберете квадратна област от изображението за аватар"
 
-#: actions/avatarsettings.php:337 actions/grouplogo.php:377
+#: actions/avatarsettings.php:343 actions/grouplogo.php:377
 msgid "Lost our file data."
 msgstr ""
 
-#: actions/avatarsettings.php:360
+#: actions/avatarsettings.php:366
 msgid "Avatar updated."
 msgstr "Аватарът е обновен."
 
-#: actions/avatarsettings.php:363
+#: actions/avatarsettings.php:369
 msgid "Failed updating avatar."
 msgstr "Неуспешно обновяване на аватара."
 
-#: actions/avatarsettings.php:387
+#: actions/avatarsettings.php:393
 msgid "Avatar deleted."
 msgstr "Аватарът е изтрит."
 
+#: actions/block.php:69
+#, fuzzy
+msgid "You already blocked that user."
+msgstr "Вече сте блокирали този потребител."
+
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
+msgid "Block user"
+msgstr "Блокиране на потребителя"
+
+#: actions/block.php:130
+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/block.php:143 actions/deletenotice.php:145
+#: actions/deleteuser.php:147 actions/groupblock.php:178
+msgid "No"
+msgstr "Не"
+
+#: actions/block.php:143 actions/deleteuser.php:147
+#, fuzzy
+msgid "Do not block this user"
+msgstr "Разблокиране на този потребител"
+
+#: actions/block.php:144 actions/deletenotice.php:146
+#: actions/deleteuser.php:148 actions/groupblock.php:179
+msgid "Yes"
+msgstr "Да"
+
+#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
+msgid "Block this user"
+msgstr "Блокиране на потребителя"
+
+#: actions/block.php:162
+msgid "Failed to save block information."
+msgstr "Грешка при записване данните за блокирането."
+
 #: actions/blockedfromgroup.php:73 actions/editgroup.php:84
 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
 #: actions/groupmembers.php:76 actions/grouprss.php:91
@@ -651,45 +690,6 @@ msgstr "Разблокиране"
 msgid "Unblock this user"
 msgstr "Разблокиране на този потребител"
 
-#: actions/block.php:69
-#, fuzzy
-msgid "You already blocked that user."
-msgstr "Вече сте блокирали този потребител."
-
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
-msgid "Block user"
-msgstr "Блокиране на потребителя"
-
-#: actions/block.php:130
-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/block.php:143 actions/deletenotice.php:145
-#: actions/deleteuser.php:147 actions/groupblock.php:178
-msgid "No"
-msgstr "Не"
-
-#: actions/block.php:143 actions/deleteuser.php:147
-#, fuzzy
-msgid "Do not block this user"
-msgstr "Разблокиране на този потребител"
-
-#: actions/block.php:144 actions/deletenotice.php:146
-#: actions/deleteuser.php:148 actions/groupblock.php:179
-msgid "Yes"
-msgstr "Да"
-
-#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
-msgid "Block this user"
-msgstr "Блокиране на потребителя"
-
-#: actions/block.php:162
-msgid "Failed to save block information."
-msgstr "Грешка при записване данните за блокирането."
-
 #: actions/bookmarklet.php:50
 #, fuzzy
 msgid "Post to "
@@ -1163,6 +1163,15 @@ msgstr "Входящият адрес на е-поща е премахнат."
 msgid "New incoming email address added."
 msgstr "Добавен е нов входящ адрес на е-поща."
 
+#: actions/favor.php:79
+msgid "This notice is already a favorite!"
+msgstr "Тази бележка вече е отбелязана като любима!"
+
+#: actions/favor.php:92 lib/disfavorform.php:140
+#, fuzzy
+msgid "Disfavor favorite"
+msgstr "Нелюбимо"
+
 #: actions/favorited.php:65 lib/popularnoticesection.php:88
 #: lib/publicgroupnav.php:93
 msgid "Popular notices"
@@ -1205,15 +1214,6 @@ msgstr "Любими бележки на %s"
 msgid "Updates favored by %1$s on %2$s!"
 msgstr "Бележки от %1$s в %2$s."
 
-#: actions/favor.php:79
-msgid "This notice is already a favorite!"
-msgstr "Тази бележка вече е отбелязана като любима!"
-
-#: actions/favor.php:92 lib/disfavorform.php:140
-#, fuzzy
-msgid "Disfavor favorite"
-msgstr "Нелюбимо"
-
 #: actions/featured.php:69 lib/featureduserssection.php:87
 #: lib/publicgroupnav.php:89
 msgid "Featured users"
@@ -1456,6 +1456,30 @@ msgstr ""
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "Бележки от %1$s в %2$s."
 
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+msgid "Groups"
+msgstr "Групи"
+
+#: actions/groups.php:64
+#, php-format
+msgid "Groups, page %d"
+msgstr "Групи, страница %d"
+
+#: actions/groups.php:90
+#, php-format
+msgid ""
+"%%%%site.name%%%% groups let you find and talk with people of similar "
+"interests. After you join a group you can send messages to all other members "
+"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
+"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
+"%%%%)"
+msgstr ""
+
+#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
+msgid "Create a new group"
+msgstr "Създаване на нова група"
+
 #: actions/groupsearch.php:52
 #, fuzzy, php-format
 msgid ""
@@ -1488,30 +1512,6 @@ msgid ""
 "action.newgroup%%) yourself!"
 msgstr ""
 
-#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
-msgid "Groups"
-msgstr "Групи"
-
-#: actions/groups.php:64
-#, php-format
-msgid "Groups, page %d"
-msgstr "Групи, страница %d"
-
-#: actions/groups.php:90
-#, php-format
-msgid ""
-"%%%%site.name%%%% groups let you find and talk with people of similar "
-"interests. After you join a group you can send messages to all other members "
-"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
-"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
-"%%%%)"
-msgstr ""
-
-#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
-msgid "Create a new group"
-msgstr "Създаване на нова група"
-
 #: actions/groupunblock.php:91
 msgid "Only an admin can unblock group members."
 msgstr ""
@@ -1704,7 +1704,7 @@ msgstr "Лично съобщение"
 msgid "Optionally add a personal message to the invitation."
 msgstr "Може да добавите и лично съобщение към поканата."
 
-#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:222
 msgid "Send"
 msgstr "Прати"
 
@@ -1811,57 +1811,57 @@ msgstr "Грешка при проследяване — потребителя
 msgid "%s left group %s"
 msgstr "%s напусна групата %s"
 
-#: actions/login.php:82 actions/register.php:137
+#: actions/login.php:83 actions/register.php:137
 msgid "Already logged in."
 msgstr "Вече сте влезли."
 
-#: actions/login.php:113 actions/login.php:123
+#: actions/login.php:114 actions/login.php:124
 #, fuzzy
 msgid "Invalid or expired token."
 msgstr "Невалидно съдържание на бележка"
 
-#: actions/login.php:146
+#: actions/login.php:147
 msgid "Incorrect username or password."
 msgstr "Грешно име или парола."
 
-#: actions/login.php:152
+#: actions/login.php:153
 #, fuzzy
 msgid "Error setting user. You are probably not authorized."
 msgstr "Забранено."
 
-#: actions/login.php:207 actions/login.php:260 lib/action.php:458
+#: actions/login.php:208 actions/login.php:261 lib/action.php:458
 #: lib/logingroupnav.php:79
 msgid "Login"
 msgstr "Вход"
 
-#: actions/login.php:246
+#: actions/login.php:247
 msgid "Login to site"
 msgstr ""
 
-#: actions/login.php:249 actions/profilesettings.php:106
+#: actions/login.php:250 actions/profilesettings.php:106
 #: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
 #: lib/groupeditform.php:152 lib/userprofile.php:131
 msgid "Nickname"
 msgstr "Псевдоним"
 
-#: actions/login.php:252 actions/register.php:428
+#: actions/login.php:253 actions/register.php:428
 #: lib/accountsettingsaction.php:116
 msgid "Password"
 msgstr "Парола"
 
-#: actions/login.php:255 actions/register.php:477
+#: actions/login.php:256 actions/register.php:477
 msgid "Remember me"
 msgstr "Запомни ме"
 
-#: actions/login.php:256 actions/register.php:479
+#: actions/login.php:257 actions/register.php:479
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Автоматично влизане занапред. Да не се ползва на общи компютри!"
 
-#: actions/login.php:266
+#: actions/login.php:267
 msgid "Lost or forgotten password?"
 msgstr "Загубена или забравена парола"
 
-#: actions/login.php:285
+#: actions/login.php:286
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -1869,7 +1869,7 @@ msgstr ""
 "За по-голяма сигурност, моля въведете отново потребителското си име и парола "
 "при промяна на настройките."
 
-#: actions/login.php:289
+#: actions/login.php:290
 #, fuzzy, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -1942,7 +1942,7 @@ msgstr "Съобщението е изпратено"
 msgid "Direct message to %s sent"
 msgstr "Прякото съобщение до %s е изпратено."
 
-#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:242 lib/channel.php:170
 msgid "Ajax Error"
 msgstr "Грешка в Ajax"
 
@@ -1950,7 +1950,7 @@ msgstr "Грешка в Ajax"
 msgid "New notice"
 msgstr "Нова бележка"
 
-#: actions/newnotice.php:206
+#: actions/newnotice.php:208
 msgid "Notice posted"
 msgstr "Бележката е публикувана"
 
@@ -2027,8 +2027,8 @@ msgstr "Свързване"
 msgid "Only "
 msgstr ""
 
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996
-#: lib/api.php:1024 lib/api.php:1134
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011
+#: lib/api.php:1039 lib/api.php:1149
 msgid "Not a supported data format."
 msgstr "Неподдържан формат на данните"
 
@@ -3563,6 +3563,26 @@ msgstr "Jabber"
 msgid "SMS"
 msgstr "SMS"
 
+#: actions/tag.php:68
+#, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr "Бележки с етикет %s, страница %d"
+
+#: actions/tag.php:86
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "Емисия с бележки на %s"
+
+#: actions/tag.php:92
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "Емисия с бележки на %s"
+
+#: actions/tag.php:98
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "Емисия с бележки на %s"
+
 #: actions/tagother.php:33
 #, fuzzy
 msgid "Not logged in"
@@ -3610,26 +3630,6 @@ msgstr "Грешка при запазване на етикетите."
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 
-#: actions/tag.php:68
-#, php-format
-msgid "Notices tagged with %s, page %d"
-msgstr "Бележки с етикет %s, страница %d"
-
-#: actions/tag.php:86
-#, fuzzy, php-format
-msgid "Notice feed for tag %s (RSS 1.0)"
-msgstr "Емисия с бележки на %s"
-
-#: actions/tag.php:92
-#, fuzzy, php-format
-msgid "Notice feed for tag %s (RSS 2.0)"
-msgstr "Емисия с бележки на %s"
-
-#: actions/tag.php:98
-#, fuzzy, php-format
-msgid "Notice feed for tag %s (Atom)"
-msgstr "Емисия с бележки на %s"
-
 #: actions/tagrss.php:35
 msgid "No such tag."
 msgstr "Няма такъв етикет."
@@ -3942,23 +3942,23 @@ msgstr "Грешка при обновяване на бележката с но
 msgid "DB error inserting hashtag: %s"
 msgstr ""
 
-#: classes/Notice.php:179
+#: classes/Notice.php:188
 #, fuzzy
 msgid "Problem saving notice. Too long."
 msgstr "Проблем при записване на бележката."
 
-#: classes/Notice.php:183
+#: classes/Notice.php:192
 msgid "Problem saving notice. Unknown user."
 msgstr "Грешка при записване на бележката. Непознат потребител."
 
-#: classes/Notice.php:188
+#: classes/Notice.php:197
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 "Твърде много бележки за кратко време. Спрете, поемете дъх и публикувайте "
 "отново след няколко минути."
 
-#: classes/Notice.php:194
+#: classes/Notice.php:203
 #, fuzzy
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
@@ -3967,19 +3967,24 @@ msgstr ""
 "Твърде много бележки за кратко време. Спрете, поемете дъх и публикувайте "
 "отново след няколко минути."
 
-#: classes/Notice.php:200
+#: classes/Notice.php:209
 msgid "You are banned from posting notices on this site."
 msgstr "Забранено ви е да публикувате бележки в този сайт."
 
-#: classes/Notice.php:265 classes/Notice.php:290
+#: classes/Notice.php:274 classes/Notice.php:299
 msgid "Problem saving notice."
 msgstr "Проблем при записване на бележката."
 
-#: classes/Notice.php:1124
+#: classes/Notice.php:1115
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Грешка в базата от данни — отговор при вмъкването: %s"
 
+#: classes/User.php:347
+#, fuzzy, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr "Съобщение до %1$s в %2$s"
+
 #: classes/User_group.php:380
 msgid "Could not create group."
 msgstr "Грешка при създаване на групата."
@@ -3989,11 +3994,6 @@ msgstr "Грешка при създаване на групата."
 msgid "Could not set group membership."
 msgstr "Грешка при създаване на нов абонамент."
 
-#: classes/User.php:347
-#, fuzzy, php-format
-msgid "Welcome to %1$s, @%2$s!"
-msgstr "Съобщение до %1$s в %2$s"
-
 #: lib/accountsettingsaction.php:108
 msgid "Change your profile settings"
 msgstr "Промяна настройките на профила"
@@ -4311,7 +4311,7 @@ msgstr ""
 msgid "Notice with that id does not exist"
 msgstr ""
 
-#: lib/command.php:168 lib/command.php:416 lib/command.php:471
+#: lib/command.php:168 lib/command.php:416 lib/command.php:472
 msgid "User has no last notice"
 msgstr "Потребителят няма последна бележка"
 
@@ -4360,101 +4360,101 @@ msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr ""
 "Съобщението е твърде дълго. Най-много може да е 140 знака, а сте въвели %d."
 
-#: lib/command.php:439
+#: lib/command.php:440
 #, fuzzy, php-format
 msgid "Reply to %s sent"
 msgstr "Отговаряне на тази бележка"
 
-#: lib/command.php:441
+#: lib/command.php:442
 #, fuzzy
 msgid "Error saving notice."
 msgstr "Проблем при записване на бележката."
 
-#: lib/command.php:495
+#: lib/command.php:496
 msgid "Specify the name of the user to subscribe to"
 msgstr "Уточнете името на потребителя, за когото се абонирате."
 
-#: lib/command.php:502
+#: lib/command.php:503
 #, php-format
 msgid "Subscribed to %s"
 msgstr "Абонирани сте за %s."
 
-#: lib/command.php:523
+#: lib/command.php:524
 msgid "Specify the name of the user to unsubscribe from"
 msgstr "Уточнете името на потребителя, от когото се отписвате."
 
-#: lib/command.php:530
+#: lib/command.php:531
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr "Отписани сте от %s."
 
-#: lib/command.php:548 lib/command.php:571
+#: lib/command.php:549 lib/command.php:572
 msgid "Command not yet implemented."
 msgstr "Командата все още не се поддържа."
 
-#: lib/command.php:551
+#: lib/command.php:552
 msgid "Notification off."
 msgstr "Уведомлението е изключено."
 
-#: lib/command.php:553
+#: lib/command.php:554
 msgid "Can't turn off notification."
 msgstr "Грешка при изключване на уведомлението."
 
-#: lib/command.php:574
+#: lib/command.php:575
 msgid "Notification on."
 msgstr "Уведомлението е включено."
 
-#: lib/command.php:576
+#: lib/command.php:577
 msgid "Can't turn on notification."
 msgstr "Грешка при включване на уведомлението."
 
-#: lib/command.php:588
+#: lib/command.php:590
 msgid "Login command is disabled"
 msgstr ""
 
-#: lib/command.php:602
+#: lib/command.php:604
 #, fuzzy, php-format
 msgid "Could not create login token for %s"
 msgstr "Грешка при отбелязване като любима."
 
-#: lib/command.php:607
+#: lib/command.php:609
 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:623
+#: lib/command.php:625
 #, fuzzy
 msgid "You are not subscribed to anyone."
 msgstr "Не сте абонирани за този профил"
 
-#: lib/command.php:625
+#: lib/command.php:627
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Вече сте абонирани за следните потребители:"
 msgstr[1] "Вече сте абонирани за следните потребители:"
 
-#: lib/command.php:645
+#: lib/command.php:647
 #, fuzzy
 msgid "No one is subscribed to you."
 msgstr "Грешка при абониране на друг потребител за вас."
 
-#: lib/command.php:647
+#: lib/command.php:649
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Грешка при абониране на друг потребител за вас."
 msgstr[1] "Грешка при абониране на друг потребител за вас."
 
-#: lib/command.php:667
+#: lib/command.php:669
 msgid "You are not a member of any groups."
 msgstr "Не членувате в нито една група."
 
-#: lib/command.php:669
+#: lib/command.php:671
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Не членувате в тази група."
 msgstr[1] "Не членувате в тази група."
 
-#: lib/command.php:683
+#: lib/command.php:685
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -4553,10 +4553,6 @@ msgstr "Отбелязване като любимо"
 msgid "Favor"
 msgstr "Любимо"
 
-#: lib/feedlist.php:64
-msgid "Export data"
-msgstr "Изнасяне на данните"
-
 #: lib/feed.php:85
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
@@ -4573,6 +4569,10 @@ msgstr "Atom"
 msgid "FOAF"
 msgstr "FOAF"
 
+#: lib/feedlist.php:64
+msgid "Export data"
+msgstr "Изнасяне на данните"
+
 #: lib/galleryaction.php:121
 msgid "Filter tags"
 msgstr "Филтриране на етикетите"
@@ -4736,20 +4736,6 @@ msgstr "Вход с име и парола"
 msgid "Sign up for a new account"
 msgstr "Създаване на нова сметка"
 
-#: lib/mailbox.php:89
-msgid "Only the user can read their own mailboxes."
-msgstr "Само потребителят може да отваря собствената си кутия."
-
-#: lib/mailbox.php:139
-msgid ""
-"You have no private messages. You can send private message to engage other "
-"users in conversation. People can send you messages for your eyes only."
-msgstr ""
-
-#: lib/mailbox.php:227 lib/noticelist.php:452
-msgid "from"
-msgstr "от"
-
 #: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Потвърждаване адреса на е-поща"
@@ -4934,6 +4920,20 @@ msgid ""
 "\n"
 msgstr ""
 
+#: lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
+msgstr "Само потребителят може да отваря собствената си кутия."
+
+#: lib/mailbox.php:139
+msgid ""
+"You have no private messages. You can send private message to engage other "
+"users in conversation. People can send you messages for your eyes only."
+msgstr ""
+
+#: lib/mailbox.php:227 lib/noticelist.php:452
+msgid "from"
+msgstr "от"
+
 #: lib/mediafile.php:98 lib/mediafile.php:123
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
@@ -4994,7 +4994,7 @@ msgstr "Изпращане на пряко съобщеие"
 msgid "To"
 msgstr "До"
 
-#: lib/messageform.php:161 lib/noticeform.php:185
+#: lib/messageform.php:159 lib/noticeform.php:183
 msgid "Available characters"
 msgstr "Налични знаци"
 
@@ -5007,11 +5007,11 @@ msgstr "Изпращане на бележка"
 msgid "What's up, %s?"
 msgstr "Какво става, %s?"
 
-#: lib/noticeform.php:192
+#: lib/noticeform.php:190
 msgid "Attach"
 msgstr ""
 
-#: lib/noticeform.php:196
+#: lib/noticeform.php:194
 msgid "Attach a file"
 msgstr ""
 
@@ -5082,12 +5082,12 @@ msgstr "Грешка при вмъкване на отдалечен профи
 msgid "Duplicate notice"
 msgstr "Изтриване на бележката"
 
-#: lib/oauthstore.php:467 lib/subs.php:48
+#: lib/oauthstore.php:466 lib/subs.php:48
 #, fuzzy
 msgid "You have been banned from subscribing."
 msgstr "Потребителят е забранил да се абонирате за него."
 
-#: lib/oauthstore.php:492
+#: lib/oauthstore.php:491
 msgid "Couldn't insert new subscription."
 msgstr "Грешка при добавяне на нов абонамент."
 
@@ -5253,20 +5253,6 @@ msgstr "Абонирани за %s"
 msgid "Groups %s is a member of"
 msgstr "Групи, в които участва %s"
 
-#: lib/subscriberspeopleselftagcloudsection.php:48
-#: lib/subscriptionspeopleselftagcloudsection.php:48
-msgid "People Tagcloud as self-tagged"
-msgstr ""
-
-#: lib/subscriberspeopletagcloudsection.php:48
-#: lib/subscriptionspeopletagcloudsection.php:48
-msgid "People Tagcloud as tagged"
-msgstr ""
-
-#: lib/subscriptionlist.php:126
-msgid "(none)"
-msgstr "(няма)"
-
 #: lib/subs.php:52
 msgid "Already subscribed!"
 msgstr ""
@@ -5297,6 +5283,20 @@ msgstr "Грешка при изтриване на абонамента."
 msgid "Couldn't delete subscription."
 msgstr "Грешка при изтриване на абонамента."
 
+#: lib/subscriberspeopleselftagcloudsection.php:48
+#: lib/subscriptionspeopleselftagcloudsection.php:48
+msgid "People Tagcloud as self-tagged"
+msgstr ""
+
+#: lib/subscriberspeopletagcloudsection.php:48
+#: lib/subscriptionspeopletagcloudsection.php:48
+msgid "People Tagcloud as tagged"
+msgstr ""
+
+#: lib/subscriptionlist.php:126
+msgid "(none)"
+msgstr "(няма)"
+
 #: lib/tagcloudsection.php:56
 msgid "None"
 msgstr "Без"
diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po
index 290866b5c8..6cb82084c3 100644
--- a/locale/ca/LC_MESSAGES/statusnet.po
+++ b/locale/ca/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 21:25+0000\n"
-"PO-Revision-Date: 2009-12-07 21:26:04+0000\n"
+"POT-Creation-Date: 2009-12-12 17:09+0000\n"
+"PO-Revision-Date: 2009-12-12 17:09:18+0000\n"
 "Language-Team: Catalan\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n"
+"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: out-statusnet\n"
@@ -26,11 +26,11 @@ msgstr "No existeix la pàgina."
 
 #: actions/all.php:74 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofile.php:105
 #: actions/apiaccountupdateprofilebackgroundimage.php:116
-#: actions/apiaccountupdateprofileimage.php:105
-#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
-#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
-#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
+#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90
 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
@@ -43,7 +43,7 @@ msgstr "No existeix la pàgina."
 #: actions/repliesrss.php:38 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38
 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
-#: lib/command.php:364 lib/command.php:411 lib/command.php:466
+#: lib/command.php:364 lib/command.php:411 lib/command.php:467
 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
 #: lib/subs.php:34 lib/subs.php:116
 msgid "No such user."
@@ -55,7 +55,7 @@ msgid "%s and friends, page %d"
 msgstr "%s i amics, pàgina %d"
 
 #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
-#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100
+#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s i amics"
@@ -108,25 +108,25 @@ msgstr ""
 msgid "You and friends"
 msgstr "Un mateix i amics"
 
-#: actions/allrss.php:119 actions/apitimelinefriends.php:121
+#: actions/allrss.php:119 actions/apitimelinefriends.php:122
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Actualitzacions de %1$s i amics a %2$s!"
 
 #: actions/apiaccountratelimitstatus.php:70
 #: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofile.php:97
 #: actions/apiaccountupdateprofilebackgroundimage.php:94
 #: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apiaccountupdateprofile.php:97
 #, fuzzy
 msgid "API method not found."
 msgstr "No s'ha trobat el mètode API!"
 
 #: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofile.php:89
 #: actions/apiaccountupdateprofilebackgroundimage.php:86
 #: actions/apiaccountupdateprofilecolors.php:110
-#: actions/apiaccountupdateprofileimage.php:84
-#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
+#: actions/apiaccountupdateprofileimage.php:84 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
@@ -146,9 +146,23 @@ msgstr ""
 msgid "Could not update user."
 msgstr "No s'ha pogut actualitzar l'usuari."
 
+#: actions/apiaccountupdateprofile.php:112
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+msgid "User has no profile."
+msgstr "L'usuari no té perfil."
+
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "No s'ha pogut guardar el perfil."
+
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257
 #: actions/designadminpanel.php:122 actions/newnotice.php:94
 #: lib/designsettings.php:283
 #, php-format
@@ -171,20 +185,6 @@ msgstr "No s'ha pogut guardar la teva configuració de Twitter!"
 msgid "Could not update your design."
 msgstr "No s'ha pogut actualitzar l'usuari."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
-#: actions/apiaccountupdateprofileimage.php:130
-#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
-#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
-msgid "User has no profile."
-msgstr "L'usuari no té perfil."
-
-#: actions/apiaccountupdateprofile.php:147
-#, fuzzy
-msgid "Could not save profile."
-msgstr "No s'ha pogut guardar el perfil."
-
 #: actions/apiblockcreate.php:105
 #, fuzzy
 msgid "You cannot block yourself!"
@@ -198,23 +198,6 @@ msgstr "Ha fallat el bloqueig d'usuari."
 msgid "Unblock user failed."
 msgstr "Ha fallat el desbloqueig d'usuari."
 
-#: actions/apidirectmessagenew.php:126
-msgid "No message text!"
-msgstr "No hi ha text al missatge!"
-
-#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
-#, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr "És massa llarg. La mida màxima del missatge és %d caràcters."
-
-#: actions/apidirectmessagenew.php:146
-msgid "Recipient user not found."
-msgstr "No has escrit cap usuari receptor."
-
-#: actions/apidirectmessagenew.php:150
-msgid "Can't send direct messages to users who aren't your friend."
-msgstr "No pots enviar missatges directes a usuaris que no siguin amics teus."
-
 #: actions/apidirectmessage.php:89
 #, php-format
 msgid "Direct messages from %s"
@@ -240,18 +223,35 @@ msgstr "Tots els missatges directes enviats a %s"
 #: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
-#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
-#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149
-#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
-#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156
+#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151
+#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141
+#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
 msgid "API method not found!"
 msgstr "No s'ha trobat el mètode API!"
 
+#: actions/apidirectmessagenew.php:126
+msgid "No message text!"
+msgstr "No hi ha text al missatge!"
+
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "És massa llarg. La mida màxima del missatge és %d caràcters."
+
+#: actions/apidirectmessagenew.php:146
+msgid "Recipient user not found."
+msgstr "No has escrit cap usuari receptor."
+
+#: actions/apidirectmessagenew.php:150
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr "No pots enviar missatges directes a usuaris que no siguin amics teus."
+
 #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
 #: actions/apistatusesdestroy.php:113
 msgid "No status found with that ID."
@@ -401,16 +401,6 @@ msgstr "No sou un membre del grup."
 msgid "Could not remove user %s to group %s."
 msgstr "No s'ha pogut suprimir l'usuari %s del grup %s."
 
-#: actions/apigrouplistall.php:90 actions/usergroups.php:62
-#, php-format
-msgid "%s groups"
-msgstr "%s grups"
-
-#: actions/apigrouplistall.php:94
-#, fuzzy, php-format
-msgid "groups on %s"
-msgstr "Accions del grup"
-
 #: actions/apigrouplist.php:95
 #, php-format
 msgid "%s's groups"
@@ -421,6 +411,16 @@ msgstr "Grups de %s"
 msgid "Groups %s is a member of on %s."
 msgstr "%s grups són membres de"
 
+#: actions/apigrouplistall.php:90 actions/usergroups.php:62
+#, php-format
+msgid "%s groups"
+msgstr "%s grups"
+
+#: actions/apigrouplistall.php:94
+#, fuzzy, php-format
+msgid "groups on %s"
+msgstr "Accions del grup"
+
 #: actions/apistatusesdestroy.php:107
 msgid "This method requires a POST or DELETE."
 msgstr "Aquest mètode requereix POST o DELETE."
@@ -456,54 +456,54 @@ msgstr ""
 msgid "Unsupported format."
 msgstr "El format no està implementat."
 
-#: actions/apitimelinefavorites.php:107
+#: actions/apitimelinefavorites.php:108
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr "%s / Favorits de %s"
 
-#: actions/apitimelinefavorites.php:119
+#: actions/apitimelinefavorites.php:120
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr "%s actualitzacions favorites per %s / %s."
 
-#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117
+#: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118
 #: actions/grouprss.php:131 actions/userrss.php:90
 #, php-format
 msgid "%s timeline"
 msgstr "%s línia temporal"
 
-#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125
+#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
 #: actions/userrss.php:92
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Actualitzacions de %1$s a %2$s!"
 
-#: actions/apitimelinementions.php:116
+#: actions/apitimelinementions.php:117
 #, fuzzy, php-format
 msgid "%1$s / Updates mentioning %2$s"
 msgstr "%1$s / Notificacions contestant a %2$s"
 
-#: actions/apitimelinementions.php:126
+#: actions/apitimelinementions.php:127
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s notificacions que responen a notificacions de %2$s / %3$s."
 
-#: actions/apitimelinepublic.php:106 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s línia temporal pública"
 
-#: actions/apitimelinepublic.php:110 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s notificacions de tots!"
 
-#: actions/apitimelinetag.php:101 actions/tag.php:66
+#: actions/apitimelinetag.php:102 actions/tag.php:66
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Aviso etiquetats amb %s"
 
-#: actions/apitimelinetag.php:107 actions/tagrss.php:64
+#: actions/apitimelinetag.php:108 actions/tagrss.php:64
 #, fuzzy, php-format
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Actualitzacions de %1$s a %2$s!"
@@ -539,45 +539,45 @@ msgstr "Avatar"
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr "Pots pujar el teu avatar personal."
 
-#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:185
 #: actions/grouplogo.php:178 actions/remotesubscribe.php:191
 #: actions/userauthorization.php:72 actions/userrss.php:103
 msgid "User without matching profile"
 msgstr "Usuari sense perfil coincident"
 
-#: actions/avatarsettings.php:119 actions/avatarsettings.php:194
+#: actions/avatarsettings.php:119 actions/avatarsettings.php:197
 #: actions/grouplogo.php:251
 msgid "Avatar settings"
 msgstr "Configuració de l'avatar"
 
-#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/avatarsettings.php:127 actions/avatarsettings.php:205
 #: actions/grouplogo.php:199 actions/grouplogo.php:259
 msgid "Original"
 msgstr "Original"
 
-#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/avatarsettings.php:142 actions/avatarsettings.php:217
 #: actions/grouplogo.php:210 actions/grouplogo.php:271
 msgid "Preview"
 msgstr "Previsualitzar"
 
-#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
+#: actions/avatarsettings.php:149 lib/deleteuserform.php:66
 #: lib/noticelist.php:550
 msgid "Delete"
 msgstr "Eliminar"
 
-#: actions/avatarsettings.php:165 actions/grouplogo.php:233
+#: actions/avatarsettings.php:166 actions/grouplogo.php:233
 msgid "Upload"
 msgstr "Pujar"
 
-#: actions/avatarsettings.php:228 actions/grouplogo.php:286
+#: actions/avatarsettings.php:231 actions/grouplogo.php:286
 msgid "Crop"
 msgstr "Crop"
 
-#: actions/avatarsettings.php:265 actions/disfavor.php:74
+#: actions/avatarsettings.php:268 actions/disfavor.php:74
 #: actions/emailsettings.php:238 actions/favor.php:75
 #: actions/groupblock.php:66 actions/grouplogo.php:309
 #: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -590,35 +590,72 @@ msgstr ""
 "Sembla que hi ha hagut un problema amb la teva sessió. Prova-ho de nou, si "
 "us plau."
 
-#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
+#: actions/avatarsettings.php:281 actions/designadminpanel.php:103
 #: actions/emailsettings.php:256 actions/grouplogo.php:319
 #: actions/imsettings.php:220 actions/recoverpassword.php:44
 #: actions/smssettings.php:248 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "Enviament de formulari inesperat."
 
-#: actions/avatarsettings.php:322
+#: actions/avatarsettings.php:328
 msgid "Pick a square area of the image to be your avatar"
 msgstr ""
 "Selecciona un quadrat de l'àrea de la imatge que vols que sigui el teu "
 "avatar."
 
-#: actions/avatarsettings.php:337 actions/grouplogo.php:377
+#: actions/avatarsettings.php:343 actions/grouplogo.php:377
 msgid "Lost our file data."
 msgstr "S'ha perdut el nostre fitxer de dades."
 
-#: actions/avatarsettings.php:360
+#: actions/avatarsettings.php:366
 msgid "Avatar updated."
 msgstr "Avatar actualitzat."
 
-#: actions/avatarsettings.php:363
+#: actions/avatarsettings.php:369
 msgid "Failed updating avatar."
 msgstr "Error en actualitzar avatar."
 
-#: actions/avatarsettings.php:387
+#: actions/avatarsettings.php:393
 msgid "Avatar deleted."
 msgstr "S'ha suprimit l'avatar."
 
+#: actions/block.php:69
+msgid "You already blocked that user."
+msgstr "Ja heu blocat l'usuari."
+
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
+msgid "Block user"
+msgstr "Usuari bloquejat."
+
+#: actions/block.php:130
+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/block.php:143 actions/deletenotice.php:145
+#: actions/deleteuser.php:147 actions/groupblock.php:178
+msgid "No"
+msgstr "No"
+
+#: actions/block.php:143 actions/deleteuser.php:147
+msgid "Do not block this user"
+msgstr "No bloquis l'usuari"
+
+#: actions/block.php:144 actions/deletenotice.php:146
+#: actions/deleteuser.php:148 actions/groupblock.php:179
+msgid "Yes"
+msgstr "Sí"
+
+#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
+msgid "Block this user"
+msgstr "Bloquejar aquest usuari"
+
+#: actions/block.php:162
+msgid "Failed to save block information."
+msgstr "Error al guardar la informació del block."
+
 #: actions/blockedfromgroup.php:73 actions/editgroup.php:84
 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
 #: actions/groupmembers.php:76 actions/grouprss.php:91
@@ -661,43 +698,6 @@ msgstr "Desbloquejar"
 msgid "Unblock this user"
 msgstr "Desbloquejar aquest usuari"
 
-#: actions/block.php:69
-msgid "You already blocked that user."
-msgstr "Ja heu blocat l'usuari."
-
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
-msgid "Block user"
-msgstr "Usuari bloquejat."
-
-#: actions/block.php:130
-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/block.php:143 actions/deletenotice.php:145
-#: actions/deleteuser.php:147 actions/groupblock.php:178
-msgid "No"
-msgstr "No"
-
-#: actions/block.php:143 actions/deleteuser.php:147
-msgid "Do not block this user"
-msgstr "No bloquis l'usuari"
-
-#: actions/block.php:144 actions/deletenotice.php:146
-#: actions/deleteuser.php:148 actions/groupblock.php:179
-msgid "Yes"
-msgstr "Sí"
-
-#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
-msgid "Block this user"
-msgstr "Bloquejar aquest usuari"
-
-#: actions/block.php:162
-msgid "Failed to save block information."
-msgstr "Error al guardar la informació del block."
-
 #: actions/bookmarklet.php:50
 msgid "Post to "
 msgstr "Envia a "
@@ -1173,6 +1173,14 @@ msgstr "Eliminat el correu electrònic entrant."
 msgid "New incoming email address added."
 msgstr "Nou correu electrònic entrant afegit."
 
+#: actions/favor.php:79
+msgid "This notice is already a favorite!"
+msgstr "Aquesta nota ja és favorita."
+
+#: actions/favor.php:92 lib/disfavorform.php:140
+msgid "Disfavor favorite"
+msgstr "Desfavoritar favorit"
+
 #: actions/favorited.php:65 lib/popularnoticesection.php:88
 #: lib/publicgroupnav.php:93
 msgid "Popular notices"
@@ -1215,14 +1223,6 @@ msgstr "%s's notes favorites"
 msgid "Updates favored by %1$s on %2$s!"
 msgstr "Actualitzacions de %1$s a %2$s!"
 
-#: actions/favor.php:79
-msgid "This notice is already a favorite!"
-msgstr "Aquesta nota ja és favorita."
-
-#: actions/favor.php:92 lib/disfavorform.php:140
-msgid "Disfavor favorite"
-msgstr "Desfavoritar favorit"
-
 #: actions/featured.php:69 lib/featureduserssection.php:87
 #: lib/publicgroupnav.php:89
 msgid "Featured users"
@@ -1466,6 +1466,30 @@ msgstr "Fes l'usuari administrador"
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "Actualitzacions de %1$s a %2$s!"
 
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+msgid "Groups"
+msgstr "Grups"
+
+#: actions/groups.php:64
+#, php-format
+msgid "Groups, page %d"
+msgstr "Grups, pàgina %d"
+
+#: actions/groups.php:90
+#, php-format
+msgid ""
+"%%%%site.name%%%% groups let you find and talk with people of similar "
+"interests. After you join a group you can send messages to all other members "
+"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
+"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
+"%%%%)"
+msgstr ""
+
+#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
+msgid "Create a new group"
+msgstr "Crear nou grup"
+
 #: actions/groupsearch.php:52
 #, fuzzy, php-format
 msgid ""
@@ -1498,30 +1522,6 @@ msgid ""
 "action.newgroup%%) yourself!"
 msgstr ""
 
-#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
-msgid "Groups"
-msgstr "Grups"
-
-#: actions/groups.php:64
-#, php-format
-msgid "Groups, page %d"
-msgstr "Grups, pàgina %d"
-
-#: actions/groups.php:90
-#, php-format
-msgid ""
-"%%%%site.name%%%% groups let you find and talk with people of similar "
-"interests. After you join a group you can send messages to all other members "
-"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
-"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
-"%%%%)"
-msgstr ""
-
-#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
-msgid "Create a new group"
-msgstr "Crear nou grup"
-
 #: actions/groupunblock.php:91
 msgid "Only an admin can unblock group members."
 msgstr "Només un administrador pot desblocar els membres del grup."
@@ -1722,7 +1722,7 @@ msgstr "Missatge personal"
 msgid "Optionally add a personal message to the invitation."
 msgstr "Opcionalment pots afegir un missatge a la invitació."
 
-#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:222
 msgid "Send"
 msgstr "Envia"
 
@@ -1828,59 +1828,59 @@ msgstr "No s'ha pogut eliminar l'usuari %s del grup %s"
 msgid "%s left group %s"
 msgstr "%s ha abandonat el grup %s"
 
-#: actions/login.php:82 actions/register.php:137
+#: actions/login.php:83 actions/register.php:137
 msgid "Already logged in."
 msgstr "Ja estàs connectat."
 
-#: actions/login.php:113 actions/login.php:123
+#: actions/login.php:114 actions/login.php:124
 #, fuzzy
 msgid "Invalid or expired token."
 msgstr "El contingut de l'avís és invàlid"
 
-#: actions/login.php:146
+#: actions/login.php:147
 msgid "Incorrect username or password."
 msgstr "Nom d'usuari o contrasenya incorrectes."
 
-#: actions/login.php:152
+#: actions/login.php:153
 #, fuzzy
 msgid "Error setting user. You are probably not authorized."
 msgstr "No autoritzat."
 
-#: actions/login.php:207 actions/login.php:260 lib/action.php:458
+#: actions/login.php:208 actions/login.php:261 lib/action.php:458
 #: lib/logingroupnav.php:79
 msgid "Login"
 msgstr "Inici de sessió"
 
-#: actions/login.php:246
+#: actions/login.php:247
 msgid "Login to site"
 msgstr "Accedir al lloc"
 
-#: actions/login.php:249 actions/profilesettings.php:106
+#: actions/login.php:250 actions/profilesettings.php:106
 #: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
 #: lib/groupeditform.php:152 lib/userprofile.php:131
 msgid "Nickname"
 msgstr "Sobrenom"
 
-#: actions/login.php:252 actions/register.php:428
+#: actions/login.php:253 actions/register.php:428
 #: lib/accountsettingsaction.php:116
 msgid "Password"
 msgstr "Contrasenya"
 
-#: actions/login.php:255 actions/register.php:477
+#: actions/login.php:256 actions/register.php:477
 msgid "Remember me"
 msgstr "Recorda'm"
 
-#: actions/login.php:256 actions/register.php:479
+#: actions/login.php:257 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 "
 "compartits!"
 
-#: actions/login.php:266
+#: actions/login.php:267
 msgid "Lost or forgotten password?"
 msgstr "Contrasenya oblidada o perduda?"
 
-#: actions/login.php:285
+#: actions/login.php:286
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -1888,7 +1888,7 @@ msgstr ""
 "Per raons de seguretat, si us plau torna a escriure el teu nom d'usuari i "
 "contrasenya abans de canviar la teva configuració."
 
-#: actions/login.php:289
+#: actions/login.php:290
 #, fuzzy, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -1960,7 +1960,7 @@ msgstr "S'ha enviat el missatge"
 msgid "Direct message to %s sent"
 msgstr "Missatge directe per a %s enviat"
 
-#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:242 lib/channel.php:170
 msgid "Ajax Error"
 msgstr "Ajax Error"
 
@@ -1968,7 +1968,7 @@ msgstr "Ajax Error"
 msgid "New notice"
 msgstr "Nou avís"
 
-#: actions/newnotice.php:206
+#: actions/newnotice.php:208
 msgid "Notice posted"
 msgstr "Notificació publicada"
 
@@ -2046,8 +2046,8 @@ msgstr "tipus de contingut "
 msgid "Only "
 msgstr "Només "
 
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996
-#: lib/api.php:1024 lib/api.php:1134
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011
+#: lib/api.php:1039 lib/api.php:1149
 msgid "Not a supported data format."
 msgstr "Format de data no suportat."
 
@@ -3601,6 +3601,26 @@ msgstr "Jabber"
 msgid "SMS"
 msgstr "SMS"
 
+#: actions/tag.php:68
+#, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr "Notificació etiquetada amb %s, pàgina %d"
+
+#: actions/tag.php:86
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "Feed d'avisos de %s"
+
+#: actions/tag.php:92
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "Feed d'avisos de %s"
+
+#: actions/tag.php:98
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "Feed d'avisos de %s"
+
 #: actions/tagother.php:33
 msgid "Not logged in"
 msgstr "No connectat."
@@ -3651,26 +3671,6 @@ msgstr ""
 "Utilitza aquest formulari per afegir etiquetes als teus subscriptors i "
 "subscripcions."
 
-#: actions/tag.php:68
-#, php-format
-msgid "Notices tagged with %s, page %d"
-msgstr "Notificació etiquetada amb %s, pàgina %d"
-
-#: actions/tag.php:86
-#, fuzzy, php-format
-msgid "Notice feed for tag %s (RSS 1.0)"
-msgstr "Feed d'avisos de %s"
-
-#: actions/tag.php:92
-#, fuzzy, php-format
-msgid "Notice feed for tag %s (RSS 2.0)"
-msgstr "Feed d'avisos de %s"
-
-#: actions/tag.php:98
-#, fuzzy, php-format
-msgid "Notice feed for tag %s (Atom)"
-msgstr "Feed d'avisos de %s"
-
 #: actions/tagrss.php:35
 msgid "No such tag."
 msgstr "No existeix aquesta etiqueta."
@@ -3982,23 +3982,23 @@ msgstr "No s'ha pogut inserir el missatge amb la nova URI."
 msgid "DB error inserting hashtag: %s"
 msgstr "Hashtag de l'error de la base de dades:%s"
 
-#: classes/Notice.php:179
+#: classes/Notice.php:188
 #, fuzzy
 msgid "Problem saving notice. Too long."
 msgstr "Problema en guardar l'avís."
 
-#: classes/Notice.php:183
+#: classes/Notice.php:192
 msgid "Problem saving notice. Unknown user."
 msgstr "Problema al guardar la notificació. Usuari desconegut."
 
-#: classes/Notice.php:188
+#: classes/Notice.php:197
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 "Masses notificacions massa ràpid; pren un respir i publica de nou en uns "
 "minuts."
 
-#: classes/Notice.php:194
+#: classes/Notice.php:203
 #, fuzzy
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
@@ -4007,19 +4007,24 @@ msgstr ""
 "Masses notificacions massa ràpid; pren un respir i publica de nou en uns "
 "minuts."
 
-#: classes/Notice.php:200
+#: classes/Notice.php:209
 msgid "You are banned from posting notices on this site."
 msgstr "Ha estat bandejat de publicar notificacions en aquest lloc."
 
-#: classes/Notice.php:265 classes/Notice.php:290
+#: classes/Notice.php:274 classes/Notice.php:299
 msgid "Problem saving notice."
 msgstr "Problema en guardar l'avís."
 
-#: classes/Notice.php:1124
+#: classes/Notice.php:1115
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Error de BD en inserir resposta: %s"
 
+#: classes/User.php:347
+#, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr "Us donem la benvinguda a %1$s, @%2$s!"
+
 #: classes/User_group.php:380
 msgid "Could not create group."
 msgstr "No s'ha pogut crear el grup."
@@ -4028,11 +4033,6 @@ msgstr "No s'ha pogut crear el grup."
 msgid "Could not set group membership."
 msgstr "No s'ha pogut establir la pertinença d'aquest grup."
 
-#: classes/User.php:347
-#, php-format
-msgid "Welcome to %1$s, @%2$s!"
-msgstr "Us donem la benvinguda a %1$s, @%2$s!"
-
 #: lib/accountsettingsaction.php:108
 msgid "Change your profile settings"
 msgstr "Canvieu els paràmetres del vostre perfil"
@@ -4341,7 +4341,7 @@ msgstr ""
 msgid "Notice with that id does not exist"
 msgstr ""
 
-#: lib/command.php:168 lib/command.php:416 lib/command.php:471
+#: lib/command.php:168 lib/command.php:416 lib/command.php:472
 msgid "User has no last notice"
 msgstr "L'usuari no té última nota"
 
@@ -4388,101 +4388,101 @@ msgstr "Error al enviar el missatge directe."
 msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr "Missatge massa llarg - màxim és 140 caràcters, tu has enviat %d"
 
-#: lib/command.php:439
+#: lib/command.php:440
 #, php-format
 msgid "Reply to %s sent"
 msgstr "S'ha enviat la resposta a %s"
 
-#: lib/command.php:441
+#: lib/command.php:442
 #, fuzzy
 msgid "Error saving notice."
 msgstr "Problema en guardar l'avís."
 
-#: lib/command.php:495
+#: lib/command.php:496
 msgid "Specify the name of the user to subscribe to"
 msgstr "Especifica el nom de l'usuari a que vols subscriure't"
 
-#: lib/command.php:502
+#: lib/command.php:503
 #, php-format
 msgid "Subscribed to %s"
 msgstr "Subscrit a %s"
 
-#: lib/command.php:523
+#: lib/command.php:524
 msgid "Specify the name of the user to unsubscribe from"
 msgstr "Especifica el nom de l'usuari del que vols deixar d'estar subscrit"
 
-#: lib/command.php:530
+#: lib/command.php:531
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr "Has deixat d'estar subscrit a %s"
 
-#: lib/command.php:548 lib/command.php:571
+#: lib/command.php:549 lib/command.php:572
 msgid "Command not yet implemented."
 msgstr "Comanda encara no implementada."
 
-#: lib/command.php:551
+#: lib/command.php:552
 msgid "Notification off."
 msgstr "Notificacions off."
 
-#: lib/command.php:553
+#: lib/command.php:554
 msgid "Can't turn off notification."
 msgstr "No es poden posar en off les notificacions."
 
-#: lib/command.php:574
+#: lib/command.php:575
 msgid "Notification on."
 msgstr "Notificacions on."
 
-#: lib/command.php:576
+#: lib/command.php:577
 msgid "Can't turn on notification."
 msgstr "No es poden posar en on les notificacions."
 
-#: lib/command.php:588
+#: lib/command.php:590
 msgid "Login command is disabled"
 msgstr ""
 
-#: lib/command.php:602
+#: lib/command.php:604
 #, fuzzy, php-format
 msgid "Could not create login token for %s"
 msgstr "No s'han pogut crear els àlies."
 
-#: lib/command.php:607
+#: lib/command.php:609
 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:623
+#: lib/command.php:625
 #, fuzzy
 msgid "You are not subscribed to anyone."
 msgstr "No estàs subscrit a aquest perfil."
 
-#: lib/command.php:625
+#: lib/command.php:627
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Ja estàs subscrit a aquests usuaris:"
 msgstr[1] "Ja estàs subscrit a aquests usuaris:"
 
-#: lib/command.php:645
+#: lib/command.php:647
 #, fuzzy
 msgid "No one is subscribed to you."
 msgstr "No pots subscriure a un altre a tu mateix."
 
-#: lib/command.php:647
+#: lib/command.php:649
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "No pots subscriure a un altre a tu mateix."
 msgstr[1] "No pots subscriure a un altre a tu mateix."
 
-#: lib/command.php:667
+#: lib/command.php:669
 msgid "You are not a member of any groups."
 msgstr "No sou membre de cap grup."
 
-#: lib/command.php:669
+#: lib/command.php:671
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "No sou un membre del grup."
 msgstr[1] "No sou un membre del grup."
 
-#: lib/command.php:683
+#: lib/command.php:685
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -4580,10 +4580,6 @@ msgstr "Fer favorita aquesta notificació"
 msgid "Favor"
 msgstr "Favorit"
 
-#: lib/feedlist.php:64
-msgid "Export data"
-msgstr "Exportar data"
-
 #: lib/feed.php:85
 msgid "RSS 1.0"
 msgstr ""
@@ -4600,6 +4596,10 @@ msgstr ""
 msgid "FOAF"
 msgstr ""
 
+#: lib/feedlist.php:64
+msgid "Export data"
+msgstr "Exportar data"
+
 #: lib/galleryaction.php:121
 msgid "Filter tags"
 msgstr "Filtre d'etiquetes"
@@ -4761,20 +4761,6 @@ msgstr "Accedir amb el nom d'usuari i contrasenya"
 msgid "Sign up for a new account"
 msgstr "Crear nou compte"
 
-#: lib/mailbox.php:89
-msgid "Only the user can read their own mailboxes."
-msgstr "Només l'usuari pot llegir les seves safates de correu."
-
-#: lib/mailbox.php:139
-msgid ""
-"You have no private messages. You can send private message to engage other "
-"users in conversation. People can send you messages for your eyes only."
-msgstr ""
-
-#: lib/mailbox.php:227 lib/noticelist.php:452
-msgid "from"
-msgstr "de"
-
 #: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Confirmació de l'adreça de correu electrònic"
@@ -4967,6 +4953,20 @@ msgid ""
 "\n"
 msgstr ""
 
+#: lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
+msgstr "Només l'usuari pot llegir les seves safates de correu."
+
+#: lib/mailbox.php:139
+msgid ""
+"You have no private messages. You can send private message to engage other "
+"users in conversation. People can send you messages for your eyes only."
+msgstr ""
+
+#: lib/mailbox.php:227 lib/noticelist.php:452
+msgid "from"
+msgstr "de"
+
 #: lib/mediafile.php:98 lib/mediafile.php:123
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
@@ -5027,7 +5027,7 @@ msgstr "Enviar notificació directa"
 msgid "To"
 msgstr "A"
 
-#: lib/messageform.php:161 lib/noticeform.php:185
+#: lib/messageform.php:159 lib/noticeform.php:183
 msgid "Available characters"
 msgstr "Caràcters disponibles"
 
@@ -5040,11 +5040,11 @@ msgstr "Enviar notificació"
 msgid "What's up, %s?"
 msgstr "Què tal, %s?"
 
-#: lib/noticeform.php:192
+#: lib/noticeform.php:190
 msgid "Attach"
 msgstr "Adjunta"
 
-#: lib/noticeform.php:196
+#: lib/noticeform.php:194
 msgid "Attach a file"
 msgstr "Adjunta un fitxer"
 
@@ -5116,12 +5116,12 @@ msgstr "Error en inserir perfil remot"
 msgid "Duplicate notice"
 msgstr "Eliminar nota."
 
-#: lib/oauthstore.php:467 lib/subs.php:48
+#: lib/oauthstore.php:466 lib/subs.php:48
 #, fuzzy
 msgid "You have been banned from subscribing."
 msgstr "Aquest usuari t'ha bloquejat com a subscriptor."
 
-#: lib/oauthstore.php:492
+#: lib/oauthstore.php:491
 msgid "Couldn't insert new subscription."
 msgstr "No s'ha pogut inserir una nova subscripció."
 
@@ -5285,20 +5285,6 @@ msgstr "Persones subscrites a %s"
 msgid "Groups %s is a member of"
 msgstr "%s grups són membres de"
 
-#: 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/subscriptionlist.php:126
-msgid "(none)"
-msgstr "(cap)"
-
 #: lib/subs.php:52
 msgid "Already subscribed!"
 msgstr ""
@@ -5329,6 +5315,20 @@ msgstr "No s'ha pogut eliminar la subscripció."
 msgid "Couldn't delete subscription."
 msgstr "No s'ha pogut eliminar la subscripció."
 
+#: 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/subscriptionlist.php:126
+msgid "(none)"
+msgstr "(cap)"
+
 #: lib/tagcloudsection.php:56
 msgid "None"
 msgstr "Cap"
diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po
index 6d74b17611..36bec9bfe3 100644
--- a/locale/cs/LC_MESSAGES/statusnet.po
+++ b/locale/cs/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 21:25+0000\n"
-"PO-Revision-Date: 2009-12-07 21:26:08+0000\n"
+"POT-Creation-Date: 2009-12-12 17:09+0000\n"
+"PO-Revision-Date: 2009-12-12 17:09:20+0000\n"
 "Language-Team: Czech\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n"
+"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: cs\n"
 "X-Message-Group: out-statusnet\n"
@@ -27,11 +27,11 @@ msgstr "Žádné takové oznámení."
 
 #: actions/all.php:74 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofile.php:105
 #: actions/apiaccountupdateprofilebackgroundimage.php:116
-#: actions/apiaccountupdateprofileimage.php:105
-#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
-#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
-#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
+#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90
 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
@@ -44,7 +44,7 @@ msgstr "Žádné takové oznámení."
 #: actions/repliesrss.php:38 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38
 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
-#: lib/command.php:364 lib/command.php:411 lib/command.php:466
+#: lib/command.php:364 lib/command.php:411 lib/command.php:467
 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
 #: lib/subs.php:34 lib/subs.php:116
 msgid "No such user."
@@ -56,7 +56,7 @@ msgid "%s and friends, page %d"
 msgstr "%s a přátelé"
 
 #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
-#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100
+#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s a přátelé"
@@ -108,25 +108,25 @@ msgstr ""
 msgid "You and friends"
 msgstr "%s a přátelé"
 
-#: actions/allrss.php:119 actions/apitimelinefriends.php:121
+#: actions/allrss.php:119 actions/apitimelinefriends.php:122
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr ""
 
 #: actions/apiaccountratelimitstatus.php:70
 #: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofile.php:97
 #: actions/apiaccountupdateprofilebackgroundimage.php:94
 #: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apiaccountupdateprofile.php:97
 #, fuzzy
 msgid "API method not found."
 msgstr "Potvrzující kód nebyl nalezen"
 
 #: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofile.php:89
 #: actions/apiaccountupdateprofilebackgroundimage.php:86
 #: actions/apiaccountupdateprofilecolors.php:110
-#: actions/apiaccountupdateprofileimage.php:84
-#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
+#: actions/apiaccountupdateprofileimage.php:84 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
@@ -146,9 +146,23 @@ msgstr ""
 msgid "Could not update user."
 msgstr "Nelze aktualizovat uživatele"
 
+#: actions/apiaccountupdateprofile.php:112
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+msgid "User has no profile."
+msgstr "Uživatel nemá profil."
+
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "Nelze uložit profil"
+
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257
 #: actions/designadminpanel.php:122 actions/newnotice.php:94
 #: lib/designsettings.php:283
 #, php-format
@@ -170,20 +184,6 @@ msgstr ""
 msgid "Could not update your design."
 msgstr "Nelze aktualizovat uživatele"
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
-#: actions/apiaccountupdateprofileimage.php:130
-#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
-#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
-msgid "User has no profile."
-msgstr "Uživatel nemá profil."
-
-#: actions/apiaccountupdateprofile.php:147
-#, fuzzy
-msgid "Could not save profile."
-msgstr "Nelze uložit profil"
-
 #: actions/apiblockcreate.php:105
 #, fuzzy
 msgid "You cannot block yourself!"
@@ -197,23 +197,6 @@ msgstr ""
 msgid "Unblock user failed."
 msgstr ""
 
-#: actions/apidirectmessagenew.php:126
-msgid "No message text!"
-msgstr ""
-
-#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
-#, fuzzy, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr "Je to příliš dlouhé. Maximální sdělení délka je 140 znaků"
-
-#: actions/apidirectmessagenew.php:146
-msgid "Recipient user not found."
-msgstr ""
-
-#: actions/apidirectmessagenew.php:150
-msgid "Can't send direct messages to users who aren't your friend."
-msgstr ""
-
 #: actions/apidirectmessage.php:89
 #, php-format
 msgid "Direct messages from %s"
@@ -239,18 +222,35 @@ msgstr ""
 #: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
-#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
-#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149
-#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
-#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156
+#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151
+#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141
+#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
 msgid "API method not found!"
 msgstr ""
 
+#: actions/apidirectmessagenew.php:126
+msgid "No message text!"
+msgstr ""
+
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, fuzzy, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "Je to příliš dlouhé. Maximální sdělení délka je 140 znaků"
+
+#: actions/apidirectmessagenew.php:146
+msgid "Recipient user not found."
+msgstr ""
+
+#: actions/apidirectmessagenew.php:150
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr ""
+
 #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
 #: actions/apistatusesdestroy.php:113
 msgid "No status found with that ID."
@@ -399,16 +399,6 @@ msgstr "Neodeslal jste nám profil"
 msgid "Could not remove user %s to group %s."
 msgstr "Nelze vytvořit OpenID z: %s"
 
-#: actions/apigrouplistall.php:90 actions/usergroups.php:62
-#, php-format
-msgid "%s groups"
-msgstr ""
-
-#: actions/apigrouplistall.php:94
-#, php-format
-msgid "groups on %s"
-msgstr ""
-
 #: actions/apigrouplist.php:95
 #, fuzzy, php-format
 msgid "%s's groups"
@@ -419,6 +409,16 @@ msgstr "Profil"
 msgid "Groups %s is a member of on %s."
 msgstr "Neodeslal jste nám profil"
 
+#: actions/apigrouplistall.php:90 actions/usergroups.php:62
+#, php-format
+msgid "%s groups"
+msgstr ""
+
+#: actions/apigrouplistall.php:94
+#, php-format
+msgid "groups on %s"
+msgstr ""
+
 #: actions/apistatusesdestroy.php:107
 msgid "This method requires a POST or DELETE."
 msgstr ""
@@ -456,54 +456,54 @@ msgstr ""
 msgid "Unsupported format."
 msgstr "Nepodporovaný formát obrázku."
 
-#: actions/apitimelinefavorites.php:107
+#: actions/apitimelinefavorites.php:108
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr ""
 
-#: actions/apitimelinefavorites.php:119
+#: actions/apitimelinefavorites.php:120
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr ""
 
-#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117
+#: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118
 #: actions/grouprss.php:131 actions/userrss.php:90
 #, php-format
 msgid "%s timeline"
 msgstr ""
 
-#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125
+#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
 #: actions/userrss.php:92
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr ""
 
-#: actions/apitimelinementions.php:116
+#: actions/apitimelinementions.php:117
 #, fuzzy, php-format
 msgid "%1$s / Updates mentioning %2$s"
 msgstr "%1 statusů na %2"
 
-#: actions/apitimelinementions.php:126
+#: actions/apitimelinementions.php:127
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr ""
 
-#: actions/apitimelinepublic.php:106 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr ""
 
-#: actions/apitimelinepublic.php:110 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr ""
 
-#: actions/apitimelinetag.php:101 actions/tag.php:66
+#: actions/apitimelinetag.php:102 actions/tag.php:66
 #, php-format
 msgid "Notices tagged with %s"
 msgstr ""
 
-#: actions/apitimelinetag.php:107 actions/tagrss.php:64
+#: actions/apitimelinetag.php:108 actions/tagrss.php:64
 #, fuzzy, php-format
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Mikroblog od %s"
@@ -540,46 +540,46 @@ msgstr "Obrázek"
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr ""
 
-#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:185
 #: actions/grouplogo.php:178 actions/remotesubscribe.php:191
 #: actions/userauthorization.php:72 actions/userrss.php:103
 msgid "User without matching profile"
 msgstr ""
 
-#: actions/avatarsettings.php:119 actions/avatarsettings.php:194
+#: actions/avatarsettings.php:119 actions/avatarsettings.php:197
 #: actions/grouplogo.php:251
 #, fuzzy
 msgid "Avatar settings"
 msgstr "Nastavení"
 
-#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/avatarsettings.php:127 actions/avatarsettings.php:205
 #: actions/grouplogo.php:199 actions/grouplogo.php:259
 msgid "Original"
 msgstr ""
 
-#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/avatarsettings.php:142 actions/avatarsettings.php:217
 #: actions/grouplogo.php:210 actions/grouplogo.php:271
 msgid "Preview"
 msgstr ""
 
-#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
+#: actions/avatarsettings.php:149 lib/deleteuserform.php:66
 #: lib/noticelist.php:550
 msgid "Delete"
 msgstr "Odstranit"
 
-#: actions/avatarsettings.php:165 actions/grouplogo.php:233
+#: actions/avatarsettings.php:166 actions/grouplogo.php:233
 msgid "Upload"
 msgstr "Upload"
 
-#: actions/avatarsettings.php:228 actions/grouplogo.php:286
+#: actions/avatarsettings.php:231 actions/grouplogo.php:286
 msgid "Crop"
 msgstr ""
 
-#: actions/avatarsettings.php:265 actions/disfavor.php:74
+#: actions/avatarsettings.php:268 actions/disfavor.php:74
 #: actions/emailsettings.php:238 actions/favor.php:75
 #: actions/groupblock.php:66 actions/grouplogo.php:309
 #: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -590,33 +590,73 @@ msgstr ""
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
-#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
+#: actions/avatarsettings.php:281 actions/designadminpanel.php:103
 #: actions/emailsettings.php:256 actions/grouplogo.php:319
 #: actions/imsettings.php:220 actions/recoverpassword.php:44
 #: actions/smssettings.php:248 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "Nečekaná forma submission."
 
-#: actions/avatarsettings.php:322
+#: actions/avatarsettings.php:328
 msgid "Pick a square area of the image to be your avatar"
 msgstr ""
 
-#: actions/avatarsettings.php:337 actions/grouplogo.php:377
+#: actions/avatarsettings.php:343 actions/grouplogo.php:377
 msgid "Lost our file data."
 msgstr ""
 
-#: actions/avatarsettings.php:360
+#: actions/avatarsettings.php:366
 msgid "Avatar updated."
 msgstr "Obrázek nahrán"
 
-#: actions/avatarsettings.php:363
+#: actions/avatarsettings.php:369
 msgid "Failed updating avatar."
 msgstr "Nahrávání obrázku selhalo."
 
-#: actions/avatarsettings.php:387
+#: actions/avatarsettings.php:393
 msgid "Avatar deleted."
 msgstr "Avatar smazán."
 
+#: actions/block.php:69
+#, fuzzy
+msgid "You already blocked that user."
+msgstr "Již jste přihlášen"
+
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
+#, fuzzy
+msgid "Block user"
+msgstr "Žádný takový uživatel."
+
+#: actions/block.php:130
+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/block.php:143 actions/deletenotice.php:145
+#: actions/deleteuser.php:147 actions/groupblock.php:178
+msgid "No"
+msgstr "Ne"
+
+#: actions/block.php:143 actions/deleteuser.php:147
+#, fuzzy
+msgid "Do not block this user"
+msgstr "Žádný takový uživatel."
+
+#: actions/block.php:144 actions/deletenotice.php:146
+#: actions/deleteuser.php:148 actions/groupblock.php:179
+msgid "Yes"
+msgstr "Ano"
+
+#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
+msgid "Block this user"
+msgstr "Zablokovat tohoto uživatele"
+
+#: actions/block.php:162
+msgid "Failed to save block information."
+msgstr ""
+
 #: actions/blockedfromgroup.php:73 actions/editgroup.php:84
 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
 #: actions/groupmembers.php:76 actions/grouprss.php:91
@@ -659,46 +699,6 @@ msgstr ""
 msgid "Unblock this user"
 msgstr "Žádný takový uživatel."
 
-#: actions/block.php:69
-#, fuzzy
-msgid "You already blocked that user."
-msgstr "Již jste přihlášen"
-
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
-#, fuzzy
-msgid "Block user"
-msgstr "Žádný takový uživatel."
-
-#: actions/block.php:130
-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/block.php:143 actions/deletenotice.php:145
-#: actions/deleteuser.php:147 actions/groupblock.php:178
-msgid "No"
-msgstr "Ne"
-
-#: actions/block.php:143 actions/deleteuser.php:147
-#, fuzzy
-msgid "Do not block this user"
-msgstr "Žádný takový uživatel."
-
-#: actions/block.php:144 actions/deletenotice.php:146
-#: actions/deleteuser.php:148 actions/groupblock.php:179
-msgid "Yes"
-msgstr "Ano"
-
-#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
-msgid "Block this user"
-msgstr "Zablokovat tohoto uživatele"
-
-#: actions/block.php:162
-msgid "Failed to save block information."
-msgstr ""
-
 #: actions/bookmarklet.php:50
 msgid "Post to "
 msgstr ""
@@ -1168,6 +1168,14 @@ msgstr ""
 msgid "New incoming email address added."
 msgstr ""
 
+#: actions/favor.php:79
+msgid "This notice is already a favorite!"
+msgstr ""
+
+#: actions/favor.php:92 lib/disfavorform.php:140
+msgid "Disfavor favorite"
+msgstr ""
+
 #: actions/favorited.php:65 lib/popularnoticesection.php:88
 #: lib/publicgroupnav.php:93
 #, fuzzy
@@ -1211,14 +1219,6 @@ msgstr ""
 msgid "Updates favored by %1$s on %2$s!"
 msgstr "Mikroblog od %s"
 
-#: actions/favor.php:79
-msgid "This notice is already a favorite!"
-msgstr ""
-
-#: actions/favor.php:92 lib/disfavorform.php:140
-msgid "Disfavor favorite"
-msgstr ""
-
 #: actions/featured.php:69 lib/featureduserssection.php:87
 #: lib/publicgroupnav.php:89
 msgid "Featured users"
@@ -1460,6 +1460,31 @@ msgstr ""
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "Mikroblog od %s"
 
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+msgid "Groups"
+msgstr "Skupiny"
+
+#: 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 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/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
+#, fuzzy
+msgid "Create a new group"
+msgstr "Vytvořit nový účet"
+
 #: actions/groupsearch.php:52
 #, fuzzy, php-format
 msgid ""
@@ -1494,31 +1519,6 @@ msgid ""
 "action.newgroup%%) yourself!"
 msgstr ""
 
-#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
-msgid "Groups"
-msgstr "Skupiny"
-
-#: 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 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/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
-#, fuzzy
-msgid "Create a new group"
-msgstr "Vytvořit nový účet"
-
 #: actions/groupunblock.php:91
 msgid "Only an admin can unblock group members."
 msgstr ""
@@ -1707,7 +1707,7 @@ msgstr ""
 msgid "Optionally add a personal message to the invitation."
 msgstr ""
 
-#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:222
 msgid "Send"
 msgstr "Odeslat"
 
@@ -1789,63 +1789,63 @@ msgstr "Nelze vytvořit OpenID z: %s"
 msgid "%s left group %s"
 msgstr ""
 
-#: actions/login.php:82 actions/register.php:137
+#: actions/login.php:83 actions/register.php:137
 msgid "Already logged in."
 msgstr "Již přihlášen"
 
-#: actions/login.php:113 actions/login.php:123
+#: actions/login.php:114 actions/login.php:124
 #, fuzzy
 msgid "Invalid or expired token."
 msgstr "Neplatný obsah sdělení"
 
-#: actions/login.php:146
+#: actions/login.php:147
 msgid "Incorrect username or password."
 msgstr "Neplatné jméno nebo heslo"
 
-#: actions/login.php:152
+#: actions/login.php:153
 #, fuzzy
 msgid "Error setting user. You are probably not authorized."
 msgstr "Neautorizován."
 
-#: actions/login.php:207 actions/login.php:260 lib/action.php:458
+#: actions/login.php:208 actions/login.php:261 lib/action.php:458
 #: lib/logingroupnav.php:79
 msgid "Login"
 msgstr "Přihlásit"
 
-#: actions/login.php:246
+#: actions/login.php:247
 msgid "Login to site"
 msgstr ""
 
-#: actions/login.php:249 actions/profilesettings.php:106
+#: actions/login.php:250 actions/profilesettings.php:106
 #: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
 #: lib/groupeditform.php:152 lib/userprofile.php:131
 msgid "Nickname"
 msgstr "Přezdívka"
 
-#: actions/login.php:252 actions/register.php:428
+#: actions/login.php:253 actions/register.php:428
 #: lib/accountsettingsaction.php:116
 msgid "Password"
 msgstr "Heslo"
 
-#: actions/login.php:255 actions/register.php:477
+#: actions/login.php:256 actions/register.php:477
 msgid "Remember me"
 msgstr "Zapamatuj si mě"
 
-#: actions/login.php:256 actions/register.php:479
+#: actions/login.php:257 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á "
 
-#: actions/login.php:266
+#: actions/login.php:267
 msgid "Lost or forgotten password?"
 msgstr "Ztracené nebo zapomenuté heslo?"
 
-#: actions/login.php:285
+#: actions/login.php:286
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 msgstr "Z bezpečnostních důvodů, prosím zadejte znovu své jméno a heslo."
 
-#: actions/login.php:289
+#: actions/login.php:290
 #, fuzzy, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -1917,7 +1917,7 @@ msgstr ""
 msgid "Direct message to %s sent"
 msgstr ""
 
-#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:242 lib/channel.php:170
 msgid "Ajax Error"
 msgstr ""
 
@@ -1925,7 +1925,7 @@ msgstr ""
 msgid "New notice"
 msgstr "Nové sdělení"
 
-#: actions/newnotice.php:206
+#: actions/newnotice.php:208
 #, fuzzy
 msgid "Notice posted"
 msgstr "Sdělení"
@@ -2003,8 +2003,8 @@ msgstr "Připojit"
 msgid "Only "
 msgstr ""
 
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996
-#: lib/api.php:1024 lib/api.php:1134
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011
+#: lib/api.php:1039 lib/api.php:1149
 msgid "Not a supported data format."
 msgstr ""
 
@@ -3533,6 +3533,26 @@ msgstr "Žádné Jabber ID."
 msgid "SMS"
 msgstr ""
 
+#: actions/tag.php:68
+#, fuzzy, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr "Mikroblog od %s"
+
+#: actions/tag.php:86
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "Feed sdělení pro %s"
+
+#: actions/tag.php:92
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "Feed sdělení pro %s"
+
+#: actions/tag.php:98
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "Feed sdělení pro %s"
+
 #: actions/tagother.php:33
 #, fuzzy
 msgid "Not logged in"
@@ -3581,26 +3601,6 @@ msgstr "Nelze uložin informace o obrázku"
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 
-#: actions/tag.php:68
-#, fuzzy, php-format
-msgid "Notices tagged with %s, page %d"
-msgstr "Mikroblog od %s"
-
-#: actions/tag.php:86
-#, fuzzy, php-format
-msgid "Notice feed for tag %s (RSS 1.0)"
-msgstr "Feed sdělení pro %s"
-
-#: actions/tag.php:92
-#, fuzzy, php-format
-msgid "Notice feed for tag %s (RSS 2.0)"
-msgstr "Feed sdělení pro %s"
-
-#: actions/tag.php:98
-#, fuzzy, php-format
-msgid "Notice feed for tag %s (Atom)"
-msgstr "Feed sdělení pro %s"
-
 #: actions/tagrss.php:35
 #, fuzzy
 msgid "No such tag."
@@ -3913,40 +3913,45 @@ msgstr ""
 msgid "DB error inserting hashtag: %s"
 msgstr ""
 
-#: classes/Notice.php:179
+#: classes/Notice.php:188
 #, fuzzy
 msgid "Problem saving notice. Too long."
 msgstr "Problém při ukládání sdělení"
 
-#: classes/Notice.php:183
+#: classes/Notice.php:192
 #, fuzzy
 msgid "Problem saving notice. Unknown user."
 msgstr "Problém při ukládání sdělení"
 
-#: classes/Notice.php:188
+#: classes/Notice.php:197
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
-#: classes/Notice.php:194
+#: classes/Notice.php:203
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
 msgstr ""
 
-#: classes/Notice.php:200
+#: classes/Notice.php:209
 msgid "You are banned from posting notices on this site."
 msgstr ""
 
-#: classes/Notice.php:265 classes/Notice.php:290
+#: classes/Notice.php:274 classes/Notice.php:299
 msgid "Problem saving notice."
 msgstr "Problém při ukládání sdělení"
 
-#: classes/Notice.php:1124
+#: classes/Notice.php:1115
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Chyba v DB při vkládání odpovědi: %s"
 
+#: classes/User.php:347
+#, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr ""
+
 #: classes/User_group.php:380
 #, fuzzy
 msgid "Could not create group."
@@ -3957,11 +3962,6 @@ msgstr "Nelze uložin informace o obrázku"
 msgid "Could not set group membership."
 msgstr "Nelze vytvořit odebírat"
 
-#: classes/User.php:347
-#, php-format
-msgid "Welcome to %1$s, @%2$s!"
-msgstr ""
-
 #: lib/accountsettingsaction.php:108
 msgid "Change your profile settings"
 msgstr ""
@@ -4278,7 +4278,7 @@ msgstr ""
 msgid "Notice with that id does not exist"
 msgstr ""
 
-#: lib/command.php:168 lib/command.php:416 lib/command.php:471
+#: lib/command.php:168 lib/command.php:416 lib/command.php:472
 msgid "User has no last notice"
 msgstr ""
 
@@ -4325,105 +4325,105 @@ msgstr ""
 msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr ""
 
-#: lib/command.php:439
+#: lib/command.php:440
 #, fuzzy, php-format
 msgid "Reply to %s sent"
 msgstr "Odpovědi na %s"
 
-#: lib/command.php:441
+#: lib/command.php:442
 #, fuzzy
 msgid "Error saving notice."
 msgstr "Problém při ukládání sdělení"
 
-#: lib/command.php:495
+#: lib/command.php:496
 msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: lib/command.php:502
+#: lib/command.php:503
 #, php-format
 msgid "Subscribed to %s"
 msgstr ""
 
-#: lib/command.php:523
+#: lib/command.php:524
 msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: lib/command.php:530
+#: lib/command.php:531
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr ""
 
-#: lib/command.php:548 lib/command.php:571
+#: lib/command.php:549 lib/command.php:572
 msgid "Command not yet implemented."
 msgstr ""
 
-#: lib/command.php:551
+#: lib/command.php:552
 msgid "Notification off."
 msgstr ""
 
-#: lib/command.php:553
+#: lib/command.php:554
 msgid "Can't turn off notification."
 msgstr ""
 
-#: lib/command.php:574
+#: lib/command.php:575
 msgid "Notification on."
 msgstr ""
 
-#: lib/command.php:576
+#: lib/command.php:577
 msgid "Can't turn on notification."
 msgstr ""
 
-#: lib/command.php:588
+#: lib/command.php:590
 msgid "Login command is disabled"
 msgstr ""
 
-#: lib/command.php:602
+#: lib/command.php:604
 #, fuzzy, php-format
 msgid "Could not create login token for %s"
 msgstr "Nelze uložin informace o obrázku"
 
-#: lib/command.php:607
+#: lib/command.php:609
 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:623
+#: lib/command.php:625
 #, fuzzy
 msgid "You are not subscribed to anyone."
 msgstr "Neodeslal jste nám profil"
 
-#: lib/command.php:625
+#: lib/command.php:627
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Neodeslal jste nám profil"
 msgstr[1] "Neodeslal jste nám profil"
 msgstr[2] ""
 
-#: lib/command.php:645
+#: lib/command.php:647
 #, fuzzy
 msgid "No one is subscribed to you."
 msgstr "Vzdálený odběr"
 
-#: lib/command.php:647
+#: lib/command.php:649
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Vzdálený odběr"
 msgstr[1] "Vzdálený odběr"
 msgstr[2] ""
 
-#: lib/command.php:667
+#: lib/command.php:669
 #, fuzzy
 msgid "You are not a member of any groups."
 msgstr "Neodeslal jste nám profil"
 
-#: lib/command.php:669
+#: lib/command.php:671
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Neodeslal jste nám profil"
 msgstr[1] "Neodeslal jste nám profil"
 msgstr[2] ""
 
-#: lib/command.php:683
+#: lib/command.php:685
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -4523,10 +4523,6 @@ msgstr "Žádné takové oznámení."
 msgid "Favor"
 msgstr ""
 
-#: lib/feedlist.php:64
-msgid "Export data"
-msgstr ""
-
 #: lib/feed.php:85
 msgid "RSS 1.0"
 msgstr ""
@@ -4543,6 +4539,10 @@ msgstr ""
 msgid "FOAF"
 msgstr ""
 
+#: lib/feedlist.php:64
+msgid "Export data"
+msgstr ""
+
 #: lib/galleryaction.php:121
 msgid "Filter tags"
 msgstr ""
@@ -4710,21 +4710,6 @@ msgstr "Neplatné jméno nebo heslo"
 msgid "Sign up for a new account"
 msgstr "Vytvořit nový účet"
 
-#: lib/mailbox.php:89
-msgid "Only the user can read their own mailboxes."
-msgstr ""
-
-#: lib/mailbox.php:139
-msgid ""
-"You have no private messages. You can send private message to engage other "
-"users in conversation. People can send you messages for your eyes only."
-msgstr ""
-
-#: lib/mailbox.php:227 lib/noticelist.php:452
-#, fuzzy
-msgid "from"
-msgstr " od "
-
 #: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Potvrzení emailové adresy"
@@ -4907,6 +4892,21 @@ msgid ""
 "\n"
 msgstr ""
 
+#: lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
+msgstr ""
+
+#: lib/mailbox.php:139
+msgid ""
+"You have no private messages. You can send private message to engage other "
+"users in conversation. People can send you messages for your eyes only."
+msgstr ""
+
+#: lib/mailbox.php:227 lib/noticelist.php:452
+#, fuzzy
+msgid "from"
+msgstr " od "
+
 #: lib/mediafile.php:98 lib/mediafile.php:123
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
@@ -4968,7 +4968,7 @@ msgstr ""
 msgid "To"
 msgstr ""
 
-#: lib/messageform.php:161 lib/noticeform.php:185
+#: lib/messageform.php:159 lib/noticeform.php:183
 #, fuzzy
 msgid "Available characters"
 msgstr "6 a více znaků"
@@ -4983,11 +4983,11 @@ msgstr "Nové sdělení"
 msgid "What's up, %s?"
 msgstr "Co se děje %s?"
 
-#: lib/noticeform.php:192
+#: lib/noticeform.php:190
 msgid "Attach"
 msgstr ""
 
-#: lib/noticeform.php:196
+#: lib/noticeform.php:194
 msgid "Attach a file"
 msgstr ""
 
@@ -5059,11 +5059,11 @@ msgstr "Chyba při vkládaní vzdáleného profilu"
 msgid "Duplicate notice"
 msgstr "Nové sdělení"
 
-#: lib/oauthstore.php:467 lib/subs.php:48
+#: lib/oauthstore.php:466 lib/subs.php:48
 msgid "You have been banned from subscribing."
 msgstr ""
 
-#: lib/oauthstore.php:492
+#: lib/oauthstore.php:491
 msgid "Couldn't insert new subscription."
 msgstr "Nelze vložit odebírání"
 
@@ -5230,20 +5230,6 @@ msgstr "Vzdálený odběr"
 msgid "Groups %s is a member of"
 msgstr ""
 
-#: lib/subscriberspeopleselftagcloudsection.php:48
-#: lib/subscriptionspeopleselftagcloudsection.php:48
-msgid "People Tagcloud as self-tagged"
-msgstr ""
-
-#: lib/subscriberspeopletagcloudsection.php:48
-#: lib/subscriptionspeopletagcloudsection.php:48
-msgid "People Tagcloud as tagged"
-msgstr ""
-
-#: lib/subscriptionlist.php:126
-msgid "(none)"
-msgstr ""
-
 #: lib/subs.php:52
 msgid "Already subscribed!"
 msgstr ""
@@ -5275,6 +5261,20 @@ msgstr "Nelze smazat odebírání"
 msgid "Couldn't delete subscription."
 msgstr "Nelze smazat odebírání"
 
+#: 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/subscriptionlist.php:126
+msgid "(none)"
+msgstr ""
+
 #: lib/tagcloudsection.php:56
 msgid "None"
 msgstr ""
diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po
index c1d24f11d2..37dccbdfcc 100644
--- a/locale/de/LC_MESSAGES/statusnet.po
+++ b/locale/de/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 21:25+0000\n"
-"PO-Revision-Date: 2009-12-07 21:26:11+0000\n"
+"POT-Creation-Date: 2009-12-12 17:09+0000\n"
+"PO-Revision-Date: 2009-12-12 17:09:23+0000\n"
 "Language-Team: German\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n"
+"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: out-statusnet\n"
@@ -28,11 +28,11 @@ msgstr "Seite nicht vorhanden"
 
 #: actions/all.php:74 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofile.php:105
 #: actions/apiaccountupdateprofilebackgroundimage.php:116
-#: actions/apiaccountupdateprofileimage.php:105
-#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
-#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
-#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
+#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90
 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
@@ -45,7 +45,7 @@ msgstr "Seite nicht vorhanden"
 #: actions/repliesrss.php:38 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38
 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
-#: lib/command.php:364 lib/command.php:411 lib/command.php:466
+#: lib/command.php:364 lib/command.php:411 lib/command.php:467
 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
 #: lib/subs.php:34 lib/subs.php:116
 msgid "No such user."
@@ -57,7 +57,7 @@ msgid "%s and friends, page %d"
 msgstr "%s und Freunde, Seite %d"
 
 #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
-#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100
+#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s und Freunde"
@@ -108,24 +108,24 @@ msgstr ""
 msgid "You and friends"
 msgstr "Du und Freunde"
 
-#: actions/allrss.php:119 actions/apitimelinefriends.php:121
+#: actions/allrss.php:119 actions/apitimelinefriends.php:122
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Aktualisierungen von %1$s und Freunden auf %2$s!"
 
 #: actions/apiaccountratelimitstatus.php:70
 #: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofile.php:97
 #: actions/apiaccountupdateprofilebackgroundimage.php:94
 #: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apiaccountupdateprofile.php:97
 msgid "API method not found."
 msgstr "API-Methode nicht gefunden."
 
 #: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofile.php:89
 #: actions/apiaccountupdateprofilebackgroundimage.php:86
 #: actions/apiaccountupdateprofilecolors.php:110
-#: actions/apiaccountupdateprofileimage.php:84
-#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
+#: actions/apiaccountupdateprofileimage.php:84 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
@@ -144,9 +144,22 @@ msgstr ""
 msgid "Could not update user."
 msgstr "Konnte Benutzerdaten nicht aktualisieren."
 
+#: actions/apiaccountupdateprofile.php:112
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+msgid "User has no profile."
+msgstr "Benutzer hat kein Profil."
+
+#: actions/apiaccountupdateprofile.php:147
+msgid "Could not save profile."
+msgstr "Konnte Profil nicht speichern."
+
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257
 #: actions/designadminpanel.php:122 actions/newnotice.php:94
 #: lib/designsettings.php:283
 #, php-format
@@ -167,19 +180,6 @@ msgstr "Konnte Twitter-Einstellungen nicht speichern."
 msgid "Could not update your design."
 msgstr "Konnte Benutzerdesign nicht aktualisieren."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
-#: actions/apiaccountupdateprofileimage.php:130
-#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
-#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
-msgid "User has no profile."
-msgstr "Benutzer hat kein Profil."
-
-#: actions/apiaccountupdateprofile.php:147
-msgid "Could not save profile."
-msgstr "Konnte Profil nicht speichern."
-
 #: actions/apiblockcreate.php:105
 #, fuzzy
 msgid "You cannot block yourself!"
@@ -193,26 +193,6 @@ msgstr "Blockieren des Benutzers fehlgeschlagen."
 msgid "Unblock user failed."
 msgstr "Freigeben des Benutzers fehlgeschlagen."
 
-#: actions/apidirectmessagenew.php:126
-msgid "No message text!"
-msgstr "Fehlender Nachrichtentext!"
-
-#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
-#, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr ""
-"Die Nachricht ist zu lang. Die maximale Nachrichtenlänge ist 140 Zeichen."
-
-#: actions/apidirectmessagenew.php:146
-msgid "Recipient user not found."
-msgstr "Empfänger nicht gefunden."
-
-#: actions/apidirectmessagenew.php:150
-msgid "Can't send direct messages to users who aren't your friend."
-msgstr ""
-"Es können keine direkten Nachrichten an Benutzer geschickt werden mit denen "
-"du nicht befreundet bist."
-
 #: actions/apidirectmessage.php:89
 #, php-format
 msgid "Direct messages from %s"
@@ -238,18 +218,38 @@ msgstr "Alle an %s gesendeten direkten Nachrichten"
 #: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
-#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
-#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149
-#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
-#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156
+#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151
+#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141
+#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
 msgid "API method not found!"
 msgstr "API-Methode nicht gefunden!"
 
+#: actions/apidirectmessagenew.php:126
+msgid "No message text!"
+msgstr "Fehlender Nachrichtentext!"
+
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr ""
+"Die Nachricht ist zu lang. Die maximale Nachrichtenlänge ist 140 Zeichen."
+
+#: actions/apidirectmessagenew.php:146
+msgid "Recipient user not found."
+msgstr "Empfänger nicht gefunden."
+
+#: actions/apidirectmessagenew.php:150
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr ""
+"Es können keine direkten Nachrichten an Benutzer geschickt werden mit denen "
+"du nicht befreundet bist."
+
 #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
 #: actions/apistatusesdestroy.php:113
 msgid "No status found with that ID."
@@ -395,16 +395,6 @@ msgstr "Du bist kein Mitglied dieser Gruppe."
 msgid "Could not remove user %s to group %s."
 msgstr "Konnte Benutzer %s nicht aus der Gruppe %s entfernen."
 
-#: actions/apigrouplistall.php:90 actions/usergroups.php:62
-#, php-format
-msgid "%s groups"
-msgstr "%s Gruppen"
-
-#: actions/apigrouplistall.php:94
-#, php-format
-msgid "groups on %s"
-msgstr "Gruppen von %s"
-
 #: actions/apigrouplist.php:95
 #, php-format
 msgid "%s's groups"
@@ -415,6 +405,16 @@ msgstr "%s’s Gruppen"
 msgid "Groups %s is a member of on %s."
 msgstr "Gruppen %s sind ein Mitglied von %s."
 
+#: actions/apigrouplistall.php:90 actions/usergroups.php:62
+#, php-format
+msgid "%s groups"
+msgstr "%s Gruppen"
+
+#: actions/apigrouplistall.php:94
+#, php-format
+msgid "groups on %s"
+msgstr "Gruppen von %s"
+
 #: actions/apistatusesdestroy.php:107
 msgid "This method requires a POST or DELETE."
 msgstr "Diese Methode benötigt ein POST oder DELETE."
@@ -453,54 +453,54 @@ msgstr ""
 msgid "Unsupported format."
 msgstr "Bildformat wird nicht unterstützt."
 
-#: actions/apitimelinefavorites.php:107
+#: actions/apitimelinefavorites.php:108
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr "%s / Favoriten von %s"
 
-#: actions/apitimelinefavorites.php:119
+#: actions/apitimelinefavorites.php:120
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr "%s Aktualisierung in den Favoriten von %s / %s."
 
-#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117
+#: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118
 #: actions/grouprss.php:131 actions/userrss.php:90
 #, php-format
 msgid "%s timeline"
 msgstr "%s Zeitleiste"
 
-#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125
+#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
 #: actions/userrss.php:92
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Aktualisierungen von %1$s auf %2$s!"
 
-#: actions/apitimelinementions.php:116
+#: actions/apitimelinementions.php:117
 #, php-format
 msgid "%1$s / Updates mentioning %2$s"
 msgstr "%1$s / Aktualisierungen erwähnen %2$s"
 
-#: actions/apitimelinementions.php:126
+#: actions/apitimelinementions.php:127
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "Nachrichten von %1$, die auf Nachrichten von %2$ / %3$ antworten."
 
-#: actions/apitimelinepublic.php:106 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s öffentliche Zeitleiste"
 
-#: actions/apitimelinepublic.php:110 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s Nachrichten von allen!"
 
-#: actions/apitimelinetag.php:101 actions/tag.php:66
+#: actions/apitimelinetag.php:102 actions/tag.php:66
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Nachrichten, die mit %s getagt sind"
 
-#: actions/apitimelinetag.php:107 actions/tagrss.php:64
+#: actions/apitimelinetag.php:108 actions/tagrss.php:64
 #, php-format
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Aktualisierungen mit %1$s getagt auf %2$s!"
@@ -536,45 +536,45 @@ msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr ""
 "Du kannst dein persönliches Avatar hochladen. Die maximale Dateigröße ist %s."
 
-#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:185
 #: actions/grouplogo.php:178 actions/remotesubscribe.php:191
 #: actions/userauthorization.php:72 actions/userrss.php:103
 msgid "User without matching profile"
 msgstr "Benutzer ohne passendes Profil"
 
-#: actions/avatarsettings.php:119 actions/avatarsettings.php:194
+#: actions/avatarsettings.php:119 actions/avatarsettings.php:197
 #: actions/grouplogo.php:251
 msgid "Avatar settings"
 msgstr "Avatar-Einstellungen"
 
-#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/avatarsettings.php:127 actions/avatarsettings.php:205
 #: actions/grouplogo.php:199 actions/grouplogo.php:259
 msgid "Original"
 msgstr "Original"
 
-#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/avatarsettings.php:142 actions/avatarsettings.php:217
 #: actions/grouplogo.php:210 actions/grouplogo.php:271
 msgid "Preview"
 msgstr "Vorschau"
 
-#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
+#: actions/avatarsettings.php:149 lib/deleteuserform.php:66
 #: lib/noticelist.php:550
 msgid "Delete"
 msgstr "Löschen"
 
-#: actions/avatarsettings.php:165 actions/grouplogo.php:233
+#: actions/avatarsettings.php:166 actions/grouplogo.php:233
 msgid "Upload"
 msgstr "Hochladen"
 
-#: actions/avatarsettings.php:228 actions/grouplogo.php:286
+#: actions/avatarsettings.php:231 actions/grouplogo.php:286
 msgid "Crop"
 msgstr "Zuschneiden"
 
-#: actions/avatarsettings.php:265 actions/disfavor.php:74
+#: actions/avatarsettings.php:268 actions/disfavor.php:74
 #: actions/emailsettings.php:238 actions/favor.php:75
 #: actions/groupblock.php:66 actions/grouplogo.php:309
 #: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -585,34 +585,71 @@ msgstr "Zuschneiden"
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Es gab ein Problem mit deinem Sitzungstoken. Bitte versuche es erneut."
 
-#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
+#: actions/avatarsettings.php:281 actions/designadminpanel.php:103
 #: actions/emailsettings.php:256 actions/grouplogo.php:319
 #: actions/imsettings.php:220 actions/recoverpassword.php:44
 #: actions/smssettings.php:248 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "Unerwartete Formulareingabe."
 
-#: actions/avatarsettings.php:322
+#: actions/avatarsettings.php:328
 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:337 actions/grouplogo.php:377
+#: actions/avatarsettings.php:343 actions/grouplogo.php:377
 msgid "Lost our file data."
 msgstr "Daten verloren."
 
-#: actions/avatarsettings.php:360
+#: actions/avatarsettings.php:366
 msgid "Avatar updated."
 msgstr "Avatar aktualisiert."
 
-#: actions/avatarsettings.php:363
+#: actions/avatarsettings.php:369
 msgid "Failed updating avatar."
 msgstr "Aktualisierung des Avatars fehlgeschlagen."
 
-#: actions/avatarsettings.php:387
+#: actions/avatarsettings.php:393
 msgid "Avatar deleted."
 msgstr "Avatar gelöscht."
 
+#: actions/block.php:69
+msgid "You already blocked that user."
+msgstr "Du hast diesen Benutzer bereits blockiert."
+
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
+msgid "Block user"
+msgstr "Benutzer blockieren"
+
+#: actions/block.php:130
+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/block.php:143 actions/deletenotice.php:145
+#: actions/deleteuser.php:147 actions/groupblock.php:178
+msgid "No"
+msgstr "Nein"
+
+#: actions/block.php:143 actions/deleteuser.php:147
+msgid "Do not block this user"
+msgstr "Diesen Benutzer freigeben"
+
+#: actions/block.php:144 actions/deletenotice.php:146
+#: actions/deleteuser.php:148 actions/groupblock.php:179
+msgid "Yes"
+msgstr "Ja"
+
+#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
+msgid "Block this user"
+msgstr "Diesen Benutzer blockieren"
+
+#: actions/block.php:162
+msgid "Failed to save block information."
+msgstr "Konnte Blockierungsdaten nicht speichern."
+
 #: actions/blockedfromgroup.php:73 actions/editgroup.php:84
 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
 #: actions/groupmembers.php:76 actions/grouprss.php:91
@@ -653,43 +690,6 @@ msgstr "Freigeben"
 msgid "Unblock this user"
 msgstr "Diesen Benutzer freigeben"
 
-#: actions/block.php:69
-msgid "You already blocked that user."
-msgstr "Du hast diesen Benutzer bereits blockiert."
-
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
-msgid "Block user"
-msgstr "Benutzer blockieren"
-
-#: actions/block.php:130
-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/block.php:143 actions/deletenotice.php:145
-#: actions/deleteuser.php:147 actions/groupblock.php:178
-msgid "No"
-msgstr "Nein"
-
-#: actions/block.php:143 actions/deleteuser.php:147
-msgid "Do not block this user"
-msgstr "Diesen Benutzer freigeben"
-
-#: actions/block.php:144 actions/deletenotice.php:146
-#: actions/deleteuser.php:148 actions/groupblock.php:179
-msgid "Yes"
-msgstr "Ja"
-
-#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
-msgid "Block this user"
-msgstr "Diesen Benutzer blockieren"
-
-#: actions/block.php:162
-msgid "Failed to save block information."
-msgstr "Konnte Blockierungsdaten nicht speichern."
-
 #: actions/bookmarklet.php:50
 msgid "Post to "
 msgstr "Versenden an "
@@ -1160,6 +1160,14 @@ msgstr "Eingehende E-Mail-Adresse entfernt"
 msgid "New incoming email address added."
 msgstr "Neue Eingangs-E-Mail-Adresse hinzugefügt."
 
+#: actions/favor.php:79
+msgid "This notice is already a favorite!"
+msgstr "Diese Nachricht ist bereits ein Favorit!"
+
+#: actions/favor.php:92 lib/disfavorform.php:140
+msgid "Disfavor favorite"
+msgstr "Aus Favoriten entfernen"
+
 #: actions/favorited.php:65 lib/popularnoticesection.php:88
 #: lib/publicgroupnav.php:93
 msgid "Popular notices"
@@ -1202,14 +1210,6 @@ msgstr "%ss favorisierte Nachrichten"
 msgid "Updates favored by %1$s on %2$s!"
 msgstr "Aktualisierungen von %1$s auf %2$s!"
 
-#: actions/favor.php:79
-msgid "This notice is already a favorite!"
-msgstr "Diese Nachricht ist bereits ein Favorit!"
-
-#: actions/favor.php:92 lib/disfavorform.php:140
-msgid "Disfavor favorite"
-msgstr "Aus Favoriten entfernen"
-
 #: actions/featured.php:69 lib/featureduserssection.php:87
 #: lib/publicgroupnav.php:89
 msgid "Featured users"
@@ -1436,6 +1436,30 @@ msgstr "Diesen Benutzer zu einem Admin ernennen"
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "Aktualisierungen von %1$s auf %2$s!"
 
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+msgid "Groups"
+msgstr "Gruppen"
+
+#: actions/groups.php:64
+#, php-format
+msgid "Groups, page %d"
+msgstr "Gruppen, Seite %d"
+
+#: actions/groups.php:90
+#, php-format
+msgid ""
+"%%%%site.name%%%% groups let you find and talk with people of similar "
+"interests. After you join a group you can send messages to all other members "
+"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
+"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
+"%%%%)"
+msgstr ""
+
+#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
+msgid "Create a new group"
+msgstr "Neue Gruppe erstellen"
+
 #: actions/groupsearch.php:52
 #, php-format
 msgid ""
@@ -1471,30 +1495,6 @@ msgid ""
 "action.newgroup%%) yourself!"
 msgstr ""
 
-#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
-msgid "Groups"
-msgstr "Gruppen"
-
-#: actions/groups.php:64
-#, php-format
-msgid "Groups, page %d"
-msgstr "Gruppen, Seite %d"
-
-#: actions/groups.php:90
-#, php-format
-msgid ""
-"%%%%site.name%%%% groups let you find and talk with people of similar "
-"interests. After you join a group you can send messages to all other members "
-"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
-"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
-"%%%%)"
-msgstr ""
-
-#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
-msgid "Create a new group"
-msgstr "Neue Gruppe erstellen"
-
 #: actions/groupunblock.php:91
 msgid "Only an admin can unblock group members."
 msgstr "Nur Administratoren können Gruppenmitglieder entsperren."
@@ -1695,7 +1695,7 @@ msgstr ""
 "Wenn du möchtest kannst du zu der Einladung eine persönliche Nachricht "
 "anfügen."
 
-#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:222
 msgid "Send"
 msgstr "Senden"
 
@@ -1800,56 +1800,56 @@ msgstr "Konnte Benutzer %s aus der Gruppe %s nicht entfernen"
 msgid "%s left group %s"
 msgstr "%s hat die Gruppe %s verlassen"
 
-#: actions/login.php:82 actions/register.php:137
+#: actions/login.php:83 actions/register.php:137
 msgid "Already logged in."
 msgstr "Bereits angemeldet."
 
-#: actions/login.php:113 actions/login.php:123
+#: actions/login.php:114 actions/login.php:124
 msgid "Invalid or expired token."
 msgstr "Token ungültig oder abgelaufen."
 
-#: actions/login.php:146
+#: actions/login.php:147
 msgid "Incorrect username or password."
 msgstr "Falscher Benutzername oder Passwort."
 
-#: actions/login.php:152
+#: actions/login.php:153
 msgid "Error setting user. You are probably not authorized."
 msgstr ""
 "Fehler beim setzen des Benutzers. Du bist vermutlich nicht autorisiert."
 
-#: actions/login.php:207 actions/login.php:260 lib/action.php:458
+#: actions/login.php:208 actions/login.php:261 lib/action.php:458
 #: lib/logingroupnav.php:79
 msgid "Login"
 msgstr "Anmelden"
 
-#: actions/login.php:246
+#: actions/login.php:247
 msgid "Login to site"
 msgstr "An Seite anmelden"
 
-#: actions/login.php:249 actions/profilesettings.php:106
+#: actions/login.php:250 actions/profilesettings.php:106
 #: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
 #: lib/groupeditform.php:152 lib/userprofile.php:131
 msgid "Nickname"
 msgstr "Nutzername"
 
-#: actions/login.php:252 actions/register.php:428
+#: actions/login.php:253 actions/register.php:428
 #: lib/accountsettingsaction.php:116
 msgid "Password"
 msgstr "Passwort"
 
-#: actions/login.php:255 actions/register.php:477
+#: actions/login.php:256 actions/register.php:477
 msgid "Remember me"
 msgstr "Anmeldedaten merken"
 
-#: actions/login.php:256 actions/register.php:479
+#: actions/login.php:257 actions/register.php:479
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Automatisch anmelden; nicht bei gemeinsam genutzten PCs einsetzen!"
 
-#: actions/login.php:266
+#: actions/login.php:267
 msgid "Lost or forgotten password?"
 msgstr "Passwort vergessen?"
 
-#: actions/login.php:285
+#: actions/login.php:286
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -1857,7 +1857,7 @@ msgstr ""
 "Bitte gebe aus Sicherheitsgründen deinen Benutzernamen und dein Passwort "
 "ein, bevor die Änderungen an deinen Einstellungen übernommen werden."
 
-#: actions/login.php:289
+#: actions/login.php:290
 #, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -1929,7 +1929,7 @@ msgstr "Nachricht gesendet"
 msgid "Direct message to %s sent"
 msgstr "Direkte Nachricht an %s abgeschickt"
 
-#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:242 lib/channel.php:170
 msgid "Ajax Error"
 msgstr "Ajax-Fehler"
 
@@ -1937,7 +1937,7 @@ msgstr "Ajax-Fehler"
 msgid "New notice"
 msgstr "Neue Nachricht"
 
-#: actions/newnotice.php:206
+#: actions/newnotice.php:208
 msgid "Notice posted"
 msgstr "Nachricht hinzugefügt"
 
@@ -2016,8 +2016,8 @@ msgstr "Content-Typ "
 msgid "Only "
 msgstr ""
 
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996
-#: lib/api.php:1024 lib/api.php:1134
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011
+#: lib/api.php:1039 lib/api.php:1149
 msgid "Not a supported data format."
 msgstr "Kein unterstütztes Datenformat."
 
@@ -3567,6 +3567,26 @@ msgstr "Jabber"
 msgid "SMS"
 msgstr "SMS"
 
+#: actions/tag.php:68
+#, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr "Nachrichten, die mit %s getagt sind, Seite %d"
+
+#: actions/tag.php:86
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "Feed der Nachrichten von %s"
+
+#: actions/tag.php:92
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "Feed der Nachrichten von %s"
+
+#: actions/tag.php:98
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "Feed der Nachrichten von %s"
+
 #: actions/tagother.php:33
 msgid "Not logged in"
 msgstr "Nicht angemeldet"
@@ -3617,26 +3637,6 @@ msgstr ""
 "Benutze dieses Formular, um Tags zu deinen Abonnenten oder Abonnements "
 "hinzuzufügen."
 
-#: actions/tag.php:68
-#, php-format
-msgid "Notices tagged with %s, page %d"
-msgstr "Nachrichten, die mit %s getagt sind, Seite %d"
-
-#: actions/tag.php:86
-#, fuzzy, php-format
-msgid "Notice feed for tag %s (RSS 1.0)"
-msgstr "Feed der Nachrichten von %s"
-
-#: actions/tag.php:92
-#, fuzzy, php-format
-msgid "Notice feed for tag %s (RSS 2.0)"
-msgstr "Feed der Nachrichten von %s"
-
-#: actions/tag.php:98
-#, fuzzy, php-format
-msgid "Notice feed for tag %s (Atom)"
-msgstr "Feed der Nachrichten von %s"
-
 #: actions/tagrss.php:35
 msgid "No such tag."
 msgstr "Tag nicht vorhanden."
@@ -3948,22 +3948,22 @@ msgstr "Konnte Nachricht nicht mit neuer URI versehen."
 msgid "DB error inserting hashtag: %s"
 msgstr "Datenbankfehler beim Einfügen des Hashtags: %s"
 
-#: classes/Notice.php:179
+#: classes/Notice.php:188
 msgid "Problem saving notice. Too long."
 msgstr "Problem bei Speichern der Nachricht. Sie ist zu lang."
 
-#: classes/Notice.php:183
+#: classes/Notice.php:192
 msgid "Problem saving notice. Unknown user."
 msgstr "Problem bei Speichern der Nachricht. Unbekannter Benutzer."
 
-#: classes/Notice.php:188
+#: classes/Notice.php:197
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 "Zu schnell zu viele Nachrichten; atme kurz durch und schicke sie erneut in "
 "ein paar Minuten ab."
 
-#: classes/Notice.php:194
+#: classes/Notice.php:203
 #, fuzzy
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
@@ -3972,20 +3972,25 @@ msgstr ""
 "Zu schnell zu viele Nachrichten; atme kurz durch und schicke sie erneut in "
 "ein paar Minuten ab."
 
-#: classes/Notice.php:200
+#: classes/Notice.php:209
 msgid "You are banned from posting notices on this site."
 msgstr ""
 "Du wurdest für das Schreiben von Nachrichten auf dieser Seite gesperrt."
 
-#: classes/Notice.php:265 classes/Notice.php:290
+#: classes/Notice.php:274 classes/Notice.php:299
 msgid "Problem saving notice."
 msgstr "Problem bei Speichern der Nachricht."
 
-#: classes/Notice.php:1124
+#: classes/Notice.php:1115
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Datenbankfehler beim Einfügen der Antwort: %s"
 
+#: classes/User.php:347
+#, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr "Herzlich willkommen bei %1$s, @%2$s!"
+
 #: classes/User_group.php:380
 msgid "Could not create group."
 msgstr "Konnte Gruppe nicht erstellen."
@@ -3994,11 +3999,6 @@ msgstr "Konnte Gruppe nicht erstellen."
 msgid "Could not set group membership."
 msgstr "Konnte Gruppenmitgliedschaft nicht setzen."
 
-#: classes/User.php:347
-#, php-format
-msgid "Welcome to %1$s, @%2$s!"
-msgstr "Herzlich willkommen bei %1$s, @%2$s!"
-
 #: lib/accountsettingsaction.php:108
 msgid "Change your profile settings"
 msgstr "Ändern der Profileinstellungen"
@@ -4310,7 +4310,7 @@ msgstr ""
 msgid "Notice with that id does not exist"
 msgstr "Nachricht mit dieser ID existiert nicht"
 
-#: lib/command.php:168 lib/command.php:416 lib/command.php:471
+#: lib/command.php:168 lib/command.php:416 lib/command.php:472
 msgid "User has no last notice"
 msgstr "Benutzer hat keine letzte Nachricht"
 
@@ -4357,101 +4357,101 @@ msgstr "Fehler beim Senden der Nachricht"
 msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr "Nachricht zu lange - maximal 140 Zeichen erlaubt, du hast %s gesendet"
 
-#: lib/command.php:439
+#: lib/command.php:440
 #, php-format
 msgid "Reply to %s sent"
 msgstr "Antwort an %s gesendet"
 
-#: lib/command.php:441
+#: lib/command.php:442
 msgid "Error saving notice."
 msgstr "Problem beim Speichern der Nachricht."
 
-#: lib/command.php:495
+#: lib/command.php:496
 msgid "Specify the name of the user to subscribe to"
 msgstr "Gib den Namen des Benutzers an, den du abonnieren möchtest"
 
-#: lib/command.php:502
+#: lib/command.php:503
 #, php-format
 msgid "Subscribed to %s"
 msgstr "%s abonniert"
 
-#: lib/command.php:523
+#: lib/command.php:524
 msgid "Specify the name of the user to unsubscribe from"
 msgstr "Gib den Namen des Benutzers ein, den du nicht mehr abonnieren möchtest"
 
-#: lib/command.php:530
+#: lib/command.php:531
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr "%s nicht mehr abonniert"
 
-#: lib/command.php:548 lib/command.php:571
+#: lib/command.php:549 lib/command.php:572
 msgid "Command not yet implemented."
 msgstr "Befehl noch nicht implementiert."
 
-#: lib/command.php:551
+#: lib/command.php:552
 msgid "Notification off."
 msgstr "Benachrichtigung deaktiviert."
 
-#: lib/command.php:553
+#: lib/command.php:554
 msgid "Can't turn off notification."
 msgstr "Konnte Benachrichtigung nicht deaktivieren."
 
-#: lib/command.php:574
+#: lib/command.php:575
 msgid "Notification on."
 msgstr "Benachrichtigung aktiviert."
 
-#: lib/command.php:576
+#: lib/command.php:577
 msgid "Can't turn on notification."
 msgstr "Konnte Benachrichtigung nicht aktivieren."
 
-#: lib/command.php:588
+#: lib/command.php:590
 msgid "Login command is disabled"
 msgstr ""
 
-#: lib/command.php:602
+#: lib/command.php:604
 #, fuzzy, php-format
 msgid "Could not create login token for %s"
 msgstr "Konnte keinen Favoriten erstellen."
 
-#: lib/command.php:607
+#: lib/command.php:609
 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:623
+#: lib/command.php:625
 #, fuzzy
 msgid "You are not subscribed to anyone."
 msgstr "Du hast dieses Profil nicht abonniert."
 
-#: lib/command.php:625
+#: lib/command.php:627
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Du hast diese Benutzer bereits abonniert:"
 msgstr[1] "Du hast diese Benutzer bereits abonniert:"
 
-#: lib/command.php:645
+#: lib/command.php:647
 #, fuzzy
 msgid "No one is subscribed to you."
 msgstr "Die Gegenseite konnte Dich nicht abonnieren."
 
-#: lib/command.php:647
+#: lib/command.php:649
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Die Gegenseite konnte Dich nicht abonnieren."
 msgstr[1] "Die Gegenseite konnte Dich nicht abonnieren."
 
-#: lib/command.php:667
+#: lib/command.php:669
 #, fuzzy
 msgid "You are not a member of any groups."
 msgstr "Du bist kein Mitglied dieser Gruppe."
 
-#: lib/command.php:669
+#: lib/command.php:671
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Du bist kein Mitglied dieser Gruppe."
 msgstr[1] "Du bist kein Mitglied dieser Gruppe."
 
-#: lib/command.php:683
+#: lib/command.php:685
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -4554,10 +4554,6 @@ msgstr "Zu den Favoriten hinzufügen"
 msgid "Favor"
 msgstr "Zu Favoriten hinzufügen"
 
-#: lib/feedlist.php:64
-msgid "Export data"
-msgstr "Daten exportieren"
-
 #: lib/feed.php:85
 msgid "RSS 1.0"
 msgstr ""
@@ -4574,6 +4570,10 @@ msgstr ""
 msgid "FOAF"
 msgstr ""
 
+#: lib/feedlist.php:64
+msgid "Export data"
+msgstr "Daten exportieren"
+
 #: lib/galleryaction.php:121
 msgid "Filter tags"
 msgstr "Tags filtern"
@@ -4745,21 +4745,6 @@ msgstr "Anmelden mit einem Benutzernamen und Passwort"
 msgid "Sign up for a new account"
 msgstr "Für ein neues Konto registrieren"
 
-#: lib/mailbox.php:89
-msgid "Only the user can read their own mailboxes."
-msgstr "Nur der Benutzer selbst kann seinen Posteingang lesen."
-
-#: lib/mailbox.php:139
-msgid ""
-"You have no private messages. You can send private message to engage other "
-"users in conversation. People can send you messages for your eyes only."
-msgstr ""
-
-#: lib/mailbox.php:227 lib/noticelist.php:452
-#, fuzzy
-msgid "from"
-msgstr "von"
-
 #: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Bestätigung der E-Mail-Adresse"
@@ -4952,6 +4937,21 @@ msgid ""
 "\n"
 msgstr ""
 
+#: lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
+msgstr "Nur der Benutzer selbst kann seinen Posteingang lesen."
+
+#: lib/mailbox.php:139
+msgid ""
+"You have no private messages. You can send private message to engage other "
+"users in conversation. People can send you messages for your eyes only."
+msgstr ""
+
+#: lib/mailbox.php:227 lib/noticelist.php:452
+#, fuzzy
+msgid "from"
+msgstr "von"
+
 #: lib/mediafile.php:98 lib/mediafile.php:123
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
@@ -5013,7 +5013,7 @@ msgstr "Versende eine direkte Nachricht"
 msgid "To"
 msgstr "An"
 
-#: lib/messageform.php:161 lib/noticeform.php:185
+#: lib/messageform.php:159 lib/noticeform.php:183
 #, fuzzy
 msgid "Available characters"
 msgstr "Verfügbare Zeichen"
@@ -5028,11 +5028,11 @@ msgstr "Nachricht versenden"
 msgid "What's up, %s?"
 msgstr "Was ist los, %s?"
 
-#: lib/noticeform.php:192
+#: lib/noticeform.php:190
 msgid "Attach"
 msgstr ""
 
-#: lib/noticeform.php:196
+#: lib/noticeform.php:194
 msgid "Attach a file"
 msgstr ""
 
@@ -5106,12 +5106,12 @@ msgstr "Fehler beim Einfügen des entfernten Profils"
 msgid "Duplicate notice"
 msgstr "Notiz löschen"
 
-#: lib/oauthstore.php:467 lib/subs.php:48
+#: lib/oauthstore.php:466 lib/subs.php:48
 #, fuzzy
 msgid "You have been banned from subscribing."
 msgstr "Dieser Benutzer erlaubt dir nicht ihn zu abonnieren."
 
-#: lib/oauthstore.php:492
+#: lib/oauthstore.php:491
 msgid "Couldn't insert new subscription."
 msgstr "Konnte neues Abonnement nicht eintragen."
 
@@ -5278,21 +5278,6 @@ msgstr "Leute, die %s abonniert haben"
 msgid "Groups %s is a member of"
 msgstr "Gruppen in denen %s Mitglied ist"
 
-#: 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/subscriptionlist.php:126
-#, fuzzy
-msgid "(none)"
-msgstr "(leer)"
-
 #: lib/subs.php:52
 msgid "Already subscribed!"
 msgstr ""
@@ -5323,6 +5308,21 @@ msgstr "Konnte Abonnement nicht löschen."
 msgid "Couldn't delete subscription."
 msgstr "Konnte Abonnement nicht löschen."
 
+#: 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/subscriptionlist.php:126
+#, fuzzy
+msgid "(none)"
+msgstr "(leer)"
+
 #: lib/tagcloudsection.php:56
 msgid "None"
 msgstr "Nichts"
diff --git a/locale/el/LC_MESSAGES/statusnet.po b/locale/el/LC_MESSAGES/statusnet.po
index d6142aaa76..a072fcbc24 100644
--- a/locale/el/LC_MESSAGES/statusnet.po
+++ b/locale/el/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 21:25+0000\n"
-"PO-Revision-Date: 2009-12-07 21:26:14+0000\n"
+"POT-Creation-Date: 2009-12-12 17:09+0000\n"
+"PO-Revision-Date: 2009-12-12 17:09:26+0000\n"
 "Language-Team: Greek\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n"
+"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: el\n"
 "X-Message-Group: out-statusnet\n"
@@ -27,11 +27,11 @@ msgstr "Αδύνατη η αποθήκευση του προφίλ."
 
 #: actions/all.php:74 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofile.php:105
 #: actions/apiaccountupdateprofilebackgroundimage.php:116
-#: actions/apiaccountupdateprofileimage.php:105
-#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
-#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
-#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
+#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90
 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
@@ -44,7 +44,7 @@ msgstr "Αδύνατη η αποθήκευση του προφίλ."
 #: actions/repliesrss.php:38 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38
 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
-#: lib/command.php:364 lib/command.php:411 lib/command.php:466
+#: lib/command.php:364 lib/command.php:411 lib/command.php:467
 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
 #: lib/subs.php:34 lib/subs.php:116
 msgid "No such user."
@@ -56,7 +56,7 @@ msgid "%s and friends, page %d"
 msgstr "%s και οι φίλοι του/της"
 
 #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
-#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100
+#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s και οι φίλοι του/της"
@@ -108,25 +108,25 @@ msgstr ""
 msgid "You and friends"
 msgstr "%s και οι φίλοι του/της"
 
-#: actions/allrss.php:119 actions/apitimelinefriends.php:121
+#: actions/allrss.php:119 actions/apitimelinefriends.php:122
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr ""
 
 #: actions/apiaccountratelimitstatus.php:70
 #: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofile.php:97
 #: actions/apiaccountupdateprofilebackgroundimage.php:94
 #: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apiaccountupdateprofile.php:97
 #, fuzzy
 msgid "API method not found."
 msgstr "Η μέθοδος του ΑΡΙ δε βρέθηκε!"
 
 #: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofile.php:89
 #: actions/apiaccountupdateprofilebackgroundimage.php:86
 #: actions/apiaccountupdateprofilecolors.php:110
-#: actions/apiaccountupdateprofileimage.php:84
-#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
+#: actions/apiaccountupdateprofileimage.php:84 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
@@ -146,9 +146,23 @@ msgstr ""
 msgid "Could not update user."
 msgstr "Απέτυχε η ενημέρωση του χρήστη."
 
+#: actions/apiaccountupdateprofile.php:112
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+msgid "User has no profile."
+msgstr ""
+
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "Απέτυχε η αποθήκευση του προφίλ."
+
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257
 #: actions/designadminpanel.php:122 actions/newnotice.php:94
 #: lib/designsettings.php:283
 #, php-format
@@ -170,20 +184,6 @@ msgstr ""
 msgid "Could not update your design."
 msgstr "Απέτυχε η ενημέρωση του χρήστη."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
-#: actions/apiaccountupdateprofileimage.php:130
-#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
-#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
-msgid "User has no profile."
-msgstr ""
-
-#: actions/apiaccountupdateprofile.php:147
-#, fuzzy
-msgid "Could not save profile."
-msgstr "Απέτυχε η αποθήκευση του προφίλ."
-
 #: actions/apiblockcreate.php:105
 #, fuzzy
 msgid "You cannot block yourself!"
@@ -197,23 +197,6 @@ msgstr ""
 msgid "Unblock user failed."
 msgstr ""
 
-#: actions/apidirectmessagenew.php:126
-msgid "No message text!"
-msgstr ""
-
-#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
-#, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr ""
-
-#: actions/apidirectmessagenew.php:146
-msgid "Recipient user not found."
-msgstr ""
-
-#: actions/apidirectmessagenew.php:150
-msgid "Can't send direct messages to users who aren't your friend."
-msgstr ""
-
 #: actions/apidirectmessage.php:89
 #, php-format
 msgid "Direct messages from %s"
@@ -239,18 +222,35 @@ msgstr ""
 #: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
-#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
-#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149
-#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
-#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156
+#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151
+#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141
+#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
 msgid "API method not found!"
 msgstr "Η μέθοδος του ΑΡΙ δε βρέθηκε!"
 
+#: actions/apidirectmessagenew.php:126
+msgid "No message text!"
+msgstr ""
+
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr ""
+
+#: actions/apidirectmessagenew.php:146
+msgid "Recipient user not found."
+msgstr ""
+
+#: actions/apidirectmessagenew.php:150
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr ""
+
 #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
 #: actions/apistatusesdestroy.php:113
 msgid "No status found with that ID."
@@ -398,16 +398,6 @@ msgstr ""
 msgid "Could not remove user %s to group %s."
 msgstr "Αδύνατη η αποθήκευση του προφίλ."
 
-#: actions/apigrouplistall.php:90 actions/usergroups.php:62
-#, php-format
-msgid "%s groups"
-msgstr ""
-
-#: actions/apigrouplistall.php:94
-#, php-format
-msgid "groups on %s"
-msgstr "ομάδες του χρήστη %s"
-
 #: actions/apigrouplist.php:95
 #, php-format
 msgid "%s's groups"
@@ -418,6 +408,16 @@ msgstr "ομάδες των χρηστών %s"
 msgid "Groups %s is a member of on %s."
 msgstr "Ομάδες με τα περισσότερα μέλη"
 
+#: actions/apigrouplistall.php:90 actions/usergroups.php:62
+#, php-format
+msgid "%s groups"
+msgstr ""
+
+#: actions/apigrouplistall.php:94
+#, php-format
+msgid "groups on %s"
+msgstr "ομάδες του χρήστη %s"
+
 #: actions/apistatusesdestroy.php:107
 msgid "This method requires a POST or DELETE."
 msgstr ""
@@ -454,54 +454,54 @@ msgstr ""
 msgid "Unsupported format."
 msgstr ""
 
-#: actions/apitimelinefavorites.php:107
+#: actions/apitimelinefavorites.php:108
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr ""
 
-#: actions/apitimelinefavorites.php:119
+#: actions/apitimelinefavorites.php:120
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr ""
 
-#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117
+#: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118
 #: actions/grouprss.php:131 actions/userrss.php:90
 #, php-format
 msgid "%s timeline"
 msgstr "χρονοδιάγραμμα του χρήστη %s"
 
-#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125
+#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
 #: actions/userrss.php:92
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr ""
 
-#: actions/apitimelinementions.php:116
+#: actions/apitimelinementions.php:117
 #, php-format
 msgid "%1$s / Updates mentioning %2$s"
 msgstr ""
 
-#: actions/apitimelinementions.php:126
+#: actions/apitimelinementions.php:127
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr ""
 
-#: actions/apitimelinepublic.php:106 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr ""
 
-#: actions/apitimelinepublic.php:110 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr ""
 
-#: actions/apitimelinetag.php:101 actions/tag.php:66
+#: actions/apitimelinetag.php:102 actions/tag.php:66
 #, php-format
 msgid "Notices tagged with %s"
 msgstr ""
 
-#: actions/apitimelinetag.php:107 actions/tagrss.php:64
+#: actions/apitimelinetag.php:108 actions/tagrss.php:64
 #, php-format
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr ""
@@ -536,45 +536,45 @@ msgstr ""
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr ""
 
-#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:185
 #: actions/grouplogo.php:178 actions/remotesubscribe.php:191
 #: actions/userauthorization.php:72 actions/userrss.php:103
 msgid "User without matching profile"
 msgstr ""
 
-#: actions/avatarsettings.php:119 actions/avatarsettings.php:194
+#: actions/avatarsettings.php:119 actions/avatarsettings.php:197
 #: actions/grouplogo.php:251
 msgid "Avatar settings"
 msgstr "Ρυθμίσεις του άβαταρ"
 
-#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/avatarsettings.php:127 actions/avatarsettings.php:205
 #: actions/grouplogo.php:199 actions/grouplogo.php:259
 msgid "Original"
 msgstr ""
 
-#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/avatarsettings.php:142 actions/avatarsettings.php:217
 #: actions/grouplogo.php:210 actions/grouplogo.php:271
 msgid "Preview"
 msgstr ""
 
-#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
+#: actions/avatarsettings.php:149 lib/deleteuserform.php:66
 #: lib/noticelist.php:550
 msgid "Delete"
 msgstr ""
 
-#: actions/avatarsettings.php:165 actions/grouplogo.php:233
+#: actions/avatarsettings.php:166 actions/grouplogo.php:233
 msgid "Upload"
 msgstr ""
 
-#: actions/avatarsettings.php:228 actions/grouplogo.php:286
+#: actions/avatarsettings.php:231 actions/grouplogo.php:286
 msgid "Crop"
 msgstr ""
 
-#: actions/avatarsettings.php:265 actions/disfavor.php:74
+#: actions/avatarsettings.php:268 actions/disfavor.php:74
 #: actions/emailsettings.php:238 actions/favor.php:75
 #: actions/groupblock.php:66 actions/grouplogo.php:309
 #: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -585,34 +585,73 @@ msgstr ""
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
-#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
+#: actions/avatarsettings.php:281 actions/designadminpanel.php:103
 #: actions/emailsettings.php:256 actions/grouplogo.php:319
 #: actions/imsettings.php:220 actions/recoverpassword.php:44
 #: actions/smssettings.php:248 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr ""
 
-#: actions/avatarsettings.php:322
+#: actions/avatarsettings.php:328
 msgid "Pick a square area of the image to be your avatar"
 msgstr ""
 
-#: actions/avatarsettings.php:337 actions/grouplogo.php:377
+#: actions/avatarsettings.php:343 actions/grouplogo.php:377
 msgid "Lost our file data."
 msgstr ""
 
-#: actions/avatarsettings.php:360
+#: actions/avatarsettings.php:366
 msgid "Avatar updated."
 msgstr ""
 
-#: actions/avatarsettings.php:363
+#: actions/avatarsettings.php:369
 msgid "Failed updating avatar."
 msgstr ""
 
-#: actions/avatarsettings.php:387
+#: actions/avatarsettings.php:393
 #, fuzzy
 msgid "Avatar deleted."
 msgstr "Ρυθμίσεις OpenID"
 
+#: actions/block.php:69
+#, fuzzy
+msgid "You already blocked that user."
+msgstr "Αδυναμία διαγραφής αυτού του μηνύματος."
+
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
+msgid "Block user"
+msgstr ""
+
+#: actions/block.php:130
+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/block.php:143 actions/deletenotice.php:145
+#: actions/deleteuser.php:147 actions/groupblock.php:178
+msgid "No"
+msgstr "Όχι"
+
+#: actions/block.php:143 actions/deleteuser.php:147
+#, fuzzy
+msgid "Do not block this user"
+msgstr "Αδυναμία διαγραφής αυτού του μηνύματος."
+
+#: actions/block.php:144 actions/deletenotice.php:146
+#: actions/deleteuser.php:148 actions/groupblock.php:179
+msgid "Yes"
+msgstr ""
+
+#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
+msgid "Block this user"
+msgstr ""
+
+#: actions/block.php:162
+msgid "Failed to save block information."
+msgstr ""
+
 #: actions/blockedfromgroup.php:73 actions/editgroup.php:84
 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
 #: actions/groupmembers.php:76 actions/grouprss.php:91
@@ -654,45 +693,6 @@ msgstr ""
 msgid "Unblock this user"
 msgstr ""
 
-#: actions/block.php:69
-#, fuzzy
-msgid "You already blocked that user."
-msgstr "Αδυναμία διαγραφής αυτού του μηνύματος."
-
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
-msgid "Block user"
-msgstr ""
-
-#: actions/block.php:130
-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/block.php:143 actions/deletenotice.php:145
-#: actions/deleteuser.php:147 actions/groupblock.php:178
-msgid "No"
-msgstr "Όχι"
-
-#: actions/block.php:143 actions/deleteuser.php:147
-#, fuzzy
-msgid "Do not block this user"
-msgstr "Αδυναμία διαγραφής αυτού του μηνύματος."
-
-#: actions/block.php:144 actions/deletenotice.php:146
-#: actions/deleteuser.php:148 actions/groupblock.php:179
-msgid "Yes"
-msgstr ""
-
-#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
-msgid "Block this user"
-msgstr ""
-
-#: actions/block.php:162
-msgid "Failed to save block information."
-msgstr ""
-
 #: actions/bookmarklet.php:50
 msgid "Post to "
 msgstr ""
@@ -1169,6 +1169,14 @@ msgstr "Η διεύθυνση του εισερχόμενου email αφαιρέ
 msgid "New incoming email address added."
 msgstr ""
 
+#: actions/favor.php:79
+msgid "This notice is already a favorite!"
+msgstr ""
+
+#: actions/favor.php:92 lib/disfavorform.php:140
+msgid "Disfavor favorite"
+msgstr ""
+
 #: actions/favorited.php:65 lib/popularnoticesection.php:88
 #: lib/publicgroupnav.php:93
 msgid "Popular notices"
@@ -1211,14 +1219,6 @@ msgstr ""
 msgid "Updates favored by %1$s on %2$s!"
 msgstr ""
 
-#: actions/favor.php:79
-msgid "This notice is already a favorite!"
-msgstr ""
-
-#: actions/favor.php:92 lib/disfavorform.php:140
-msgid "Disfavor favorite"
-msgstr ""
-
 #: actions/featured.php:69 lib/featureduserssection.php:87
 #: lib/publicgroupnav.php:89
 msgid "Featured users"
@@ -1453,6 +1453,31 @@ msgstr ""
 msgid "Updates from members of %1$s on %2$s!"
 msgstr ""
 
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 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 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/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
+#, fuzzy
+msgid "Create a new group"
+msgstr "Δημιουργία νέου λογαριασμού"
+
 #: actions/groupsearch.php:52
 #, php-format
 msgid ""
@@ -1483,31 +1508,6 @@ msgid ""
 "action.newgroup%%) yourself!"
 msgstr ""
 
-#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 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 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/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
-#, fuzzy
-msgid "Create a new group"
-msgstr "Δημιουργία νέου λογαριασμού"
-
 #: actions/groupunblock.php:91
 msgid "Only an admin can unblock group members."
 msgstr ""
@@ -1691,7 +1691,7 @@ msgstr ""
 msgid "Optionally add a personal message to the invitation."
 msgstr ""
 
-#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:222
 msgid "Send"
 msgstr ""
 
@@ -1771,55 +1771,55 @@ msgstr ""
 msgid "%s left group %s"
 msgstr ""
 
-#: actions/login.php:82 actions/register.php:137
+#: actions/login.php:83 actions/register.php:137
 msgid "Already logged in."
 msgstr "Ήδη συνδεδεμένος."
 
-#: actions/login.php:113 actions/login.php:123
+#: actions/login.php:114 actions/login.php:124
 msgid "Invalid or expired token."
 msgstr ""
 
-#: actions/login.php:146
+#: actions/login.php:147
 msgid "Incorrect username or password."
 msgstr "Λάθος όνομα χρήστη ή κωδικός"
 
-#: actions/login.php:152
+#: actions/login.php:153
 msgid "Error setting user. You are probably not authorized."
 msgstr ""
 
-#: actions/login.php:207 actions/login.php:260 lib/action.php:458
+#: actions/login.php:208 actions/login.php:261 lib/action.php:458
 #: lib/logingroupnav.php:79
 msgid "Login"
 msgstr "Σύνδεση"
 
-#: actions/login.php:246
+#: actions/login.php:247
 msgid "Login to site"
 msgstr ""
 
-#: actions/login.php:249 actions/profilesettings.php:106
+#: actions/login.php:250 actions/profilesettings.php:106
 #: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
 #: lib/groupeditform.php:152 lib/userprofile.php:131
 msgid "Nickname"
 msgstr "Ψευδώνυμο"
 
-#: actions/login.php:252 actions/register.php:428
+#: actions/login.php:253 actions/register.php:428
 #: lib/accountsettingsaction.php:116
 msgid "Password"
 msgstr "Κωδικός"
 
-#: actions/login.php:255 actions/register.php:477
+#: actions/login.php:256 actions/register.php:477
 msgid "Remember me"
 msgstr ""
 
-#: actions/login.php:256 actions/register.php:479
+#: actions/login.php:257 actions/register.php:479
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Αυτόματη σύνδεση στο μέλλον. ΟΧΙ για κοινόχρηστους υπολογιστές!"
 
-#: actions/login.php:266
+#: actions/login.php:267
 msgid "Lost or forgotten password?"
 msgstr "Χάσατε ή ξεχάσατε τον κωδικό σας;"
 
-#: actions/login.php:285
+#: actions/login.php:286
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -1827,7 +1827,7 @@ msgstr ""
 "Για λόγους ασφαλείας, παρακαλώ εισάγετε ξανά το όνομα χρήστη και τον κωδικό "
 "σας, πριν αλλάξετε τις ρυθμίσεις σας."
 
-#: actions/login.php:289
+#: actions/login.php:290
 #, fuzzy, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -1899,7 +1899,7 @@ msgstr ""
 msgid "Direct message to %s sent"
 msgstr ""
 
-#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:242 lib/channel.php:170
 msgid "Ajax Error"
 msgstr ""
 
@@ -1907,7 +1907,7 @@ msgstr ""
 msgid "New notice"
 msgstr ""
 
-#: actions/newnotice.php:206
+#: actions/newnotice.php:208
 msgid "Notice posted"
 msgstr ""
 
@@ -1982,8 +1982,8 @@ msgstr "Σύνδεση"
 msgid "Only "
 msgstr ""
 
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996
-#: lib/api.php:1024 lib/api.php:1134
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011
+#: lib/api.php:1039 lib/api.php:1149
 msgid "Not a supported data format."
 msgstr ""
 
@@ -3508,6 +3508,26 @@ msgstr ""
 msgid "SMS"
 msgstr ""
 
+#: actions/tag.php:68
+#, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr ""
+
+#: actions/tag.php:86
+#, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr ""
+
+#: actions/tag.php:92
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "Ροή φίλων του/της %s"
+
+#: actions/tag.php:98
+#, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr ""
+
 #: actions/tagother.php:33
 msgid "Not logged in"
 msgstr ""
@@ -3554,26 +3574,6 @@ msgstr "Αδύνατη η αποθήκευση του προφίλ."
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 
-#: actions/tag.php:68
-#, php-format
-msgid "Notices tagged with %s, page %d"
-msgstr ""
-
-#: actions/tag.php:86
-#, php-format
-msgid "Notice feed for tag %s (RSS 1.0)"
-msgstr ""
-
-#: actions/tag.php:92
-#, fuzzy, php-format
-msgid "Notice feed for tag %s (RSS 2.0)"
-msgstr "Ροή φίλων του/της %s"
-
-#: actions/tag.php:98
-#, php-format
-msgid "Notice feed for tag %s (Atom)"
-msgstr ""
-
 #: actions/tagrss.php:35
 msgid "No such tag."
 msgstr ""
@@ -3870,38 +3870,43 @@ msgstr ""
 msgid "DB error inserting hashtag: %s"
 msgstr "Σφάλμα στη βάση δεδομένων κατά την εισαγωγή hashtag: %s"
 
-#: classes/Notice.php:179
+#: classes/Notice.php:188
 msgid "Problem saving notice. Too long."
 msgstr ""
 
-#: classes/Notice.php:183
+#: classes/Notice.php:192
 msgid "Problem saving notice. Unknown user."
 msgstr ""
 
-#: classes/Notice.php:188
+#: classes/Notice.php:197
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
-#: classes/Notice.php:194
+#: classes/Notice.php:203
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
 msgstr ""
 
-#: classes/Notice.php:200
+#: classes/Notice.php:209
 msgid "You are banned from posting notices on this site."
 msgstr ""
 
-#: classes/Notice.php:265 classes/Notice.php:290
+#: classes/Notice.php:274 classes/Notice.php:299
 msgid "Problem saving notice."
 msgstr ""
 
-#: classes/Notice.php:1124
+#: classes/Notice.php:1115
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Σφάλμα βάσης δεδομένων κατά την εισαγωγή απάντησης: %s"
 
+#: classes/User.php:347
+#, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr ""
+
 #: classes/User_group.php:380
 #, fuzzy
 msgid "Could not create group."
@@ -3912,11 +3917,6 @@ msgstr "Αδύνατη η αποθήκευση του προφίλ."
 msgid "Could not set group membership."
 msgstr "Αδύνατη η αποθήκευση των νέων πληροφοριών του προφίλ"
 
-#: classes/User.php:347
-#, php-format
-msgid "Welcome to %1$s, @%2$s!"
-msgstr ""
-
 #: lib/accountsettingsaction.php:108
 msgid "Change your profile settings"
 msgstr "Αλλάξτε τις ρυθμίσεις του προφίλ σας"
@@ -4224,7 +4224,7 @@ msgstr ""
 msgid "Notice with that id does not exist"
 msgstr ""
 
-#: lib/command.php:168 lib/command.php:416 lib/command.php:471
+#: lib/command.php:168 lib/command.php:416 lib/command.php:472
 msgid "User has no last notice"
 msgstr ""
 
@@ -4271,101 +4271,101 @@ msgstr ""
 msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr ""
 
-#: lib/command.php:439
+#: lib/command.php:440
 #, php-format
 msgid "Reply to %s sent"
 msgstr ""
 
-#: lib/command.php:441
+#: lib/command.php:442
 msgid "Error saving notice."
 msgstr ""
 
-#: lib/command.php:495
+#: lib/command.php:496
 msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: lib/command.php:502
+#: lib/command.php:503
 #, php-format
 msgid "Subscribed to %s"
 msgstr ""
 
-#: lib/command.php:523
+#: lib/command.php:524
 msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: lib/command.php:530
+#: lib/command.php:531
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr ""
 
-#: lib/command.php:548 lib/command.php:571
+#: lib/command.php:549 lib/command.php:572
 msgid "Command not yet implemented."
 msgstr ""
 
-#: lib/command.php:551
+#: lib/command.php:552
 msgid "Notification off."
 msgstr ""
 
-#: lib/command.php:553
+#: lib/command.php:554
 msgid "Can't turn off notification."
 msgstr ""
 
-#: lib/command.php:574
+#: lib/command.php:575
 msgid "Notification on."
 msgstr ""
 
-#: lib/command.php:576
+#: lib/command.php:577
 msgid "Can't turn on notification."
 msgstr ""
 
-#: lib/command.php:588
+#: lib/command.php:590
 msgid "Login command is disabled"
 msgstr ""
 
-#: lib/command.php:602
+#: lib/command.php:604
 #, fuzzy, php-format
 msgid "Could not create login token for %s"
 msgstr "Αδύνατη η αποθήκευση του προφίλ."
 
-#: lib/command.php:607
+#: lib/command.php:609
 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:623
+#: lib/command.php:625
 #, fuzzy
 msgid "You are not subscribed to anyone."
 msgstr "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους."
 
-#: lib/command.php:625
+#: lib/command.php:627
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους."
 msgstr[1] "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους."
 
-#: lib/command.php:645
+#: lib/command.php:647
 #, fuzzy
 msgid "No one is subscribed to you."
 msgstr "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους."
 
-#: lib/command.php:647
+#: lib/command.php:649
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους."
 msgstr[1] "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους."
 
-#: lib/command.php:667
+#: lib/command.php:669
 #, fuzzy
 msgid "You are not a member of any groups."
 msgstr "Ομάδες με τα περισσότερα μέλη"
 
-#: lib/command.php:669
+#: lib/command.php:671
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Ομάδες με τα περισσότερα μέλη"
 msgstr[1] "Ομάδες με τα περισσότερα μέλη"
 
-#: lib/command.php:683
+#: lib/command.php:685
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -4463,10 +4463,6 @@ msgstr ""
 msgid "Favor"
 msgstr ""
 
-#: lib/feedlist.php:64
-msgid "Export data"
-msgstr ""
-
 #: lib/feed.php:85
 msgid "RSS 1.0"
 msgstr ""
@@ -4483,6 +4479,10 @@ msgstr ""
 msgid "FOAF"
 msgstr ""
 
+#: lib/feedlist.php:64
+msgid "Export data"
+msgstr ""
+
 #: lib/galleryaction.php:121
 msgid "Filter tags"
 msgstr ""
@@ -4645,21 +4645,6 @@ msgstr "Σύνδεση με όνομα χρήστη και κωδικό"
 msgid "Sign up for a new account"
 msgstr "Δημιουργία νέου λογαριασμού"
 
-#: lib/mailbox.php:89
-msgid "Only the user can read their own mailboxes."
-msgstr ""
-
-#: lib/mailbox.php:139
-msgid ""
-"You have no private messages. You can send private message to engage other "
-"users in conversation. People can send you messages for your eyes only."
-msgstr ""
-
-#: lib/mailbox.php:227 lib/noticelist.php:452
-#, fuzzy
-msgid "from"
-msgstr "από"
-
 #: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Επιβεβαίωση διεύθυνσης email"
@@ -4838,6 +4823,21 @@ msgid ""
 "\n"
 msgstr ""
 
+#: lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
+msgstr ""
+
+#: lib/mailbox.php:139
+msgid ""
+"You have no private messages. You can send private message to engage other "
+"users in conversation. People can send you messages for your eyes only."
+msgstr ""
+
+#: lib/mailbox.php:227 lib/noticelist.php:452
+#, fuzzy
+msgid "from"
+msgstr "από"
+
 #: lib/mediafile.php:98 lib/mediafile.php:123
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
@@ -4899,7 +4899,7 @@ msgstr ""
 msgid "To"
 msgstr ""
 
-#: lib/messageform.php:161 lib/noticeform.php:185
+#: lib/messageform.php:159 lib/noticeform.php:183
 #, fuzzy
 msgid "Available characters"
 msgstr "6 ή περισσότεροι χαρακτήρες"
@@ -4913,11 +4913,11 @@ msgstr ""
 msgid "What's up, %s?"
 msgstr ""
 
-#: lib/noticeform.php:192
+#: lib/noticeform.php:190
 msgid "Attach"
 msgstr ""
 
-#: lib/noticeform.php:196
+#: lib/noticeform.php:194
 msgid "Attach a file"
 msgstr ""
 
@@ -4987,11 +4987,11 @@ msgstr ""
 msgid "Duplicate notice"
 msgstr "Διαγραφή μηνύματος"
 
-#: lib/oauthstore.php:467 lib/subs.php:48
+#: lib/oauthstore.php:466 lib/subs.php:48
 msgid "You have been banned from subscribing."
 msgstr ""
 
-#: lib/oauthstore.php:492
+#: lib/oauthstore.php:491
 msgid "Couldn't insert new subscription."
 msgstr "Απέτυχε η εισαγωγή νέας συνδρομής."
 
@@ -5153,21 +5153,6 @@ msgstr ""
 msgid "Groups %s is a member of"
 msgstr ""
 
-#: lib/subscriberspeopleselftagcloudsection.php:48
-#: lib/subscriptionspeopleselftagcloudsection.php:48
-msgid "People Tagcloud as self-tagged"
-msgstr ""
-
-#: lib/subscriberspeopletagcloudsection.php:48
-#: lib/subscriptionspeopletagcloudsection.php:48
-msgid "People Tagcloud as tagged"
-msgstr ""
-
-#: lib/subscriptionlist.php:126
-#, fuzzy
-msgid "(none)"
-msgstr "(κανένα)"
-
 #: lib/subs.php:52
 msgid "Already subscribed!"
 msgstr ""
@@ -5198,6 +5183,21 @@ msgstr "Απέτυχε η διαγραφή συνδρομής."
 msgid "Couldn't delete subscription."
 msgstr "Απέτυχε η διαγραφή συνδρομής."
 
+#: lib/subscriberspeopleselftagcloudsection.php:48
+#: lib/subscriptionspeopleselftagcloudsection.php:48
+msgid "People Tagcloud as self-tagged"
+msgstr ""
+
+#: lib/subscriberspeopletagcloudsection.php:48
+#: lib/subscriptionspeopletagcloudsection.php:48
+msgid "People Tagcloud as tagged"
+msgstr ""
+
+#: lib/subscriptionlist.php:126
+#, fuzzy
+msgid "(none)"
+msgstr "(κανένα)"
+
 #: lib/tagcloudsection.php:56
 msgid "None"
 msgstr "Κανένα"
diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po
index 782a5ec0ac..13172f52a7 100644
--- a/locale/en_GB/LC_MESSAGES/statusnet.po
+++ b/locale/en_GB/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 21:25+0000\n"
-"PO-Revision-Date: 2009-12-07 21:26:19+0000\n"
+"POT-Creation-Date: 2009-12-12 17:09+0000\n"
+"PO-Revision-Date: 2009-12-12 17:09:29+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(r59800); Translate extension (2009-12-06)\n"
+"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: en-gb\n"
 "X-Message-Group: out-statusnet\n"
@@ -27,11 +27,11 @@ msgstr "No such page"
 
 #: actions/all.php:74 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofile.php:105
 #: actions/apiaccountupdateprofilebackgroundimage.php:116
-#: actions/apiaccountupdateprofileimage.php:105
-#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
-#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
-#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
+#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90
 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
@@ -44,7 +44,7 @@ msgstr "No such page"
 #: actions/repliesrss.php:38 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38
 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
-#: lib/command.php:364 lib/command.php:411 lib/command.php:466
+#: lib/command.php:364 lib/command.php:411 lib/command.php:467
 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
 #: lib/subs.php:34 lib/subs.php:116
 msgid "No such user."
@@ -56,7 +56,7 @@ msgid "%s and friends, page %d"
 msgstr "%s and friends, page %d"
 
 #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
-#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100
+#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s and friends"
@@ -107,24 +107,24 @@ msgstr ""
 msgid "You and friends"
 msgstr "You and friends"
 
-#: actions/allrss.php:119 actions/apitimelinefriends.php:121
+#: actions/allrss.php:119 actions/apitimelinefriends.php:122
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Updates from %1$s and friends on %2$s!"
 
 #: actions/apiaccountratelimitstatus.php:70
 #: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofile.php:97
 #: actions/apiaccountupdateprofilebackgroundimage.php:94
 #: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apiaccountupdateprofile.php:97
 msgid "API method not found."
 msgstr "API method not found."
 
 #: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofile.php:89
 #: actions/apiaccountupdateprofilebackgroundimage.php:86
 #: actions/apiaccountupdateprofilecolors.php:110
-#: actions/apiaccountupdateprofileimage.php:84
-#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
+#: actions/apiaccountupdateprofileimage.php:84 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
@@ -144,9 +144,23 @@ msgstr ""
 msgid "Could not update user."
 msgstr "Couldn't update user."
 
+#: actions/apiaccountupdateprofile.php:112
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+msgid "User has no profile."
+msgstr "User has no profile."
+
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "Couldn't save profile."
+
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257
 #: actions/designadminpanel.php:122 actions/newnotice.php:94
 #: lib/designsettings.php:283
 #, php-format
@@ -167,20 +181,6 @@ msgstr "Unable to save your design settings!"
 msgid "Could not update your design."
 msgstr "Could not update your design."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
-#: actions/apiaccountupdateprofileimage.php:130
-#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
-#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
-msgid "User has no profile."
-msgstr "User has no profile."
-
-#: actions/apiaccountupdateprofile.php:147
-#, fuzzy
-msgid "Could not save profile."
-msgstr "Couldn't save profile."
-
 #: actions/apiblockcreate.php:105
 #, fuzzy
 msgid "You cannot block yourself!"
@@ -194,23 +194,6 @@ msgstr "Block user failed."
 msgid "Unblock user failed."
 msgstr "Unblock user failed."
 
-#: actions/apidirectmessagenew.php:126
-msgid "No message text!"
-msgstr "No message text!"
-
-#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
-#, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr "That's too long. Max message size is %d chars."
-
-#: actions/apidirectmessagenew.php:146
-msgid "Recipient user not found."
-msgstr "Recipient user not found."
-
-#: actions/apidirectmessagenew.php:150
-msgid "Can't send direct messages to users who aren't your friend."
-msgstr "Can't send direct messages to users who aren't your friend."
-
 #: actions/apidirectmessage.php:89
 #, php-format
 msgid "Direct messages from %s"
@@ -236,18 +219,35 @@ msgstr "All the direct messages sent to %s"
 #: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
-#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
-#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149
-#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
-#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156
+#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151
+#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141
+#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
 msgid "API method not found!"
 msgstr "API method not found!"
 
+#: actions/apidirectmessagenew.php:126
+msgid "No message text!"
+msgstr "No message text!"
+
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "That's too long. Max message size is %d chars."
+
+#: actions/apidirectmessagenew.php:146
+msgid "Recipient user not found."
+msgstr "Recipient user not found."
+
+#: actions/apidirectmessagenew.php:150
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr "Can't send direct messages to users who aren't your friend."
+
 #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
 #: actions/apistatusesdestroy.php:113
 msgid "No status found with that ID."
@@ -391,16 +391,6 @@ msgstr "You are not a member of that group."
 msgid "Could not remove user %s to group %s."
 msgstr "Could not remove user %s to group %s"
 
-#: actions/apigrouplistall.php:90 actions/usergroups.php:62
-#, php-format
-msgid "%s groups"
-msgstr "%s groups"
-
-#: actions/apigrouplistall.php:94
-#, php-format
-msgid "groups on %s"
-msgstr "groups on %s"
-
 #: actions/apigrouplist.php:95
 #, php-format
 msgid "%s's groups"
@@ -411,6 +401,16 @@ msgstr "%s's groups"
 msgid "Groups %s is a member of on %s."
 msgstr "Groups %s is a member of on %s."
 
+#: actions/apigrouplistall.php:90 actions/usergroups.php:62
+#, php-format
+msgid "%s groups"
+msgstr "%s groups"
+
+#: actions/apigrouplistall.php:94
+#, php-format
+msgid "groups on %s"
+msgstr "groups on %s"
+
 #: actions/apistatusesdestroy.php:107
 msgid "This method requires a POST or DELETE."
 msgstr "This method requires a POST or DELETE."
@@ -447,54 +447,54 @@ msgstr ""
 msgid "Unsupported format."
 msgstr "Unsupported image file format."
 
-#: actions/apitimelinefavorites.php:107
+#: actions/apitimelinefavorites.php:108
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr "%s / Favourites from %s"
 
-#: actions/apitimelinefavorites.php:119
+#: actions/apitimelinefavorites.php:120
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr "%s updates favourited by %s / %s."
 
-#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117
+#: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118
 #: actions/grouprss.php:131 actions/userrss.php:90
 #, php-format
 msgid "%s timeline"
 msgstr "%s timeline"
 
-#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125
+#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
 #: actions/userrss.php:92
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Updates from %1$s on %2$s!"
 
-#: actions/apitimelinementions.php:116
+#: actions/apitimelinementions.php:117
 #, php-format
 msgid "%1$s / Updates mentioning %2$s"
 msgstr "%1$s / Updates mentioning %2$s"
 
-#: actions/apitimelinementions.php:126
+#: actions/apitimelinementions.php:127
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s updates that reply to updates from %2$s / %3$s."
 
-#: actions/apitimelinepublic.php:106 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s public timeline"
 
-#: actions/apitimelinepublic.php:110 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s updates from everyone!"
 
-#: actions/apitimelinetag.php:101 actions/tag.php:66
+#: actions/apitimelinetag.php:102 actions/tag.php:66
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Notices tagged with %s"
 
-#: actions/apitimelinetag.php:107 actions/tagrss.php:64
+#: actions/apitimelinetag.php:108 actions/tagrss.php:64
 #, php-format
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Updates tagged with %1$s on %2$s!"
@@ -530,45 +530,45 @@ msgstr "Avatar"
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr "You can upload your personal avatar. The maximum file size is %s."
 
-#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:185
 #: actions/grouplogo.php:178 actions/remotesubscribe.php:191
 #: actions/userauthorization.php:72 actions/userrss.php:103
 msgid "User without matching profile"
 msgstr "User without matching profile"
 
-#: actions/avatarsettings.php:119 actions/avatarsettings.php:194
+#: actions/avatarsettings.php:119 actions/avatarsettings.php:197
 #: actions/grouplogo.php:251
 msgid "Avatar settings"
 msgstr "Avatar settings"
 
-#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/avatarsettings.php:127 actions/avatarsettings.php:205
 #: actions/grouplogo.php:199 actions/grouplogo.php:259
 msgid "Original"
 msgstr "Original"
 
-#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/avatarsettings.php:142 actions/avatarsettings.php:217
 #: actions/grouplogo.php:210 actions/grouplogo.php:271
 msgid "Preview"
 msgstr "Preview"
 
-#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
+#: actions/avatarsettings.php:149 lib/deleteuserform.php:66
 #: lib/noticelist.php:550
 msgid "Delete"
 msgstr "Delete"
 
-#: actions/avatarsettings.php:165 actions/grouplogo.php:233
+#: actions/avatarsettings.php:166 actions/grouplogo.php:233
 msgid "Upload"
 msgstr "Upload"
 
-#: actions/avatarsettings.php:228 actions/grouplogo.php:286
+#: actions/avatarsettings.php:231 actions/grouplogo.php:286
 msgid "Crop"
 msgstr "Crop"
 
-#: actions/avatarsettings.php:265 actions/disfavor.php:74
+#: actions/avatarsettings.php:268 actions/disfavor.php:74
 #: actions/emailsettings.php:238 actions/favor.php:75
 #: actions/groupblock.php:66 actions/grouplogo.php:309
 #: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -579,34 +579,73 @@ msgstr "Crop"
 msgid "There was a problem with your session token. Try again, please."
 msgstr "There was a problem with your session token. Try again, please."
 
-#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
+#: actions/avatarsettings.php:281 actions/designadminpanel.php:103
 #: actions/emailsettings.php:256 actions/grouplogo.php:319
 #: actions/imsettings.php:220 actions/recoverpassword.php:44
 #: actions/smssettings.php:248 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "Unexpected form submission."
 
-#: actions/avatarsettings.php:322
+#: actions/avatarsettings.php:328
 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:337 actions/grouplogo.php:377
+#: actions/avatarsettings.php:343 actions/grouplogo.php:377
 msgid "Lost our file data."
 msgstr "Lost our file data."
 
-#: actions/avatarsettings.php:360
+#: actions/avatarsettings.php:366
 msgid "Avatar updated."
 msgstr "Avatar updated."
 
-#: actions/avatarsettings.php:363
+#: actions/avatarsettings.php:369
 msgid "Failed updating avatar."
 msgstr "Failed updating avatar."
 
-#: actions/avatarsettings.php:387
+#: actions/avatarsettings.php:393
 #, fuzzy
 msgid "Avatar deleted."
 msgstr "Avatar updated."
 
+#: actions/block.php:69
+#, fuzzy
+msgid "You already blocked that user."
+msgstr "You have already blocked this user."
+
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
+msgid "Block user"
+msgstr "Block user"
+
+#: actions/block.php:130
+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/block.php:143 actions/deletenotice.php:145
+#: actions/deleteuser.php:147 actions/groupblock.php:178
+msgid "No"
+msgstr "No"
+
+#: actions/block.php:143 actions/deleteuser.php:147
+#, fuzzy
+msgid "Do not block this user"
+msgstr "Unblock this user"
+
+#: actions/block.php:144 actions/deletenotice.php:146
+#: actions/deleteuser.php:148 actions/groupblock.php:179
+msgid "Yes"
+msgstr "Yes"
+
+#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
+msgid "Block this user"
+msgstr "Block this user"
+
+#: actions/block.php:162
+msgid "Failed to save block information."
+msgstr "Failed to save block information."
+
 #: actions/blockedfromgroup.php:73 actions/editgroup.php:84
 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
 #: actions/groupmembers.php:76 actions/grouprss.php:91
@@ -647,45 +686,6 @@ msgstr "Unblock"
 msgid "Unblock this user"
 msgstr "Unblock this user"
 
-#: actions/block.php:69
-#, fuzzy
-msgid "You already blocked that user."
-msgstr "You have already blocked this user."
-
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
-msgid "Block user"
-msgstr "Block user"
-
-#: actions/block.php:130
-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/block.php:143 actions/deletenotice.php:145
-#: actions/deleteuser.php:147 actions/groupblock.php:178
-msgid "No"
-msgstr "No"
-
-#: actions/block.php:143 actions/deleteuser.php:147
-#, fuzzy
-msgid "Do not block this user"
-msgstr "Unblock this user"
-
-#: actions/block.php:144 actions/deletenotice.php:146
-#: actions/deleteuser.php:148 actions/groupblock.php:179
-msgid "Yes"
-msgstr "Yes"
-
-#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
-msgid "Block this user"
-msgstr "Block this user"
-
-#: actions/block.php:162
-msgid "Failed to save block information."
-msgstr "Failed to save block information."
-
 #: actions/bookmarklet.php:50
 msgid "Post to "
 msgstr "Post to "
@@ -1160,6 +1160,14 @@ msgstr "Incoming e-mail address removed."
 msgid "New incoming email address added."
 msgstr "New incoming e-mail address added."
 
+#: actions/favor.php:79
+msgid "This notice is already a favorite!"
+msgstr "This notice is already a favourite!"
+
+#: actions/favor.php:92 lib/disfavorform.php:140
+msgid "Disfavor favorite"
+msgstr "Disfavor favourite"
+
 #: actions/favorited.php:65 lib/popularnoticesection.php:88
 #: lib/publicgroupnav.php:93
 msgid "Popular notices"
@@ -1207,14 +1215,6 @@ msgstr "%s's favourite notices"
 msgid "Updates favored by %1$s on %2$s!"
 msgstr "Updates favoured by %1$s on %2$s!"
 
-#: actions/favor.php:79
-msgid "This notice is already a favorite!"
-msgstr "This notice is already a favourite!"
-
-#: actions/favor.php:92 lib/disfavorform.php:140
-msgid "Disfavor favorite"
-msgstr "Disfavor favourite"
-
 #: actions/featured.php:69 lib/featureduserssection.php:87
 #: lib/publicgroupnav.php:89
 msgid "Featured users"
@@ -1452,6 +1452,30 @@ msgstr ""
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "Updates from %1$s on %2$s!"
 
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+msgid "Groups"
+msgstr "Groups"
+
+#: actions/groups.php:64
+#, php-format
+msgid "Groups, page %d"
+msgstr "Groups, page %d"
+
+#: actions/groups.php:90
+#, php-format
+msgid ""
+"%%%%site.name%%%% groups let you find and talk with people of similar "
+"interests. After you join a group you can send messages to all other members "
+"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
+"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
+"%%%%)"
+msgstr ""
+
+#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
+msgid "Create a new group"
+msgstr "Create a new group"
+
 #: actions/groupsearch.php:52
 #, fuzzy, php-format
 msgid ""
@@ -1485,30 +1509,6 @@ msgid ""
 "action.newgroup%%) yourself!"
 msgstr ""
 
-#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
-msgid "Groups"
-msgstr "Groups"
-
-#: actions/groups.php:64
-#, php-format
-msgid "Groups, page %d"
-msgstr "Groups, page %d"
-
-#: actions/groups.php:90
-#, php-format
-msgid ""
-"%%%%site.name%%%% groups let you find and talk with people of similar "
-"interests. After you join a group you can send messages to all other members "
-"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
-"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
-"%%%%)"
-msgstr ""
-
-#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
-msgid "Create a new group"
-msgstr "Create a new group"
-
 #: actions/groupunblock.php:91
 msgid "Only an admin can unblock group members."
 msgstr ""
@@ -1699,7 +1699,7 @@ msgstr "Personal message"
 msgid "Optionally add a personal message to the invitation."
 msgstr "Optionally add a personal message to the invitation."
 
-#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:222
 msgid "Send"
 msgstr "Send"
 
@@ -1805,57 +1805,57 @@ msgstr "Could not remove user %s to group %s"
 msgid "%s left group %s"
 msgstr "%s left group %s"
 
-#: actions/login.php:82 actions/register.php:137
+#: actions/login.php:83 actions/register.php:137
 msgid "Already logged in."
 msgstr "Already logged in."
 
-#: actions/login.php:113 actions/login.php:123
+#: actions/login.php:114 actions/login.php:124
 #, fuzzy
 msgid "Invalid or expired token."
 msgstr "Invalid notice content"
 
-#: actions/login.php:146
+#: actions/login.php:147
 msgid "Incorrect username or password."
 msgstr "Incorrect username or password."
 
-#: actions/login.php:152
+#: actions/login.php:153
 #, fuzzy
 msgid "Error setting user. You are probably not authorized."
 msgstr "You are not authorised."
 
-#: actions/login.php:207 actions/login.php:260 lib/action.php:458
+#: actions/login.php:208 actions/login.php:261 lib/action.php:458
 #: lib/logingroupnav.php:79
 msgid "Login"
 msgstr "Login"
 
-#: actions/login.php:246
+#: actions/login.php:247
 msgid "Login to site"
 msgstr "Login to site"
 
-#: actions/login.php:249 actions/profilesettings.php:106
+#: actions/login.php:250 actions/profilesettings.php:106
 #: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
 #: lib/groupeditform.php:152 lib/userprofile.php:131
 msgid "Nickname"
 msgstr "Nickname"
 
-#: actions/login.php:252 actions/register.php:428
+#: actions/login.php:253 actions/register.php:428
 #: lib/accountsettingsaction.php:116
 msgid "Password"
 msgstr "Password"
 
-#: actions/login.php:255 actions/register.php:477
+#: actions/login.php:256 actions/register.php:477
 msgid "Remember me"
 msgstr "Remember me"
 
-#: actions/login.php:256 actions/register.php:479
+#: actions/login.php:257 actions/register.php:479
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Automatically login in the future; not for shared computers!"
 
-#: actions/login.php:266
+#: actions/login.php:267
 msgid "Lost or forgotten password?"
 msgstr "Lost or forgotten password?"
 
-#: actions/login.php:285
+#: actions/login.php:286
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -1863,7 +1863,7 @@ msgstr ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 
-#: actions/login.php:289
+#: actions/login.php:290
 #, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -1935,7 +1935,7 @@ msgstr "Message sent"
 msgid "Direct message to %s sent"
 msgstr "Direct message to %s sent"
 
-#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:242 lib/channel.php:170
 msgid "Ajax Error"
 msgstr "Ajax Error"
 
@@ -1943,7 +1943,7 @@ msgstr "Ajax Error"
 msgid "New notice"
 msgstr "New notice"
 
-#: actions/newnotice.php:206
+#: actions/newnotice.php:208
 msgid "Notice posted"
 msgstr "Notice posted"
 
@@ -2021,8 +2021,8 @@ msgstr "Connect"
 msgid "Only "
 msgstr ""
 
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996
-#: lib/api.php:1024 lib/api.php:1134
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011
+#: lib/api.php:1039 lib/api.php:1149
 msgid "Not a supported data format."
 msgstr "Not a supported data format."
 
@@ -3562,6 +3562,26 @@ msgstr "Jabber"
 msgid "SMS"
 msgstr "SMS"
 
+#: actions/tag.php:68
+#, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr "Notices tagged with %s, page %d"
+
+#: actions/tag.php:86
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "Notice feed for %s"
+
+#: actions/tag.php:92
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "Notice feed for %s"
+
+#: actions/tag.php:98
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "Notice feed for %s"
+
 #: actions/tagother.php:33
 msgid "Not logged in"
 msgstr "Not logged in"
@@ -3609,26 +3629,6 @@ msgstr "Could not save tags."
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr "Use this form to add tags to your subscribers or subscriptions."
 
-#: actions/tag.php:68
-#, php-format
-msgid "Notices tagged with %s, page %d"
-msgstr "Notices tagged with %s, page %d"
-
-#: actions/tag.php:86
-#, fuzzy, php-format
-msgid "Notice feed for tag %s (RSS 1.0)"
-msgstr "Notice feed for %s"
-
-#: actions/tag.php:92
-#, fuzzy, php-format
-msgid "Notice feed for tag %s (RSS 2.0)"
-msgstr "Notice feed for %s"
-
-#: actions/tag.php:98
-#, fuzzy, php-format
-msgid "Notice feed for tag %s (Atom)"
-msgstr "Notice feed for %s"
-
 #: actions/tagrss.php:35
 msgid "No such tag."
 msgstr "No such tag."
@@ -3939,22 +3939,22 @@ msgstr "Could not update message with new URI."
 msgid "DB error inserting hashtag: %s"
 msgstr "DB error inserting hashtag: %s"
 
-#: classes/Notice.php:179
+#: classes/Notice.php:188
 #, fuzzy
 msgid "Problem saving notice. Too long."
 msgstr "Problem saving notice."
 
-#: classes/Notice.php:183
+#: classes/Notice.php:192
 msgid "Problem saving notice. Unknown user."
 msgstr "Problem saving notice. Unknown user."
 
-#: classes/Notice.php:188
+#: classes/Notice.php:197
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 
-#: classes/Notice.php:194
+#: classes/Notice.php:203
 #, fuzzy
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
@@ -3962,19 +3962,24 @@ msgid ""
 msgstr ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 
-#: classes/Notice.php:200
+#: classes/Notice.php:209
 msgid "You are banned from posting notices on this site."
 msgstr "You are banned from posting notices on this site."
 
-#: classes/Notice.php:265 classes/Notice.php:290
+#: classes/Notice.php:274 classes/Notice.php:299
 msgid "Problem saving notice."
 msgstr "Problem saving notice."
 
-#: classes/Notice.php:1124
+#: classes/Notice.php:1115
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "DB error inserting reply: %s"
 
+#: classes/User.php:347
+#, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr "Welcome to %1$s, @%2$s!"
+
 #: classes/User_group.php:380
 msgid "Could not create group."
 msgstr "Could not create group."
@@ -3983,11 +3988,6 @@ msgstr "Could not create group."
 msgid "Could not set group membership."
 msgstr "Could not set group membership."
 
-#: classes/User.php:347
-#, php-format
-msgid "Welcome to %1$s, @%2$s!"
-msgstr "Welcome to %1$s, @%2$s!"
-
 #: lib/accountsettingsaction.php:108
 msgid "Change your profile settings"
 msgstr "Change your profile settings"
@@ -4298,7 +4298,7 @@ msgstr ""
 msgid "Notice with that id does not exist"
 msgstr ""
 
-#: lib/command.php:168 lib/command.php:416 lib/command.php:471
+#: lib/command.php:168 lib/command.php:416 lib/command.php:472
 msgid "User has no last notice"
 msgstr "User has no last notice"
 
@@ -4345,101 +4345,101 @@ msgstr "Error sending direct message."
 msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr "Notice too long - maximum is %d characters, you sent %d"
 
-#: lib/command.php:439
+#: lib/command.php:440
 #, php-format
 msgid "Reply to %s sent"
 msgstr "Reply to %s sent"
 
-#: lib/command.php:441
+#: lib/command.php:442
 msgid "Error saving notice."
 msgstr "Error saving notice."
 
-#: lib/command.php:495
+#: lib/command.php:496
 msgid "Specify the name of the user to subscribe to"
 msgstr "Specify the name of the user to subscribe to"
 
-#: lib/command.php:502
+#: lib/command.php:503
 #, php-format
 msgid "Subscribed to %s"
 msgstr "Subscribed to %s"
 
-#: lib/command.php:523
+#: lib/command.php:524
 msgid "Specify the name of the user to unsubscribe from"
 msgstr "Specify the name of the user to unsubscribe from"
 
-#: lib/command.php:530
+#: lib/command.php:531
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr "Unsubscribed from %s"
 
-#: lib/command.php:548 lib/command.php:571
+#: lib/command.php:549 lib/command.php:572
 msgid "Command not yet implemented."
 msgstr "Command not yet implemented."
 
-#: lib/command.php:551
+#: lib/command.php:552
 msgid "Notification off."
 msgstr "Notification off."
 
-#: lib/command.php:553
+#: lib/command.php:554
 msgid "Can't turn off notification."
 msgstr "Can't turn off notification."
 
-#: lib/command.php:574
+#: lib/command.php:575
 msgid "Notification on."
 msgstr "Notification on."
 
-#: lib/command.php:576
+#: lib/command.php:577
 msgid "Can't turn on notification."
 msgstr "Can't turn on notification."
 
-#: lib/command.php:588
+#: lib/command.php:590
 msgid "Login command is disabled"
 msgstr ""
 
-#: lib/command.php:602
+#: lib/command.php:604
 #, fuzzy, php-format
 msgid "Could not create login token for %s"
 msgstr "Could not create aliases"
 
-#: lib/command.php:607
+#: lib/command.php:609
 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:623
+#: lib/command.php:625
 #, fuzzy
 msgid "You are not subscribed to anyone."
 msgstr "You are not subscribed to that profile."
 
-#: lib/command.php:625
+#: lib/command.php:627
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "You are already subscribed to these users:"
 msgstr[1] "You are already subscribed to these users:"
 
-#: lib/command.php:645
+#: lib/command.php:647
 #, fuzzy
 msgid "No one is subscribed to you."
 msgstr "Could not subscribe other to you."
 
-#: lib/command.php:647
+#: lib/command.php:649
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Could not subscribe other to you."
 msgstr[1] "Could not subscribe other to you."
 
-#: lib/command.php:667
+#: lib/command.php:669
 #, fuzzy
 msgid "You are not a member of any groups."
 msgstr "You are not a member of that group."
 
-#: lib/command.php:669
+#: lib/command.php:671
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "You are not a member of that group."
 msgstr[1] "You are not a member of that group."
 
-#: lib/command.php:683
+#: lib/command.php:685
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -4537,10 +4537,6 @@ msgstr "Favour this notice"
 msgid "Favor"
 msgstr "Favour"
 
-#: lib/feedlist.php:64
-msgid "Export data"
-msgstr "Export data"
-
 #: lib/feed.php:85
 msgid "RSS 1.0"
 msgstr ""
@@ -4557,6 +4553,10 @@ msgstr ""
 msgid "FOAF"
 msgstr ""
 
+#: lib/feedlist.php:64
+msgid "Export data"
+msgstr "Export data"
+
 #: lib/galleryaction.php:121
 msgid "Filter tags"
 msgstr "Filter tags"
@@ -4716,21 +4716,6 @@ msgstr "Login with a username and password"
 msgid "Sign up for a new account"
 msgstr "Sign up for a new account"
 
-#: lib/mailbox.php:89
-msgid "Only the user can read their own mailboxes."
-msgstr "Only the user can read their own mailboxes."
-
-#: lib/mailbox.php:139
-msgid ""
-"You have no private messages. You can send private message to engage other "
-"users in conversation. People can send you messages for your eyes only."
-msgstr ""
-
-#: lib/mailbox.php:227 lib/noticelist.php:452
-#, fuzzy
-msgid "from"
-msgstr "from"
-
 #: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "E-mail address confirmation"
@@ -4927,6 +4912,21 @@ msgid ""
 "\n"
 msgstr ""
 
+#: lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
+msgstr "Only the user can read their own mailboxes."
+
+#: lib/mailbox.php:139
+msgid ""
+"You have no private messages. You can send private message to engage other "
+"users in conversation. People can send you messages for your eyes only."
+msgstr ""
+
+#: lib/mailbox.php:227 lib/noticelist.php:452
+#, fuzzy
+msgid "from"
+msgstr "from"
+
 #: lib/mediafile.php:98 lib/mediafile.php:123
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
@@ -4987,7 +4987,7 @@ msgstr "Send a direct notice"
 msgid "To"
 msgstr "To"
 
-#: lib/messageform.php:161 lib/noticeform.php:185
+#: lib/messageform.php:159 lib/noticeform.php:183
 msgid "Available characters"
 msgstr "Available characters"
 
@@ -5000,11 +5000,11 @@ msgstr "Send a notice"
 msgid "What's up, %s?"
 msgstr "What's up, %s?"
 
-#: lib/noticeform.php:192
+#: lib/noticeform.php:190
 msgid "Attach"
 msgstr ""
 
-#: lib/noticeform.php:196
+#: lib/noticeform.php:194
 msgid "Attach a file"
 msgstr ""
 
@@ -5074,11 +5074,11 @@ msgstr "Error inserting remote profile."
 msgid "Duplicate notice"
 msgstr "Duplicate notice"
 
-#: lib/oauthstore.php:467 lib/subs.php:48
+#: lib/oauthstore.php:466 lib/subs.php:48
 msgid "You have been banned from subscribing."
 msgstr "You have been banned from subscribing."
 
-#: lib/oauthstore.php:492
+#: lib/oauthstore.php:491
 msgid "Couldn't insert new subscription."
 msgstr "Couldn't insert new subscription."
 
@@ -5240,20 +5240,6 @@ msgstr "People subscribed to %s"
 msgid "Groups %s is a member of"
 msgstr "Groups %s is a member of"
 
-#: 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/subscriptionlist.php:126
-msgid "(none)"
-msgstr "(none)"
-
 #: lib/subs.php:52
 msgid "Already subscribed!"
 msgstr ""
@@ -5284,6 +5270,20 @@ msgstr "Couldn't delete subscription."
 msgid "Couldn't delete subscription."
 msgstr "Couldn't delete subscription."
 
+#: 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/subscriptionlist.php:126
+msgid "(none)"
+msgstr "(none)"
+
 #: lib/tagcloudsection.php:56
 msgid "None"
 msgstr "None"
diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po
index 871040c9ae..7973b9eef7 100644
--- a/locale/es/LC_MESSAGES/statusnet.po
+++ b/locale/es/LC_MESSAGES/statusnet.po
@@ -11,12 +11,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 21:25+0000\n"
-"PO-Revision-Date: 2009-12-07 21:26:23+0000\n"
+"POT-Creation-Date: 2009-12-12 17:09+0000\n"
+"PO-Revision-Date: 2009-12-12 17:09:33+0000\n"
 "Language-Team: Spanish\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n"
+"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: out-statusnet\n"
@@ -29,11 +29,11 @@ msgstr "No existe tal página"
 
 #: actions/all.php:74 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofile.php:105
 #: actions/apiaccountupdateprofilebackgroundimage.php:116
-#: actions/apiaccountupdateprofileimage.php:105
-#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
-#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
-#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
+#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90
 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
@@ -46,7 +46,7 @@ msgstr "No existe tal página"
 #: actions/repliesrss.php:38 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38
 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
-#: lib/command.php:364 lib/command.php:411 lib/command.php:466
+#: lib/command.php:364 lib/command.php:411 lib/command.php:467
 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
 #: lib/subs.php:34 lib/subs.php:116
 msgid "No such user."
@@ -58,7 +58,7 @@ msgid "%s and friends, page %d"
 msgstr "%s y amigos, página %d"
 
 #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
-#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100
+#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s y amigos"
@@ -109,25 +109,25 @@ msgstr ""
 msgid "You and friends"
 msgstr "Tú y amigos"
 
-#: actions/allrss.php:119 actions/apitimelinefriends.php:121
+#: actions/allrss.php:119 actions/apitimelinefriends.php:122
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "¡Actualizaciones de %1$s y amigos en %2$s!"
 
 #: actions/apiaccountratelimitstatus.php:70
 #: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofile.php:97
 #: actions/apiaccountupdateprofilebackgroundimage.php:94
 #: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apiaccountupdateprofile.php:97
 #, fuzzy
 msgid "API method not found."
 msgstr "¡No se encontró el método de la API!"
 
 #: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofile.php:89
 #: actions/apiaccountupdateprofilebackgroundimage.php:86
 #: actions/apiaccountupdateprofilecolors.php:110
-#: actions/apiaccountupdateprofileimage.php:84
-#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
+#: actions/apiaccountupdateprofileimage.php:84 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
@@ -147,9 +147,23 @@ msgstr ""
 msgid "Could not update user."
 msgstr "No se pudo actualizar el usuario."
 
+#: actions/apiaccountupdateprofile.php:112
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+msgid "User has no profile."
+msgstr "El usuario no tiene un perfil."
+
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "No se pudo guardar el perfil."
+
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257
 #: actions/designadminpanel.php:122 actions/newnotice.php:94
 #: lib/designsettings.php:283
 #, php-format
@@ -174,20 +188,6 @@ msgstr "¡No se pudo guardar tu configuración de Twitter!"
 msgid "Could not update your design."
 msgstr "No se pudo actualizar el usuario."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
-#: actions/apiaccountupdateprofileimage.php:130
-#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
-#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
-msgid "User has no profile."
-msgstr "El usuario no tiene un perfil."
-
-#: actions/apiaccountupdateprofile.php:147
-#, fuzzy
-msgid "Could not save profile."
-msgstr "No se pudo guardar el perfil."
-
 #: actions/apiblockcreate.php:105
 msgid "You cannot block yourself!"
 msgstr "¡No puedes bloquearte a tí mismo!"
@@ -200,23 +200,6 @@ msgstr "Falló bloquear usuario."
 msgid "Unblock user failed."
 msgstr "Falló desbloquear usuario."
 
-#: actions/apidirectmessagenew.php:126
-msgid "No message text!"
-msgstr "¡Sin texto de mensaje!"
-
-#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
-#, fuzzy, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr "Demasiado largo. Máximo 140 caracteres.  "
-
-#: actions/apidirectmessagenew.php:146
-msgid "Recipient user not found."
-msgstr "No se encuentra usuario receptor."
-
-#: actions/apidirectmessagenew.php:150
-msgid "Can't send direct messages to users who aren't your friend."
-msgstr "No se puede enviar mensajes directos a usuarios que no son tu amigo."
-
 #: actions/apidirectmessage.php:89
 #, php-format
 msgid "Direct messages from %s"
@@ -242,18 +225,35 @@ msgstr "Todos los mensajes directos enviados a %s"
 #: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
-#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
-#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149
-#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
-#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156
+#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151
+#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141
+#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
 msgid "API method not found!"
 msgstr "¡No se encontró el método de la API!"
 
+#: actions/apidirectmessagenew.php:126
+msgid "No message text!"
+msgstr "¡Sin texto de mensaje!"
+
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, fuzzy, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "Demasiado largo. Máximo 140 caracteres.  "
+
+#: actions/apidirectmessagenew.php:146
+msgid "Recipient user not found."
+msgstr "No se encuentra usuario receptor."
+
+#: actions/apidirectmessagenew.php:150
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr "No se puede enviar mensajes directos a usuarios que no son tu amigo."
+
 #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
 #: actions/apistatusesdestroy.php:113
 msgid "No status found with that ID."
@@ -399,16 +399,6 @@ msgstr "No eres miembro de este grupo."
 msgid "Could not remove user %s to group %s."
 msgstr "No se pudo eliminar a usuario %s de grupo %s"
 
-#: actions/apigrouplistall.php:90 actions/usergroups.php:62
-#, php-format
-msgid "%s groups"
-msgstr "Grupos %s"
-
-#: actions/apigrouplistall.php:94
-#, php-format
-msgid "groups on %s"
-msgstr "Grupos en %s"
-
 #: actions/apigrouplist.php:95
 #, php-format
 msgid "%s's groups"
@@ -419,6 +409,16 @@ msgstr "Grupos de %s"
 msgid "Groups %s is a member of on %s."
 msgstr "%s es miembro de los grupos"
 
+#: actions/apigrouplistall.php:90 actions/usergroups.php:62
+#, php-format
+msgid "%s groups"
+msgstr "Grupos %s"
+
+#: actions/apigrouplistall.php:94
+#, php-format
+msgid "groups on %s"
+msgstr "Grupos en %s"
+
 #: actions/apistatusesdestroy.php:107
 msgid "This method requires a POST or DELETE."
 msgstr "Este método requiere un PUBLICAR O ELIMINAR"
@@ -454,54 +454,54 @@ msgstr ""
 msgid "Unsupported format."
 msgstr "Formato no soportado."
 
-#: actions/apitimelinefavorites.php:107
+#: actions/apitimelinefavorites.php:108
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr "%s / Favoritos desde %s"
 
-#: actions/apitimelinefavorites.php:119
+#: actions/apitimelinefavorites.php:120
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr "%s actualizaciones favoritas por %s / %s."
 
-#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117
+#: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118
 #: actions/grouprss.php:131 actions/userrss.php:90
 #, php-format
 msgid "%s timeline"
 msgstr "línea temporal de %s"
 
-#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125
+#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
 #: actions/userrss.php:92
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "¡Actualizaciones de %1$s en %2$s!"
 
-#: actions/apitimelinementions.php:116
+#: actions/apitimelinementions.php:117
 #, fuzzy, php-format
 msgid "%1$s / Updates mentioning %2$s"
 msgstr "%1$s / Actualizaciones en respuesta a %2$s"
 
-#: actions/apitimelinementions.php:126
+#: actions/apitimelinementions.php:127
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "actualizaciones de %1$s en respuesta a las de %2$s / %3$s"
 
-#: actions/apitimelinepublic.php:106 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "línea temporal pública de %s"
 
-#: actions/apitimelinepublic.php:110 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "¡Actualizaciones de todos en %s!"
 
-#: actions/apitimelinetag.php:101 actions/tag.php:66
+#: actions/apitimelinetag.php:102 actions/tag.php:66
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Avisos marcados con %s"
 
-#: actions/apitimelinetag.php:107 actions/tagrss.php:64
+#: actions/apitimelinetag.php:108 actions/tagrss.php:64
 #, fuzzy, php-format
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr "¡Actualizaciones de %1$s en %2$s!"
@@ -538,45 +538,45 @@ msgstr "Avatar"
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr "Puedes cargar tu avatar personal."
 
-#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:185
 #: actions/grouplogo.php:178 actions/remotesubscribe.php:191
 #: actions/userauthorization.php:72 actions/userrss.php:103
 msgid "User without matching profile"
 msgstr "Usuario sin perfil equivalente"
 
-#: actions/avatarsettings.php:119 actions/avatarsettings.php:194
+#: actions/avatarsettings.php:119 actions/avatarsettings.php:197
 #: actions/grouplogo.php:251
 msgid "Avatar settings"
 msgstr "Configuración de Avatar"
 
-#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/avatarsettings.php:127 actions/avatarsettings.php:205
 #: actions/grouplogo.php:199 actions/grouplogo.php:259
 msgid "Original"
 msgstr "Original"
 
-#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/avatarsettings.php:142 actions/avatarsettings.php:217
 #: actions/grouplogo.php:210 actions/grouplogo.php:271
 msgid "Preview"
 msgstr "Vista previa"
 
-#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
+#: actions/avatarsettings.php:149 lib/deleteuserform.php:66
 #: lib/noticelist.php:550
 msgid "Delete"
 msgstr "Borrar"
 
-#: actions/avatarsettings.php:165 actions/grouplogo.php:233
+#: actions/avatarsettings.php:166 actions/grouplogo.php:233
 msgid "Upload"
 msgstr "Cargar"
 
-#: actions/avatarsettings.php:228 actions/grouplogo.php:286
+#: actions/avatarsettings.php:231 actions/grouplogo.php:286
 msgid "Crop"
 msgstr "Cortar"
 
-#: actions/avatarsettings.php:265 actions/disfavor.php:74
+#: actions/avatarsettings.php:268 actions/disfavor.php:74
 #: actions/emailsettings.php:238 actions/favor.php:75
 #: actions/groupblock.php:66 actions/grouplogo.php:309
 #: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -588,34 +588,73 @@ msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 "Hubo un problema con tu clave de sesión.  Por favor, intenta nuevamente."
 
-#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
+#: actions/avatarsettings.php:281 actions/designadminpanel.php:103
 #: actions/emailsettings.php:256 actions/grouplogo.php:319
 #: actions/imsettings.php:220 actions/recoverpassword.php:44
 #: actions/smssettings.php:248 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "Envío de formulario inesperado."
 
-#: actions/avatarsettings.php:322
+#: actions/avatarsettings.php:328
 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:337 actions/grouplogo.php:377
+#: actions/avatarsettings.php:343 actions/grouplogo.php:377
 msgid "Lost our file data."
 msgstr "Se perdió nuestros datos de archivo."
 
-#: actions/avatarsettings.php:360
+#: actions/avatarsettings.php:366
 msgid "Avatar updated."
 msgstr "Avatar actualizado"
 
-#: actions/avatarsettings.php:363
+#: actions/avatarsettings.php:369
 msgid "Failed updating avatar."
 msgstr "Error al actualizar avatar."
 
-#: actions/avatarsettings.php:387
+#: actions/avatarsettings.php:393
 #, fuzzy
 msgid "Avatar deleted."
 msgstr "Avatar actualizado"
 
+#: actions/block.php:69
+#, fuzzy
+msgid "You already blocked that user."
+msgstr "Ya has bloqueado este usuario."
+
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
+msgid "Block user"
+msgstr "Bloquear usuario."
+
+#: actions/block.php:130
+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/block.php:143 actions/deletenotice.php:145
+#: actions/deleteuser.php:147 actions/groupblock.php:178
+msgid "No"
+msgstr "No"
+
+#: actions/block.php:143 actions/deleteuser.php:147
+#, fuzzy
+msgid "Do not block this user"
+msgstr "Desbloquear este usuario"
+
+#: actions/block.php:144 actions/deletenotice.php:146
+#: actions/deleteuser.php:148 actions/groupblock.php:179
+msgid "Yes"
+msgstr "Sí"
+
+#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
+msgid "Block this user"
+msgstr "Bloquear este usuario."
+
+#: actions/block.php:162
+msgid "Failed to save block information."
+msgstr "No se guardó información de bloqueo."
+
 #: actions/blockedfromgroup.php:73 actions/editgroup.php:84
 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
 #: actions/groupmembers.php:76 actions/grouprss.php:91
@@ -659,45 +698,6 @@ msgstr "Desbloquear"
 msgid "Unblock this user"
 msgstr "Desbloquear este usuario"
 
-#: actions/block.php:69
-#, fuzzy
-msgid "You already blocked that user."
-msgstr "Ya has bloqueado este usuario."
-
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
-msgid "Block user"
-msgstr "Bloquear usuario."
-
-#: actions/block.php:130
-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/block.php:143 actions/deletenotice.php:145
-#: actions/deleteuser.php:147 actions/groupblock.php:178
-msgid "No"
-msgstr "No"
-
-#: actions/block.php:143 actions/deleteuser.php:147
-#, fuzzy
-msgid "Do not block this user"
-msgstr "Desbloquear este usuario"
-
-#: actions/block.php:144 actions/deletenotice.php:146
-#: actions/deleteuser.php:148 actions/groupblock.php:179
-msgid "Yes"
-msgstr "Sí"
-
-#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
-msgid "Block this user"
-msgstr "Bloquear este usuario."
-
-#: actions/block.php:162
-msgid "Failed to save block information."
-msgstr "No se guardó información de bloqueo."
-
 #: actions/bookmarklet.php:50
 msgid "Post to "
 msgstr "Mensaje a "
@@ -1044,7 +1044,7 @@ msgstr "Correo Electrónico"
 
 #: actions/emailsettings.php:123
 msgid "Email address, like \"UserName@example.org\""
-msgstr "Correo electrónico, como \"NombredeUsuario@ejemplo.org\""
+msgstr "Correo electrónico, como \"NombredeUsuario@example.org\""
 
 #: actions/emailsettings.php:126 actions/imsettings.php:133
 #: actions/smssettings.php:145
@@ -1183,6 +1183,14 @@ msgstr "Dirección de correo entrante removida."
 msgid "New incoming email address added."
 msgstr "Nueva dirección de correo entrante agregada."
 
+#: actions/favor.php:79
+msgid "This notice is already a favorite!"
+msgstr "¡Este aviso ya está en favoritos!"
+
+#: actions/favor.php:92 lib/disfavorform.php:140
+msgid "Disfavor favorite"
+msgstr "Sacar favorito"
+
 #: actions/favorited.php:65 lib/popularnoticesection.php:88
 #: lib/publicgroupnav.php:93
 #, fuzzy
@@ -1227,14 +1235,6 @@ msgstr "Avisos favoritos de %s"
 msgid "Updates favored by %1$s on %2$s!"
 msgstr "¡Actualizaciones de %1$s en %2$s!"
 
-#: actions/favor.php:79
-msgid "This notice is already a favorite!"
-msgstr "¡Este aviso ya está en favoritos!"
-
-#: actions/favor.php:92 lib/disfavorform.php:140
-msgid "Disfavor favorite"
-msgstr "Sacar favorito"
-
 #: actions/featured.php:69 lib/featureduserssection.php:87
 #: lib/publicgroupnav.php:89
 msgid "Featured users"
@@ -1484,6 +1484,30 @@ msgstr ""
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "¡Actualizaciones de %1$s en %2$s!"
 
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+msgid "Groups"
+msgstr "Grupos"
+
+#: actions/groups.php:64
+#, php-format
+msgid "Groups, page %d"
+msgstr "Grupos, página %d"
+
+#: actions/groups.php:90
+#, php-format
+msgid ""
+"%%%%site.name%%%% groups let you find and talk with people of similar "
+"interests. After you join a group you can send messages to all other members "
+"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
+"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
+"%%%%)"
+msgstr ""
+
+#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
+msgid "Create a new group"
+msgstr "Crear un nuevo grupo"
+
 #: actions/groupsearch.php:52
 #, fuzzy, php-format
 msgid ""
@@ -1518,30 +1542,6 @@ msgid ""
 "action.newgroup%%) yourself!"
 msgstr ""
 
-#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
-msgid "Groups"
-msgstr "Grupos"
-
-#: actions/groups.php:64
-#, php-format
-msgid "Groups, page %d"
-msgstr "Grupos, página %d"
-
-#: actions/groups.php:90
-#, php-format
-msgid ""
-"%%%%site.name%%%% groups let you find and talk with people of similar "
-"interests. After you join a group you can send messages to all other members "
-"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
-"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
-"%%%%)"
-msgstr ""
-
-#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
-msgid "Create a new group"
-msgstr "Crear un nuevo grupo"
-
 #: actions/groupunblock.php:91
 msgid "Only an admin can unblock group members."
 msgstr ""
@@ -1739,7 +1739,7 @@ msgstr "Mensaje Personal"
 msgid "Optionally add a personal message to the invitation."
 msgstr "Opcionalmente añada un mensaje personalizado a su invitación."
 
-#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:222
 msgid "Send"
 msgstr "Enviar"
 
@@ -1848,59 +1848,59 @@ msgstr "No se pudo eliminar a usuario %s de grupo %s"
 msgid "%s left group %s"
 msgstr "%s dejó grupo %s"
 
-#: actions/login.php:82 actions/register.php:137
+#: actions/login.php:83 actions/register.php:137
 msgid "Already logged in."
 msgstr "Ya estás conectado."
 
-#: actions/login.php:113 actions/login.php:123
+#: actions/login.php:114 actions/login.php:124
 #, fuzzy
 msgid "Invalid or expired token."
 msgstr "El contenido del aviso es inválido"
 
-#: actions/login.php:146
+#: actions/login.php:147
 msgid "Incorrect username or password."
 msgstr "Nombre de usuario o contraseña incorrectos."
 
-#: actions/login.php:152
+#: actions/login.php:153
 #, fuzzy
 msgid "Error setting user. You are probably not authorized."
 msgstr "No autorizado."
 
-#: actions/login.php:207 actions/login.php:260 lib/action.php:458
+#: actions/login.php:208 actions/login.php:261 lib/action.php:458
 #: lib/logingroupnav.php:79
 msgid "Login"
 msgstr "Inicio de sesión"
 
-#: actions/login.php:246
+#: actions/login.php:247
 msgid "Login to site"
 msgstr "Ingresar a sitio"
 
-#: actions/login.php:249 actions/profilesettings.php:106
+#: actions/login.php:250 actions/profilesettings.php:106
 #: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
 #: lib/groupeditform.php:152 lib/userprofile.php:131
 msgid "Nickname"
 msgstr "Apodo"
 
-#: actions/login.php:252 actions/register.php:428
+#: actions/login.php:253 actions/register.php:428
 #: lib/accountsettingsaction.php:116
 msgid "Password"
 msgstr "Contraseña"
 
-#: actions/login.php:255 actions/register.php:477
+#: actions/login.php:256 actions/register.php:477
 msgid "Remember me"
 msgstr "Recordarme"
 
-#: actions/login.php:256 actions/register.php:479
+#: actions/login.php:257 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 "
 "compartidos! "
 
-#: actions/login.php:266
+#: actions/login.php:267
 msgid "Lost or forgotten password?"
 msgstr "¿Contraseña olvidada o perdida?"
 
-#: actions/login.php:285
+#: actions/login.php:286
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -1908,7 +1908,7 @@ msgstr ""
 "Por razones de seguridad, por favor vuelve a escribir tu nombre de usuario y "
 "contraseña antes de cambiar tu configuración."
 
-#: actions/login.php:289
+#: actions/login.php:290
 #, fuzzy, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -1981,7 +1981,7 @@ msgstr "Mensaje"
 msgid "Direct message to %s sent"
 msgstr "Se envió mensaje directo a %s"
 
-#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:242 lib/channel.php:170
 msgid "Ajax Error"
 msgstr "Error de Ajax"
 
@@ -1989,7 +1989,7 @@ msgstr "Error de Ajax"
 msgid "New notice"
 msgstr "Nuevo aviso"
 
-#: actions/newnotice.php:206
+#: actions/newnotice.php:208
 #, fuzzy
 msgid "Notice posted"
 msgstr "Aviso publicado"
@@ -2070,8 +2070,8 @@ msgstr "Conectarse"
 msgid "Only "
 msgstr ""
 
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996
-#: lib/api.php:1024 lib/api.php:1134
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011
+#: lib/api.php:1039 lib/api.php:1149
 msgid "Not a supported data format."
 msgstr "No es un formato de dato soportado"
 
@@ -3652,6 +3652,26 @@ msgstr "Jabber "
 msgid "SMS"
 msgstr "SMS"
 
+#: actions/tag.php:68
+#, fuzzy, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr "Avisos marcados con %s, página %d"
+
+#: actions/tag.php:86
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "Feed de avisos de %s"
+
+#: actions/tag.php:92
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "Feed de avisos de %s"
+
+#: actions/tag.php:98
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "Feed de avisos de %s"
+
 #: actions/tagother.php:33
 #, fuzzy
 msgid "Not logged in"
@@ -3703,26 +3723,6 @@ msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 "Usar este formulario para agregar tags a tus suscriptores o suscripciones."
 
-#: actions/tag.php:68
-#, fuzzy, php-format
-msgid "Notices tagged with %s, page %d"
-msgstr "Avisos marcados con %s, página %d"
-
-#: actions/tag.php:86
-#, fuzzy, php-format
-msgid "Notice feed for tag %s (RSS 1.0)"
-msgstr "Feed de avisos de %s"
-
-#: actions/tag.php:92
-#, fuzzy, php-format
-msgid "Notice feed for tag %s (RSS 2.0)"
-msgstr "Feed de avisos de %s"
-
-#: actions/tag.php:98
-#, fuzzy, php-format
-msgid "Notice feed for tag %s (Atom)"
-msgstr "Feed de avisos de %s"
-
 #: actions/tagrss.php:35
 msgid "No such tag."
 msgstr "No existe ese tag."
@@ -4040,24 +4040,24 @@ msgstr "No se pudo actualizar mensaje con nuevo URI."
 msgid "DB error inserting hashtag: %s"
 msgstr "Error de la BD al insertar la etiqueta clave: %s"
 
-#: classes/Notice.php:179
+#: classes/Notice.php:188
 #, fuzzy
 msgid "Problem saving notice. Too long."
 msgstr "Hubo un problema al guardar el aviso."
 
-#: classes/Notice.php:183
+#: classes/Notice.php:192
 #, fuzzy
 msgid "Problem saving notice. Unknown user."
 msgstr "Hubo problemas al guardar el aviso.  Usuario desconocido."
 
-#: classes/Notice.php:188
+#: classes/Notice.php:197
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 "Demasiados avisos demasiado rápido; para y publicar nuevamente en unos "
 "minutos."
 
-#: classes/Notice.php:194
+#: classes/Notice.php:203
 #, fuzzy
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
@@ -4066,19 +4066,24 @@ msgstr ""
 "Demasiados avisos demasiado rápido; para y publicar nuevamente en unos "
 "minutos."
 
-#: classes/Notice.php:200
+#: classes/Notice.php:209
 msgid "You are banned from posting notices on this site."
 msgstr "Tienes prohibido publicar avisos en este sitio."
 
-#: classes/Notice.php:265 classes/Notice.php:290
+#: classes/Notice.php:274 classes/Notice.php:299
 msgid "Problem saving notice."
 msgstr "Hubo un problema al guardar el aviso."
 
-#: classes/Notice.php:1124
+#: classes/Notice.php:1115
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Error de BD al insertar respuesta: %s"
 
+#: classes/User.php:347
+#, fuzzy, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr "Mensaje a %1$s en %2$s"
+
 #: classes/User_group.php:380
 #, fuzzy
 msgid "Could not create group."
@@ -4089,11 +4094,6 @@ msgstr "No se pudo crear grupo."
 msgid "Could not set group membership."
 msgstr "No se pudo configurar miembros de grupo."
 
-#: classes/User.php:347
-#, fuzzy, php-format
-msgid "Welcome to %1$s, @%2$s!"
-msgstr "Mensaje a %1$s en %2$s"
-
 #: lib/accountsettingsaction.php:108
 msgid "Change your profile settings"
 msgstr "Cambia tus opciones de perfil"
@@ -4411,7 +4411,7 @@ msgstr ""
 msgid "Notice with that id does not exist"
 msgstr ""
 
-#: lib/command.php:168 lib/command.php:416 lib/command.php:471
+#: lib/command.php:168 lib/command.php:416 lib/command.php:472
 msgid "User has no last notice"
 msgstr "Usuario no tiene último aviso"
 
@@ -4458,102 +4458,102 @@ msgstr "Error al enviar mensaje directo."
 msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr "Mensaje muy largo - máximo 140 caracteres, enviaste %d"
 
-#: lib/command.php:439
+#: lib/command.php:440
 #, fuzzy, php-format
 msgid "Reply to %s sent"
 msgstr "Responder este aviso."
 
-#: lib/command.php:441
+#: lib/command.php:442
 #, fuzzy
 msgid "Error saving notice."
 msgstr "Hubo un problema al guardar el aviso."
 
-#: lib/command.php:495
+#: lib/command.php:496
 msgid "Specify the name of the user to subscribe to"
 msgstr "Especificar el nombre del usuario a suscribir"
 
-#: lib/command.php:502
+#: lib/command.php:503
 #, php-format
 msgid "Subscribed to %s"
 msgstr "Suscrito a %s"
 
-#: lib/command.php:523
+#: lib/command.php:524
 msgid "Specify the name of the user to unsubscribe from"
 msgstr "Especificar el nombre del usuario para desuscribirse de"
 
-#: lib/command.php:530
+#: lib/command.php:531
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr "Desuscrito de %s"
 
-#: lib/command.php:548 lib/command.php:571
+#: lib/command.php:549 lib/command.php:572
 msgid "Command not yet implemented."
 msgstr "Todavía no se implementa comando."
 
-#: lib/command.php:551
+#: lib/command.php:552
 msgid "Notification off."
 msgstr "Notificación no activa."
 
-#: lib/command.php:553
+#: lib/command.php:554
 msgid "Can't turn off notification."
 msgstr "No se puede desactivar notificación."
 
-#: lib/command.php:574
+#: lib/command.php:575
 msgid "Notification on."
 msgstr "Notificación activada."
 
-#: lib/command.php:576
+#: lib/command.php:577
 msgid "Can't turn on notification."
 msgstr "No se puede activar notificación."
 
-#: lib/command.php:588
+#: lib/command.php:590
 msgid "Login command is disabled"
 msgstr ""
 
-#: lib/command.php:602
+#: lib/command.php:604
 #, fuzzy, php-format
 msgid "Could not create login token for %s"
 msgstr "No se pudo crear favorito."
 
-#: lib/command.php:607
+#: lib/command.php:609
 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:623
+#: lib/command.php:625
 #, fuzzy
 msgid "You are not subscribed to anyone."
 msgstr "No estás suscrito a ese perfil."
 
-#: lib/command.php:625
+#: lib/command.php:627
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Ya estás suscrito a estos usuarios:"
 msgstr[1] "Ya estás suscrito a estos usuarios:"
 
-#: lib/command.php:645
+#: lib/command.php:647
 #, fuzzy
 msgid "No one is subscribed to you."
 msgstr "No se pudo suscribir otro a ti."
 
-#: lib/command.php:647
+#: lib/command.php:649
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "No se pudo suscribir otro a ti."
 msgstr[1] "No se pudo suscribir otro a ti."
 
-#: lib/command.php:667
+#: lib/command.php:669
 #, fuzzy
 msgid "You are not a member of any groups."
 msgstr "No eres miembro de ese grupo"
 
-#: lib/command.php:669
+#: lib/command.php:671
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "No eres miembro de este grupo."
 msgstr[1] "No eres miembro de este grupo."
 
-#: lib/command.php:683
+#: lib/command.php:685
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -4651,10 +4651,6 @@ msgstr "Aceptar este aviso"
 msgid "Favor"
 msgstr "Aceptar"
 
-#: lib/feedlist.php:64
-msgid "Export data"
-msgstr "Exportar datos"
-
 #: lib/feed.php:85
 msgid "RSS 1.0"
 msgstr ""
@@ -4671,6 +4667,10 @@ msgstr ""
 msgid "FOAF"
 msgstr ""
 
+#: lib/feedlist.php:64
+msgid "Export data"
+msgstr "Exportar datos"
+
 #: lib/galleryaction.php:121
 msgid "Filter tags"
 msgstr "Filtrar tags"
@@ -4836,20 +4836,6 @@ msgstr "Ingresar con un nombre de usuario y contraseña."
 msgid "Sign up for a new account"
 msgstr "Registrar una cuenta nueva "
 
-#: lib/mailbox.php:89
-msgid "Only the user can read their own mailboxes."
-msgstr "Sólo el usuario puede leer sus bandejas de correo."
-
-#: lib/mailbox.php:139
-msgid ""
-"You have no private messages. You can send private message to engage other "
-"users in conversation. People can send you messages for your eyes only."
-msgstr ""
-
-#: lib/mailbox.php:227 lib/noticelist.php:452
-msgid "from"
-msgstr "desde"
-
 #: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Confirmación de correo electrónico"
@@ -5042,6 +5028,20 @@ msgid ""
 "\n"
 msgstr ""
 
+#: lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
+msgstr "Sólo el usuario puede leer sus bandejas de correo."
+
+#: lib/mailbox.php:139
+msgid ""
+"You have no private messages. You can send private message to engage other "
+"users in conversation. People can send you messages for your eyes only."
+msgstr ""
+
+#: lib/mailbox.php:227 lib/noticelist.php:452
+msgid "from"
+msgstr "desde"
+
 #: lib/mediafile.php:98 lib/mediafile.php:123
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
@@ -5102,7 +5102,7 @@ msgstr "Enviar un aviso directo"
 msgid "To"
 msgstr "Para"
 
-#: lib/messageform.php:161 lib/noticeform.php:185
+#: lib/messageform.php:159 lib/noticeform.php:183
 #, fuzzy
 msgid "Available characters"
 msgstr "Caracteres disponibles"
@@ -5117,11 +5117,11 @@ msgstr "Enviar un aviso"
 msgid "What's up, %s?"
 msgstr "¿Qué tal, %s?"
 
-#: lib/noticeform.php:192
+#: lib/noticeform.php:190
 msgid "Attach"
 msgstr ""
 
-#: lib/noticeform.php:196
+#: lib/noticeform.php:194
 msgid "Attach a file"
 msgstr ""
 
@@ -5191,12 +5191,12 @@ msgstr "Error al insertar perfil remoto"
 msgid "Duplicate notice"
 msgstr "Duplicar aviso"
 
-#: lib/oauthstore.php:467 lib/subs.php:48
+#: lib/oauthstore.php:466 lib/subs.php:48
 #, fuzzy
 msgid "You have been banned from subscribing."
 msgstr "Ese usuario te ha bloqueado la suscripción."
 
-#: lib/oauthstore.php:492
+#: lib/oauthstore.php:491
 msgid "Couldn't insert new subscription."
 msgstr "No se pudo insertar una nueva suscripción."
 
@@ -5363,20 +5363,6 @@ msgstr "Personas suscritas a %s"
 msgid "Groups %s is a member of"
 msgstr "%s es miembro de los grupos"
 
-#: 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/subscriptionlist.php:126
-msgid "(none)"
-msgstr "(ninguno)"
-
 #: lib/subs.php:52
 msgid "Already subscribed!"
 msgstr ""
@@ -5407,6 +5393,20 @@ msgstr "No se pudo eliminar la suscripción."
 msgid "Couldn't delete subscription."
 msgstr "No se pudo eliminar la suscripción."
 
+#: 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/subscriptionlist.php:126
+msgid "(none)"
+msgstr "(ninguno)"
+
 #: lib/tagcloudsection.php:56
 msgid "None"
 msgstr "Ninguno"
diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po
index c1b9febfe2..4a49508576 100644
--- a/locale/fi/LC_MESSAGES/statusnet.po
+++ b/locale/fi/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 21:25+0000\n"
-"PO-Revision-Date: 2009-12-07 21:26:26+0000\n"
+"POT-Creation-Date: 2009-12-12 17:09+0000\n"
+"PO-Revision-Date: 2009-12-12 17:09:38+0000\n"
 "Language-Team: Finnish\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n"
+"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fi\n"
 "X-Message-Group: out-statusnet\n"
@@ -27,11 +27,11 @@ msgstr "Sivua ei ole."
 
 #: actions/all.php:74 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofile.php:105
 #: actions/apiaccountupdateprofilebackgroundimage.php:116
-#: actions/apiaccountupdateprofileimage.php:105
-#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
-#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
-#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
+#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90
 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
@@ -44,7 +44,7 @@ msgstr "Sivua ei ole."
 #: actions/repliesrss.php:38 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38
 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
-#: lib/command.php:364 lib/command.php:411 lib/command.php:466
+#: lib/command.php:364 lib/command.php:411 lib/command.php:467
 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
 #: lib/subs.php:34 lib/subs.php:116
 msgid "No such user."
@@ -56,7 +56,7 @@ msgid "%s and friends, page %d"
 msgstr "%s ja kaverit, sivu %d"
 
 #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
-#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100
+#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s ja kaverit"
@@ -111,25 +111,25 @@ msgstr ""
 msgid "You and friends"
 msgstr "Sinä ja kaverit"
 
-#: actions/allrss.php:119 actions/apitimelinefriends.php:121
+#: actions/allrss.php:119 actions/apitimelinefriends.php:122
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Käyttäjän %1$s ja kavereiden päivitykset palvelussa %2$s!"
 
 #: actions/apiaccountratelimitstatus.php:70
 #: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofile.php:97
 #: actions/apiaccountupdateprofilebackgroundimage.php:94
 #: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apiaccountupdateprofile.php:97
 #, fuzzy
 msgid "API method not found."
 msgstr "API-metodia ei löytynyt!"
 
 #: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofile.php:89
 #: actions/apiaccountupdateprofilebackgroundimage.php:86
 #: actions/apiaccountupdateprofilecolors.php:110
-#: actions/apiaccountupdateprofileimage.php:84
-#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
+#: actions/apiaccountupdateprofileimage.php:84 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
@@ -149,9 +149,23 @@ msgstr ""
 msgid "Could not update user."
 msgstr "Ei voitu päivittää käyttäjää."
 
+#: actions/apiaccountupdateprofile.php:112
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+msgid "User has no profile."
+msgstr "Käyttäjällä ei ole profiilia."
+
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "Ei voitu tallentaa profiilia."
+
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257
 #: actions/designadminpanel.php:122 actions/newnotice.php:94
 #: lib/designsettings.php:283
 #, php-format
@@ -174,20 +188,6 @@ msgstr "Twitter-asetuksia ei voitu tallentaa!"
 msgid "Could not update your design."
 msgstr "Ei voitu päivittää käyttäjää."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
-#: actions/apiaccountupdateprofileimage.php:130
-#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
-#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
-msgid "User has no profile."
-msgstr "Käyttäjällä ei ole profiilia."
-
-#: actions/apiaccountupdateprofile.php:147
-#, fuzzy
-msgid "Could not save profile."
-msgstr "Ei voitu tallentaa profiilia."
-
 #: actions/apiblockcreate.php:105
 #, fuzzy
 msgid "You cannot block yourself!"
@@ -201,24 +201,6 @@ msgstr "Käyttäjän esto epäonnistui."
 msgid "Unblock user failed."
 msgstr "Käyttäjän eston poisto epäonnistui."
 
-#: actions/apidirectmessagenew.php:126
-msgid "No message text!"
-msgstr "Viestissä ei ole tekstiä!"
-
-#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
-#, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr "Liian pitkä päivitys. Maksimikoko päivitykselle on %d merkkiä."
-
-#: actions/apidirectmessagenew.php:146
-msgid "Recipient user not found."
-msgstr "Vastaanottajaa ei löytynyt."
-
-#: actions/apidirectmessagenew.php:150
-msgid "Can't send direct messages to users who aren't your friend."
-msgstr ""
-"Et voi lähettää suoraa viestiä käyttäjälle, jonka kanssa et ole vielä kaveri."
-
 #: actions/apidirectmessage.php:89
 #, php-format
 msgid "Direct messages from %s"
@@ -244,18 +226,36 @@ msgstr "Kaikki suorat viestit käyttäjälle %s"
 #: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
-#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
-#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149
-#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
-#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156
+#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151
+#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141
+#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
 msgid "API method not found!"
 msgstr "API-metodia ei löytynyt!"
 
+#: actions/apidirectmessagenew.php:126
+msgid "No message text!"
+msgstr "Viestissä ei ole tekstiä!"
+
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "Liian pitkä päivitys. Maksimikoko päivitykselle on %d merkkiä."
+
+#: actions/apidirectmessagenew.php:146
+msgid "Recipient user not found."
+msgstr "Vastaanottajaa ei löytynyt."
+
+#: actions/apidirectmessagenew.php:150
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr ""
+"Et voi lähettää suoraa viestiä käyttäjälle, jonka kanssa et ole vielä kaveri."
+
 #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
 #: actions/apistatusesdestroy.php:113
 msgid "No status found with that ID."
@@ -402,16 +402,6 @@ msgstr "Sinä et kuulu tähän ryhmään."
 msgid "Could not remove user %s to group %s."
 msgstr "Ei voitu poistaa käyttäjää %s ryhmästä %s"
 
-#: actions/apigrouplistall.php:90 actions/usergroups.php:62
-#, php-format
-msgid "%s groups"
-msgstr "Käyttäjän %s ryhmät"
-
-#: actions/apigrouplistall.php:94
-#, fuzzy, php-format
-msgid "groups on %s"
-msgstr "Ryhmän toiminnot"
-
 #: actions/apigrouplist.php:95
 #, php-format
 msgid "%s's groups"
@@ -422,6 +412,16 @@ msgstr "Käyttäjän %s ryhmät"
 msgid "Groups %s is a member of on %s."
 msgstr "Ryhmät, joiden jäsen %s on"
 
+#: actions/apigrouplistall.php:90 actions/usergroups.php:62
+#, php-format
+msgid "%s groups"
+msgstr "Käyttäjän %s ryhmät"
+
+#: actions/apigrouplistall.php:94
+#, fuzzy, php-format
+msgid "groups on %s"
+msgstr "Ryhmän toiminnot"
+
 #: actions/apistatusesdestroy.php:107
 msgid "This method requires a POST or DELETE."
 msgstr "Tämä metodi edellyttää joko POST tai DELETE sanoman."
@@ -457,55 +457,55 @@ msgstr "Maksimikoko päivitykselle on %d merkkiä, mukaan lukien URL-osoite."
 msgid "Unsupported format."
 msgstr "Formaattia ei ole tuettu."
 
-#: actions/apitimelinefavorites.php:107
+#: actions/apitimelinefavorites.php:108
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr "%s / Käyttäjän %s suosikit"
 
-#: actions/apitimelinefavorites.php:119
+#: actions/apitimelinefavorites.php:120
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr " Palvelun %s päivitykset, jotka %s / %s on merkinnyt suosikikseen."
 
-#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117
+#: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118
 #: actions/grouprss.php:131 actions/userrss.php:90
 #, php-format
 msgid "%s timeline"
 msgstr "%s aikajana"
 
-#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125
+#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
 #: actions/userrss.php:92
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Käyttäjän %1$s päivitykset palvelussa %2$s!"
 
-#: actions/apitimelinementions.php:116
+#: actions/apitimelinementions.php:117
 #, fuzzy, php-format
 msgid "%1$s / Updates mentioning %2$s"
 msgstr "%1$s / Vastaukset päivitykseen %2$s"
 
-#: actions/apitimelinementions.php:126
+#: actions/apitimelinementions.php:127
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr ""
 "%1$s -päivitykset, jotka on vastauksia käyttäjän %2$s / %3$s päivityksiin."
 
-#: actions/apitimelinepublic.php:106 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s julkinen aikajana"
 
-#: actions/apitimelinepublic.php:110 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s päivitykset kaikilta!"
 
-#: actions/apitimelinetag.php:101 actions/tag.php:66
+#: actions/apitimelinetag.php:102 actions/tag.php:66
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Päivitykset joilla on tagi %s"
 
-#: actions/apitimelinetag.php:107 actions/tagrss.php:64
+#: actions/apitimelinetag.php:108 actions/tagrss.php:64
 #, fuzzy, php-format
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Käyttäjän %1$s päivitykset palvelussa %2$s!"
@@ -540,45 +540,45 @@ msgstr "Kuva"
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr "Voit ladata oman profiilikuvasi. Maksimikoko on %s."
 
-#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:185
 #: actions/grouplogo.php:178 actions/remotesubscribe.php:191
 #: actions/userauthorization.php:72 actions/userrss.php:103
 msgid "User without matching profile"
 msgstr "Käyttäjälle ei löydy profiilia"
 
-#: actions/avatarsettings.php:119 actions/avatarsettings.php:194
+#: actions/avatarsettings.php:119 actions/avatarsettings.php:197
 #: actions/grouplogo.php:251
 msgid "Avatar settings"
 msgstr "Profiilikuva-asetukset"
 
-#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/avatarsettings.php:127 actions/avatarsettings.php:205
 #: actions/grouplogo.php:199 actions/grouplogo.php:259
 msgid "Original"
 msgstr "Alkuperäinen"
 
-#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/avatarsettings.php:142 actions/avatarsettings.php:217
 #: actions/grouplogo.php:210 actions/grouplogo.php:271
 msgid "Preview"
 msgstr "Esikatselu"
 
-#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
+#: actions/avatarsettings.php:149 lib/deleteuserform.php:66
 #: lib/noticelist.php:550
 msgid "Delete"
 msgstr "Poista"
 
-#: actions/avatarsettings.php:165 actions/grouplogo.php:233
+#: actions/avatarsettings.php:166 actions/grouplogo.php:233
 msgid "Upload"
 msgstr "Lataa"
 
-#: actions/avatarsettings.php:228 actions/grouplogo.php:286
+#: actions/avatarsettings.php:231 actions/grouplogo.php:286
 msgid "Crop"
 msgstr "Rajaa"
 
-#: actions/avatarsettings.php:265 actions/disfavor.php:74
+#: actions/avatarsettings.php:268 actions/disfavor.php:74
 #: actions/emailsettings.php:238 actions/favor.php:75
 #: actions/groupblock.php:66 actions/grouplogo.php:309
 #: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -591,33 +591,71 @@ msgstr ""
 "Istuntosi avaimen kanssa oli ongelmia. Olisitko ystävällinen ja kokeilisit "
 "uudelleen."
 
-#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
+#: actions/avatarsettings.php:281 actions/designadminpanel.php:103
 #: actions/emailsettings.php:256 actions/grouplogo.php:319
 #: actions/imsettings.php:220 actions/recoverpassword.php:44
 #: actions/smssettings.php:248 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "Odottamaton lomakkeen lähetys."
 
-#: actions/avatarsettings.php:322
+#: actions/avatarsettings.php:328
 msgid "Pick a square area of the image to be your avatar"
 msgstr "Valitse neliön muotoinen alue kuvasta profiilikuvaksi"
 
-#: actions/avatarsettings.php:337 actions/grouplogo.php:377
+#: actions/avatarsettings.php:343 actions/grouplogo.php:377
 msgid "Lost our file data."
 msgstr "Tiedoston data hävisi."
 
-#: actions/avatarsettings.php:360
+#: actions/avatarsettings.php:366
 msgid "Avatar updated."
 msgstr "Kuva päivitetty."
 
-#: actions/avatarsettings.php:363
+#: actions/avatarsettings.php:369
 msgid "Failed updating avatar."
 msgstr "Profiilikuvan päivittäminen epäonnistui."
 
-#: actions/avatarsettings.php:387
+#: actions/avatarsettings.php:393
 msgid "Avatar deleted."
 msgstr "Kuva poistettu."
 
+#: actions/block.php:69
+#, fuzzy
+msgid "You already blocked that user."
+msgstr "Sinä olet jo estänyt tämän käyttäjän."
+
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
+msgid "Block user"
+msgstr "Estä käyttäjä"
+
+#: actions/block.php:130
+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/block.php:143 actions/deletenotice.php:145
+#: actions/deleteuser.php:147 actions/groupblock.php:178
+msgid "No"
+msgstr "Ei"
+
+#: actions/block.php:143 actions/deleteuser.php:147
+msgid "Do not block this user"
+msgstr "Älä estä tätä käyttäjää"
+
+#: actions/block.php:144 actions/deletenotice.php:146
+#: actions/deleteuser.php:148 actions/groupblock.php:179
+msgid "Yes"
+msgstr "Kyllä"
+
+#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
+msgid "Block this user"
+msgstr "Estä tämä käyttäjä"
+
+#: actions/block.php:162
+msgid "Failed to save block information."
+msgstr "Käyttäjän estotiedon tallennus epäonnistui."
+
 #: actions/blockedfromgroup.php:73 actions/editgroup.php:84
 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
 #: actions/groupmembers.php:76 actions/grouprss.php:91
@@ -658,44 +696,6 @@ msgstr "Poista esto"
 msgid "Unblock this user"
 msgstr "Poista esto tältä käyttäjältä"
 
-#: actions/block.php:69
-#, fuzzy
-msgid "You already blocked that user."
-msgstr "Sinä olet jo estänyt tämän käyttäjän."
-
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
-msgid "Block user"
-msgstr "Estä käyttäjä"
-
-#: actions/block.php:130
-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/block.php:143 actions/deletenotice.php:145
-#: actions/deleteuser.php:147 actions/groupblock.php:178
-msgid "No"
-msgstr "Ei"
-
-#: actions/block.php:143 actions/deleteuser.php:147
-msgid "Do not block this user"
-msgstr "Älä estä tätä käyttäjää"
-
-#: actions/block.php:144 actions/deletenotice.php:146
-#: actions/deleteuser.php:148 actions/groupblock.php:179
-msgid "Yes"
-msgstr "Kyllä"
-
-#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
-msgid "Block this user"
-msgstr "Estä tämä käyttäjä"
-
-#: actions/block.php:162
-msgid "Failed to save block information."
-msgstr "Käyttäjän estotiedon tallennus epäonnistui."
-
 #: actions/bookmarklet.php:50
 #, fuzzy
 msgid "Post to "
@@ -1175,6 +1175,14 @@ msgstr "Saapuvan sähköpostin osoite poistettu."
 msgid "New incoming email address added."
 msgstr "Uusi saapuvan sähköpostin osoite lisätty."
 
+#: actions/favor.php:79
+msgid "This notice is already a favorite!"
+msgstr "Tämä päivitys on jo suosikki!"
+
+#: actions/favor.php:92 lib/disfavorform.php:140
+msgid "Disfavor favorite"
+msgstr "Poista suosikeista"
+
 #: actions/favorited.php:65 lib/popularnoticesection.php:88
 #: lib/publicgroupnav.php:93
 msgid "Popular notices"
@@ -1217,14 +1225,6 @@ msgstr "Käyttäjän %s suosikkipäivitykset"
 msgid "Updates favored by %1$s on %2$s!"
 msgstr "Käyttäjän %1$s suosikit palvelussa %2$s!"
 
-#: actions/favor.php:79
-msgid "This notice is already a favorite!"
-msgstr "Tämä päivitys on jo suosikki!"
-
-#: actions/favor.php:92 lib/disfavorform.php:140
-msgid "Disfavor favorite"
-msgstr "Poista suosikeista"
-
 #: actions/featured.php:69 lib/featureduserssection.php:87
 #: lib/publicgroupnav.php:89
 msgid "Featured users"
@@ -1454,6 +1454,30 @@ msgstr "Tee tästä käyttäjästä ylläpitäjä"
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "Ryhmän  %1$s käyttäjien päivitykset palvelussa %2$s!"
 
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+msgid "Groups"
+msgstr "Ryhmät"
+
+#: actions/groups.php:64
+#, php-format
+msgid "Groups, page %d"
+msgstr "Ryhmät, sivu %d"
+
+#: actions/groups.php:90
+#, php-format
+msgid ""
+"%%%%site.name%%%% groups let you find and talk with people of similar "
+"interests. After you join a group you can send messages to all other members "
+"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
+"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
+"%%%%)"
+msgstr ""
+
+#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
+msgid "Create a new group"
+msgstr "Luo uusi ryhmä"
+
 #: actions/groupsearch.php:52
 #, fuzzy, php-format
 msgid ""
@@ -1487,30 +1511,6 @@ msgid ""
 "action.newgroup%%) yourself!"
 msgstr ""
 
-#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
-msgid "Groups"
-msgstr "Ryhmät"
-
-#: actions/groups.php:64
-#, php-format
-msgid "Groups, page %d"
-msgstr "Ryhmät, sivu %d"
-
-#: actions/groups.php:90
-#, php-format
-msgid ""
-"%%%%site.name%%%% groups let you find and talk with people of similar "
-"interests. After you join a group you can send messages to all other members "
-"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
-"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
-"%%%%)"
-msgstr ""
-
-#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
-msgid "Create a new group"
-msgstr "Luo uusi ryhmä"
-
 #: actions/groupunblock.php:91
 msgid "Only an admin can unblock group members."
 msgstr "Vain ylläpitäjä voi poistaa eston ryhmän jäseniltä."
@@ -1708,7 +1708,7 @@ msgstr "Henkilökohtainen viesti"
 msgid "Optionally add a personal message to the invitation."
 msgstr "Voit myös lisätä oman viestisi kutsuun"
 
-#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:222
 msgid "Send"
 msgstr "Lähetä"
 
@@ -1813,59 +1813,59 @@ msgstr "Ei voitu poistaa käyttäjää %s ryhmästä %s"
 msgid "%s left group %s"
 msgstr "%s erosi ryhmästä %s"
 
-#: actions/login.php:82 actions/register.php:137
+#: actions/login.php:83 actions/register.php:137
 msgid "Already logged in."
 msgstr "Olet jo kirjautunut sisään."
 
-#: actions/login.php:113 actions/login.php:123
+#: actions/login.php:114 actions/login.php:124
 #, fuzzy
 msgid "Invalid or expired token."
 msgstr "Päivityksen sisältö ei kelpaa"
 
-#: actions/login.php:146
+#: actions/login.php:147
 msgid "Incorrect username or password."
 msgstr "Väärä käyttäjätunnus tai salasana"
 
-#: actions/login.php:152
+#: actions/login.php:153
 #, fuzzy
 msgid "Error setting user. You are probably not authorized."
 msgstr "Sinulla ei ole valtuutusta tähän."
 
-#: actions/login.php:207 actions/login.php:260 lib/action.php:458
+#: actions/login.php:208 actions/login.php:261 lib/action.php:458
 #: lib/logingroupnav.php:79
 msgid "Login"
 msgstr "Kirjaudu sisään"
 
-#: actions/login.php:246
+#: actions/login.php:247
 msgid "Login to site"
 msgstr "Kirjaudu sisään"
 
-#: actions/login.php:249 actions/profilesettings.php:106
+#: actions/login.php:250 actions/profilesettings.php:106
 #: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
 #: lib/groupeditform.php:152 lib/userprofile.php:131
 msgid "Nickname"
 msgstr "Tunnus"
 
-#: actions/login.php:252 actions/register.php:428
+#: actions/login.php:253 actions/register.php:428
 #: lib/accountsettingsaction.php:116
 msgid "Password"
 msgstr "Salasana"
 
-#: actions/login.php:255 actions/register.php:477
+#: actions/login.php:256 actions/register.php:477
 msgid "Remember me"
 msgstr "Muista minut"
 
-#: actions/login.php:256 actions/register.php:479
+#: actions/login.php:257 actions/register.php:479
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Kirjaudu sisään automaattisesti tulevaisuudessa; ei tietokoneille joilla "
 "useampi käyttäjä!"
 
-#: actions/login.php:266
+#: actions/login.php:267
 msgid "Lost or forgotten password?"
 msgstr "Oletko hukannut tai unohtanut salasanasi?"
 
-#: actions/login.php:285
+#: actions/login.php:286
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -1873,7 +1873,7 @@ msgstr ""
 "Syötä turvallisuussyistä käyttäjätunnuksesi ja salasanasi uudelleen ennen "
 "asetuksiesi muuttamista."
 
-#: actions/login.php:289
+#: actions/login.php:290
 #, fuzzy, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -1945,7 +1945,7 @@ msgstr "Viesti lähetetty"
 msgid "Direct message to %s sent"
 msgstr "Suora viesti käyttäjälle %s lähetetty"
 
-#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:242 lib/channel.php:170
 msgid "Ajax Error"
 msgstr "Ajax-virhe"
 
@@ -1953,7 +1953,7 @@ msgstr "Ajax-virhe"
 msgid "New notice"
 msgstr "Uusi päivitys"
 
-#: actions/newnotice.php:206
+#: actions/newnotice.php:208
 msgid "Notice posted"
 msgstr "Päivitys lähetetty"
 
@@ -2034,8 +2034,8 @@ msgstr "Yhdistä"
 msgid "Only "
 msgstr "Vain "
 
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996
-#: lib/api.php:1024 lib/api.php:1134
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011
+#: lib/api.php:1039 lib/api.php:1149
 msgid "Not a supported data format."
 msgstr "Tuo ei ole tuettu tietomuoto."
 
@@ -3599,6 +3599,26 @@ msgstr "Jabber"
 msgid "SMS"
 msgstr "SMS"
 
+#: actions/tag.php:68
+#, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr "Päivitykset joissa on tagi %s, sivu %d"
+
+#: actions/tag.php:86
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "Päivityksien syöte käyttäjälle %s"
+
+#: actions/tag.php:92
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "Päivityksien syöte käyttäjälle %s"
+
+#: actions/tag.php:98
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "Päivityksien syöte käyttäjälle %s"
+
 #: actions/tagother.php:33
 msgid "Not logged in"
 msgstr "Et ole kirjautunut sisään"
@@ -3649,26 +3669,6 @@ msgstr ""
 "Käytä tätä lomaketta lisätäksesi tageja tilaajillesi ja käyttäjille jotka "
 "tilaavat päivityksiäsi."
 
-#: actions/tag.php:68
-#, php-format
-msgid "Notices tagged with %s, page %d"
-msgstr "Päivitykset joissa on tagi %s, sivu %d"
-
-#: actions/tag.php:86
-#, fuzzy, php-format
-msgid "Notice feed for tag %s (RSS 1.0)"
-msgstr "Päivityksien syöte käyttäjälle %s"
-
-#: actions/tag.php:92
-#, fuzzy, php-format
-msgid "Notice feed for tag %s (RSS 2.0)"
-msgstr "Päivityksien syöte käyttäjälle %s"
-
-#: actions/tag.php:98
-#, fuzzy, php-format
-msgid "Notice feed for tag %s (Atom)"
-msgstr "Päivityksien syöte käyttäjälle %s"
-
 #: actions/tagrss.php:35
 msgid "No such tag."
 msgstr "Tuota tagia ei ole."
@@ -3981,23 +3981,23 @@ msgstr "Viestin päivittäminen uudella URI-osoitteella ei onnistunut."
 msgid "DB error inserting hashtag: %s"
 msgstr "Tietokantavirhe tallennettaessa risutagiä: %s"
 
-#: classes/Notice.php:179
+#: classes/Notice.php:188
 #, fuzzy
 msgid "Problem saving notice. Too long."
 msgstr "Ongelma päivityksen tallentamisessa."
 
-#: classes/Notice.php:183
+#: classes/Notice.php:192
 msgid "Problem saving notice. Unknown user."
 msgstr "Virhe tapahtui päivityksen tallennuksessa. Tuntematon käyttäjä."
 
-#: classes/Notice.php:188
+#: classes/Notice.php:197
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 "Liian monta päivitystä liian nopeasti; pidä pieni hengähdystauko ja jatka "
 "päivityksien lähettämista muutaman minuutin päästä."
 
-#: classes/Notice.php:194
+#: classes/Notice.php:203
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
@@ -4005,19 +4005,24 @@ msgstr ""
 "Liian monta päivitystä liian nopeasti; pidä pieni hengähdystauko ja jatka "
 "päivityksien lähettämista muutaman minuutin päästä."
 
-#: classes/Notice.php:200
+#: classes/Notice.php:209
 msgid "You are banned from posting notices on this site."
 msgstr "Päivityksesi tähän palveluun on estetty."
 
-#: classes/Notice.php:265 classes/Notice.php:290
+#: classes/Notice.php:274 classes/Notice.php:299
 msgid "Problem saving notice."
 msgstr "Ongelma päivityksen tallentamisessa."
 
-#: classes/Notice.php:1124
+#: classes/Notice.php:1115
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Tietokantavirhe tallennettaessa vastausta: %s"
 
+#: classes/User.php:347
+#, fuzzy, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr "Viesti käyttäjälle %1$s, %2$s"
+
 #: classes/User_group.php:380
 msgid "Could not create group."
 msgstr "Ryhmän luonti ei onnistunut."
@@ -4026,11 +4031,6 @@ msgstr "Ryhmän luonti ei onnistunut."
 msgid "Could not set group membership."
 msgstr "Ryhmän jäsenyystietoja ei voitu asettaa."
 
-#: classes/User.php:347
-#, fuzzy, php-format
-msgid "Welcome to %1$s, @%2$s!"
-msgstr "Viesti käyttäjälle %1$s, %2$s"
-
 #: lib/accountsettingsaction.php:108
 msgid "Change your profile settings"
 msgstr "Vaihda profiiliasetuksesi"
@@ -4345,7 +4345,7 @@ msgstr ""
 msgid "Notice with that id does not exist"
 msgstr ""
 
-#: lib/command.php:168 lib/command.php:416 lib/command.php:471
+#: lib/command.php:168 lib/command.php:416 lib/command.php:472
 msgid "User has no last notice"
 msgstr "Käyttäjällä ei ole viimeistä päivitystä"
 
@@ -4392,102 +4392,102 @@ msgstr "Tapahtui virhe suoran viestin lähetyksessä."
 msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr "Viesti oli liian pitkä - maksimikoko on 140 merkkiä, lähetit %d"
 
-#: lib/command.php:439
+#: lib/command.php:440
 #, fuzzy, php-format
 msgid "Reply to %s sent"
 msgstr "Vastaa tähän päivitykseen"
 
-#: lib/command.php:441
+#: lib/command.php:442
 #, fuzzy
 msgid "Error saving notice."
 msgstr "Ongelma päivityksen tallentamisessa."
 
-#: lib/command.php:495
+#: lib/command.php:496
 msgid "Specify the name of the user to subscribe to"
 msgstr "Anna käyttäjätunnus, jonka päivitykset haluat tilata"
 
-#: lib/command.php:502
+#: lib/command.php:503
 #, php-format
 msgid "Subscribed to %s"
 msgstr "Käyttäjän %s päivitykset tilattu"
 
-#: lib/command.php:523
+#: lib/command.php:524
 msgid "Specify the name of the user to unsubscribe from"
 msgstr "Anna käyttäjätunnus, jonka päivityksien tilauksen haluat lopettaa"
 
-#: lib/command.php:530
+#: lib/command.php:531
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr "Käyttäjän %s päivitysten tilaus lopetettu"
 
-#: lib/command.php:548 lib/command.php:571
+#: lib/command.php:549 lib/command.php:572
 msgid "Command not yet implemented."
 msgstr "Komentoa ei ole vielä toteutettu."
 
-#: lib/command.php:551
+#: lib/command.php:552
 msgid "Notification off."
 msgstr "Ilmoitukset pois päältä."
 
-#: lib/command.php:553
+#: lib/command.php:554
 msgid "Can't turn off notification."
 msgstr "Ilmoituksia ei voi pistää pois päältä."
 
-#: lib/command.php:574
+#: lib/command.php:575
 msgid "Notification on."
 msgstr "Ilmoitukset päällä."
 
-#: lib/command.php:576
+#: lib/command.php:577
 msgid "Can't turn on notification."
 msgstr "Ilmoituksia ei voi pistää päälle."
 
-#: lib/command.php:588
+#: lib/command.php:590
 msgid "Login command is disabled"
 msgstr ""
 
-#: lib/command.php:602
+#: lib/command.php:604
 #, fuzzy, php-format
 msgid "Could not create login token for %s"
 msgstr "Ei voitu lisätä aliasta."
 
-#: lib/command.php:607
+#: lib/command.php:609
 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:623
+#: lib/command.php:625
 #, fuzzy
 msgid "You are not subscribed to anyone."
 msgstr "Et ole tilannut tämän käyttäjän päivityksiä."
 
-#: lib/command.php:625
+#: lib/command.php:627
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Olet jos tilannut seuraavien käyttäjien päivitykset:"
 msgstr[1] "Olet jos tilannut seuraavien käyttäjien päivitykset:"
 
-#: lib/command.php:645
+#: lib/command.php:647
 #, fuzzy
 msgid "No one is subscribed to you."
 msgstr "Toista ei voitu asettaa tilaamaan sinua."
 
-#: lib/command.php:647
+#: lib/command.php:649
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Toista ei voitu asettaa tilaamaan sinua."
 msgstr[1] "Toista ei voitu asettaa tilaamaan sinua."
 
-#: lib/command.php:667
+#: lib/command.php:669
 #, fuzzy
 msgid "You are not a member of any groups."
 msgstr "Sinä et kuulu tähän ryhmään."
 
-#: lib/command.php:669
+#: lib/command.php:671
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Sinä et kuulu tähän ryhmään."
 msgstr[1] "Sinä et kuulu tähän ryhmään."
 
-#: lib/command.php:683
+#: lib/command.php:685
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -4587,10 +4587,6 @@ msgstr "Merkitse päivitys suosikkeihin"
 msgid "Favor"
 msgstr "Lisää suosikiksi"
 
-#: lib/feedlist.php:64
-msgid "Export data"
-msgstr "Vie tietoja"
-
 #: lib/feed.php:85
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
@@ -4607,6 +4603,10 @@ msgstr "Atom"
 msgid "FOAF"
 msgstr "FOAF"
 
+#: lib/feedlist.php:64
+msgid "Export data"
+msgstr "Vie tietoja"
+
 #: lib/galleryaction.php:121
 msgid "Filter tags"
 msgstr "Suodata tagien perusteella"
@@ -4770,21 +4770,6 @@ msgstr "Kirjaudu sisään käyttäjätunnuksella ja salasanalla"
 msgid "Sign up for a new account"
 msgstr "Luo uusi käyttäjätili"
 
-#: lib/mailbox.php:89
-msgid "Only the user can read their own mailboxes."
-msgstr "Vain käyttäjä voi lukea omaa postilaatikkoaan."
-
-#: lib/mailbox.php:139
-msgid ""
-"You have no private messages. You can send private message to engage other "
-"users in conversation. People can send you messages for your eyes only."
-msgstr ""
-
-#: lib/mailbox.php:227 lib/noticelist.php:452
-#, fuzzy
-msgid "from"
-msgstr " lähteestä "
-
 #: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Sähköpostiosoitteen vahvistus"
@@ -4981,6 +4966,21 @@ msgid ""
 "\n"
 msgstr ""
 
+#: lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
+msgstr "Vain käyttäjä voi lukea omaa postilaatikkoaan."
+
+#: lib/mailbox.php:139
+msgid ""
+"You have no private messages. You can send private message to engage other "
+"users in conversation. People can send you messages for your eyes only."
+msgstr ""
+
+#: lib/mailbox.php:227 lib/noticelist.php:452
+#, fuzzy
+msgid "from"
+msgstr " lähteestä "
+
 #: lib/mediafile.php:98 lib/mediafile.php:123
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
@@ -5041,7 +5041,7 @@ msgstr "Lähetä suora viesti"
 msgid "To"
 msgstr "Vastaanottaja"
 
-#: lib/messageform.php:161 lib/noticeform.php:185
+#: lib/messageform.php:159 lib/noticeform.php:183
 msgid "Available characters"
 msgstr "Sallitut merkit"
 
@@ -5054,11 +5054,11 @@ msgstr "Lähetä päivitys"
 msgid "What's up, %s?"
 msgstr "Mitä teet juuri nyt, %s?"
 
-#: lib/noticeform.php:192
+#: lib/noticeform.php:190
 msgid "Attach"
 msgstr ""
 
-#: lib/noticeform.php:196
+#: lib/noticeform.php:194
 msgid "Attach a file"
 msgstr ""
 
@@ -5130,12 +5130,12 @@ msgstr "Virhe tapahtui uuden etäprofiilin lisäämisessä"
 msgid "Duplicate notice"
 msgstr "Poista päivitys"
 
-#: lib/oauthstore.php:467 lib/subs.php:48
+#: lib/oauthstore.php:466 lib/subs.php:48
 #, fuzzy
 msgid "You have been banned from subscribing."
 msgstr "Käyttäjä on estänyt sinua tilaamasta päivityksiä."
 
-#: lib/oauthstore.php:492
+#: lib/oauthstore.php:491
 msgid "Couldn't insert new subscription."
 msgstr "Ei voitu lisätä uutta tilausta."
 
@@ -5303,20 +5303,6 @@ msgstr "Ihmiset jotka ovat käyttäjän %s tilaajia"
 msgid "Groups %s is a member of"
 msgstr "Ryhmät, joiden jäsen %s on"
 
-#: 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/subscriptionlist.php:126
-msgid "(none)"
-msgstr "(tyhjä)"
-
 #: lib/subs.php:52
 msgid "Already subscribed!"
 msgstr ""
@@ -5347,6 +5333,20 @@ msgstr "Ei voitu poistaa tilausta."
 msgid "Couldn't delete subscription."
 msgstr "Ei voitu poistaa tilausta."
 
+#: 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/subscriptionlist.php:126
+msgid "(none)"
+msgstr "(tyhjä)"
+
 #: lib/tagcloudsection.php:56
 msgid "None"
 msgstr "Ei mitään"
diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po
index d667087954..1ed66b9054 100644
--- a/locale/fr/LC_MESSAGES/statusnet.po
+++ b/locale/fr/LC_MESSAGES/statusnet.po
@@ -13,12 +13,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 21:25+0000\n"
-"PO-Revision-Date: 2009-12-07 21:26:29+0000\n"
+"POT-Creation-Date: 2009-12-12 17:09+0000\n"
+"PO-Revision-Date: 2009-12-12 17:09:41+0000\n"
 "Language-Team: French\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n"
+"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: out-statusnet\n"
@@ -31,11 +31,11 @@ msgstr "Page non trouvée"
 
 #: actions/all.php:74 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofile.php:105
 #: actions/apiaccountupdateprofilebackgroundimage.php:116
-#: actions/apiaccountupdateprofileimage.php:105
-#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
-#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
-#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
+#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90
 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
@@ -48,7 +48,7 @@ msgstr "Page non trouvée"
 #: actions/repliesrss.php:38 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38
 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
-#: lib/command.php:364 lib/command.php:411 lib/command.php:466
+#: lib/command.php:364 lib/command.php:411 lib/command.php:467
 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
 #: lib/subs.php:34 lib/subs.php:116
 msgid "No such user."
@@ -60,7 +60,7 @@ msgid "%s and friends, page %d"
 msgstr "%s et ses amis - page %d"
 
 #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
-#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100
+#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s et ses amis"
@@ -120,24 +120,24 @@ msgstr ""
 msgid "You and friends"
 msgstr "Vous et vos amis"
 
-#: actions/allrss.php:119 actions/apitimelinefriends.php:121
+#: actions/allrss.php:119 actions/apitimelinefriends.php:122
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Statuts de %1$s et ses amis dans %2$s!"
 
 #: actions/apiaccountratelimitstatus.php:70
 #: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofile.php:97
 #: actions/apiaccountupdateprofilebackgroundimage.php:94
 #: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apiaccountupdateprofile.php:97
 msgid "API method not found."
 msgstr "Méthode API non trouvée !"
 
 #: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofile.php:89
 #: actions/apiaccountupdateprofilebackgroundimage.php:86
 #: actions/apiaccountupdateprofilecolors.php:110
-#: actions/apiaccountupdateprofileimage.php:84
-#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
+#: actions/apiaccountupdateprofileimage.php:84 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
@@ -158,9 +158,22 @@ msgstr ""
 msgid "Could not update user."
 msgstr "Impossible de mettre à jour l’utilisateur."
 
+#: actions/apiaccountupdateprofile.php:112
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+msgid "User has no profile."
+msgstr "Aucun profil ne correspond à cet utilisateur."
+
+#: actions/apiaccountupdateprofile.php:147
+msgid "Could not save profile."
+msgstr "Impossible d’enregistrer le profil."
+
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257
 #: actions/designadminpanel.php:122 actions/newnotice.php:94
 #: lib/designsettings.php:283
 #, php-format
@@ -183,19 +196,6 @@ msgstr "Impossible de sauvegarder les parmètres de la conception."
 msgid "Could not update your design."
 msgstr "Impossible de mettre à jour votre conception."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
-#: actions/apiaccountupdateprofileimage.php:130
-#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
-#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
-msgid "User has no profile."
-msgstr "Aucun profil ne correspond à cet utilisateur."
-
-#: actions/apiaccountupdateprofile.php:147
-msgid "Could not save profile."
-msgstr "Impossible d’enregistrer le profil."
-
 #: actions/apiblockcreate.php:105
 msgid "You cannot block yourself!"
 msgstr "Vous ne pouvez pas vous bloquer vous-même !"
@@ -208,25 +208,6 @@ msgstr "Le blocage de l’utilisateur a échoué."
 msgid "Unblock user failed."
 msgstr "Le déblocage de l’utilisateur a échoué."
 
-#: actions/apidirectmessagenew.php:126
-msgid "No message text!"
-msgstr "Message sans texte !"
-
-#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
-#, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr "C’est trop long ! La taille maximale du message est de %d caractères."
-
-#: actions/apidirectmessagenew.php:146
-msgid "Recipient user not found."
-msgstr "Destinataire non trouvé."
-
-#: actions/apidirectmessagenew.php:150
-msgid "Can't send direct messages to users who aren't your friend."
-msgstr ""
-"Vous ne pouvez envoyer des messages personnels qu’aux utilisateurs inscrits "
-"comme amis."
-
 #: actions/apidirectmessage.php:89
 #, php-format
 msgid "Direct messages from %s"
@@ -252,18 +233,37 @@ msgstr "Tous les messages envoyés à %s"
 #: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
-#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
-#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149
-#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
-#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156
+#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151
+#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141
+#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
 msgid "API method not found!"
 msgstr "Méthode API non trouvée !"
 
+#: actions/apidirectmessagenew.php:126
+msgid "No message text!"
+msgstr "Message sans texte !"
+
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "C’est trop long ! La taille maximale du message est de %d caractères."
+
+#: actions/apidirectmessagenew.php:146
+msgid "Recipient user not found."
+msgstr "Destinataire non trouvé."
+
+#: actions/apidirectmessagenew.php:150
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr ""
+"Vous ne pouvez envoyer des messages personnels qu’aux utilisateurs inscrits "
+"comme amis."
+
 #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
 #: actions/apistatusesdestroy.php:113
 msgid "No status found with that ID."
@@ -408,16 +408,6 @@ msgstr "Vous n'êtes pas membre de ce groupe."
 msgid "Could not remove user %s to group %s."
 msgstr "Impossible de retirer l’utilisateur %s du groupe %s"
 
-#: actions/apigrouplistall.php:90 actions/usergroups.php:62
-#, php-format
-msgid "%s groups"
-msgstr "Groupes de %s"
-
-#: actions/apigrouplistall.php:94
-#, php-format
-msgid "groups on %s"
-msgstr "groupes sur %s"
-
 #: actions/apigrouplist.php:95
 #, php-format
 msgid "%s's groups"
@@ -428,6 +418,16 @@ msgstr "Groupes de %s"
 msgid "Groups %s is a member of on %s."
 msgstr "Les groupes dont %s est membre sur %s."
 
+#: actions/apigrouplistall.php:90 actions/usergroups.php:62
+#, php-format
+msgid "%s groups"
+msgstr "Groupes de %s"
+
+#: actions/apigrouplistall.php:94
+#, php-format
+msgid "groups on %s"
+msgstr "groupes sur %s"
+
 #: actions/apistatusesdestroy.php:107
 msgid "This method requires a POST or DELETE."
 msgstr "Ce processus requiert un POST ou un DELETE."
@@ -465,54 +465,54 @@ msgstr ""
 msgid "Unsupported format."
 msgstr "Format non supporté."
 
-#: actions/apitimelinefavorites.php:107
+#: actions/apitimelinefavorites.php:108
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr "%s / Favoris de %s"
 
-#: actions/apitimelinefavorites.php:119
+#: actions/apitimelinefavorites.php:120
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr "%s statuts ont été ajoutés aux favoris de %s / %s."
 
-#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117
+#: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118
 #: actions/grouprss.php:131 actions/userrss.php:90
 #, php-format
 msgid "%s timeline"
 msgstr "Activité de %s"
 
-#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125
+#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
 #: actions/userrss.php:92
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Statuts de %1$s dans %2$s!"
 
-#: actions/apitimelinementions.php:116
+#: actions/apitimelinementions.php:117
 #, php-format
 msgid "%1$s / Updates mentioning %2$s"
 msgstr "%1$s / Mises à jour mentionnant %2$s"
 
-#: actions/apitimelinementions.php:126
+#: actions/apitimelinementions.php:127
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s statuts en réponses aux statuts de %2$s / %3$s."
 
-#: actions/apitimelinepublic.php:106 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "Activité publique %s"
 
-#: actions/apitimelinepublic.php:110 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s statuts de tout le monde !"
 
-#: actions/apitimelinetag.php:101 actions/tag.php:66
+#: actions/apitimelinetag.php:102 actions/tag.php:66
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Avis marqués avec %s"
 
-#: actions/apitimelinetag.php:107 actions/tagrss.php:64
+#: actions/apitimelinetag.php:108 actions/tagrss.php:64
 #, php-format
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Mises à jour marquées avec %1$s dans %2$s !"
@@ -549,45 +549,45 @@ msgstr ""
 "Vous pouvez associer un « avatar » (image personnelle) à votre profil. La "
 "taille maximale du fichier est de %s."
 
-#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:185
 #: actions/grouplogo.php:178 actions/remotesubscribe.php:191
 #: actions/userauthorization.php:72 actions/userrss.php:103
 msgid "User without matching profile"
 msgstr "Utilisateur sans profil correspondant"
 
-#: actions/avatarsettings.php:119 actions/avatarsettings.php:194
+#: actions/avatarsettings.php:119 actions/avatarsettings.php:197
 #: actions/grouplogo.php:251
 msgid "Avatar settings"
 msgstr "Paramètres de l’avatar"
 
-#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/avatarsettings.php:127 actions/avatarsettings.php:205
 #: actions/grouplogo.php:199 actions/grouplogo.php:259
 msgid "Original"
 msgstr "Image originale"
 
-#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/avatarsettings.php:142 actions/avatarsettings.php:217
 #: actions/grouplogo.php:210 actions/grouplogo.php:271
 msgid "Preview"
 msgstr "Aperçu"
 
-#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
+#: actions/avatarsettings.php:149 lib/deleteuserform.php:66
 #: lib/noticelist.php:550
 msgid "Delete"
 msgstr "Supprimer"
 
-#: actions/avatarsettings.php:165 actions/grouplogo.php:233
+#: actions/avatarsettings.php:166 actions/grouplogo.php:233
 msgid "Upload"
 msgstr "Transfert"
 
-#: actions/avatarsettings.php:228 actions/grouplogo.php:286
+#: actions/avatarsettings.php:231 actions/grouplogo.php:286
 msgid "Crop"
 msgstr "Recadrer"
 
-#: actions/avatarsettings.php:265 actions/disfavor.php:74
+#: actions/avatarsettings.php:268 actions/disfavor.php:74
 #: actions/emailsettings.php:238 actions/favor.php:75
 #: actions/groupblock.php:66 actions/grouplogo.php:309
 #: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -600,73 +600,33 @@ msgstr ""
 "Un problème est survenu avec votre jeton de session. Veuillez essayer à "
 "nouveau."
 
-#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
+#: actions/avatarsettings.php:281 actions/designadminpanel.php:103
 #: actions/emailsettings.php:256 actions/grouplogo.php:319
 #: actions/imsettings.php:220 actions/recoverpassword.php:44
 #: actions/smssettings.php:248 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "Soumission de formulaire inattendue."
 
-#: actions/avatarsettings.php:322
+#: actions/avatarsettings.php:328
 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:337 actions/grouplogo.php:377
+#: actions/avatarsettings.php:343 actions/grouplogo.php:377
 msgid "Lost our file data."
 msgstr "Données perdues."
 
-#: actions/avatarsettings.php:360
+#: actions/avatarsettings.php:366
 msgid "Avatar updated."
 msgstr "Avatar mis à jour."
 
-#: actions/avatarsettings.php:363
+#: actions/avatarsettings.php:369
 msgid "Failed updating avatar."
 msgstr "La mise à jour de l’avatar a échoué."
 
-#: actions/avatarsettings.php:387
+#: actions/avatarsettings.php:393
 msgid "Avatar deleted."
 msgstr "Avatar supprimé."
 
-#: actions/blockedfromgroup.php:73 actions/editgroup.php:84
-#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
-#: actions/groupmembers.php:76 actions/grouprss.php:91
-#: actions/joingroup.php:76 actions/showgroup.php:121
-msgid "No nickname"
-msgstr "Aucun pseudo"
-
-#: actions/blockedfromgroup.php:80 actions/editgroup.php:96
-#: actions/groupbyid.php:83 actions/groupdesignsettings.php:97
-#: actions/grouplogo.php:99 actions/groupmembers.php:83
-#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
-msgid "No such group"
-msgstr "Aucun groupe trouvé"
-
-#: actions/blockedfromgroup.php:90
-#, php-format
-msgid "%s blocked profiles"
-msgstr "%s profils bloqués"
-
-#: actions/blockedfromgroup.php:93
-#, php-format
-msgid "%s blocked profiles, page %d"
-msgstr "%s profils bloqués, page %d"
-
-#: actions/blockedfromgroup.php:108
-msgid "A list of the users blocked from joining this group."
-msgstr "Une liste des utilisateurs dont l’inscription à ce groupe est bloquée."
-
-#: actions/blockedfromgroup.php:281
-msgid "Unblock user from group"
-msgstr "Débloquer l’utilisateur du groupe"
-
-#: actions/blockedfromgroup.php:313 lib/unblockform.php:69
-msgid "Unblock"
-msgstr "Débloquer"
-
-#: actions/blockedfromgroup.php:313 lib/unblockform.php:80
-msgid "Unblock this user"
-msgstr "Débloquer cet utilisateur"
-
 #: actions/block.php:69
 msgid "You already blocked that user."
 msgstr "Vous avez déjà bloqué cet utilisateur."
@@ -707,6 +667,46 @@ msgstr "Bloquer cet utilisateur"
 msgid "Failed to save block information."
 msgstr "Impossible d’enregistrer les informations de blocage."
 
+#: actions/blockedfromgroup.php:73 actions/editgroup.php:84
+#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
+#: actions/groupmembers.php:76 actions/grouprss.php:91
+#: actions/joingroup.php:76 actions/showgroup.php:121
+msgid "No nickname"
+msgstr "Aucun pseudo"
+
+#: actions/blockedfromgroup.php:80 actions/editgroup.php:96
+#: actions/groupbyid.php:83 actions/groupdesignsettings.php:97
+#: actions/grouplogo.php:99 actions/groupmembers.php:83
+#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
+msgid "No such group"
+msgstr "Aucun groupe trouvé"
+
+#: actions/blockedfromgroup.php:90
+#, php-format
+msgid "%s blocked profiles"
+msgstr "%s profils bloqués"
+
+#: actions/blockedfromgroup.php:93
+#, php-format
+msgid "%s blocked profiles, page %d"
+msgstr "%s profils bloqués, page %d"
+
+#: actions/blockedfromgroup.php:108
+msgid "A list of the users blocked from joining this group."
+msgstr "Une liste des utilisateurs dont l’inscription à ce groupe est bloquée."
+
+#: actions/blockedfromgroup.php:281
+msgid "Unblock user from group"
+msgstr "Débloquer l’utilisateur du groupe"
+
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:69
+msgid "Unblock"
+msgstr "Débloquer"
+
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:80
+msgid "Unblock this user"
+msgstr "Débloquer cet utilisateur"
+
 #: actions/bookmarklet.php:50
 msgid "Post to "
 msgstr "Poster sur "
@@ -1024,6 +1024,7 @@ msgid "Remove"
 msgstr "Retirer"
 
 #: actions/emailsettings.php:113
+#, fuzzy
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -1055,7 +1056,7 @@ msgstr "Courriel entrant"
 
 #: actions/emailsettings.php:138 actions/smssettings.php:157
 msgid "Send email to this address to post new notices."
-msgstr "Écrivez à cette adresse courriel pour poster de nouveaux avis. "
+msgstr "Écrivez à cette adresse courriel pour poster de nouveaux avis."
 
 #: actions/emailsettings.php:145 actions/smssettings.php:162
 msgid "Make a new email address for posting to; cancels the old one."
@@ -1178,6 +1179,14 @@ msgstr "L’adresse de courriel entrant a été supprimée."
 msgid "New incoming email address added."
 msgstr "Nouvelle adresse courriel ajoutée."
 
+#: actions/favor.php:79
+msgid "This notice is already a favorite!"
+msgstr "Cet avis a déjà été ajouté à vos favoris !"
+
+#: actions/favor.php:92 lib/disfavorform.php:140
+msgid "Disfavor favorite"
+msgstr "Retirer ce favori"
+
 #: actions/favorited.php:65 lib/popularnoticesection.php:88
 #: lib/publicgroupnav.php:93
 msgid "Popular notices"
@@ -1226,14 +1235,6 @@ msgstr "Avis favoris de %s"
 msgid "Updates favored by %1$s on %2$s!"
 msgstr "Mises à jour privilégiées par %1$s sur %2$s !"
 
-#: actions/favor.php:79
-msgid "This notice is already a favorite!"
-msgstr "Cet avis a déjà été ajouté à vos favoris !"
-
-#: actions/favor.php:92 lib/disfavorform.php:140
-msgid "Disfavor favorite"
-msgstr "Retirer ce favori"
-
 #: actions/featured.php:69 lib/featureduserssection.php:87
 #: lib/publicgroupnav.php:89
 msgid "Featured users"
@@ -1466,6 +1467,36 @@ msgstr "Faire de cet utilisateur un administrateur"
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "Mises à jour des membres de %1$s dans %2$s !"
 
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+msgid "Groups"
+msgstr "Groupes"
+
+#: actions/groups.php:64
+#, php-format
+msgid "Groups, page %d"
+msgstr "Groupes - page %d"
+
+#: actions/groups.php:90
+#, php-format
+msgid ""
+"%%%%site.name%%%% groups let you find and talk with people of similar "
+"interests. After you join a group you can send messages to all other members "
+"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
+"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
+"%%%%)"
+msgstr ""
+"Les groupes de %%%%site.name%%%% permettent de trouver et de parler avec des "
+"personnes qui ont des intérêts en commun avec vous. Après avoir rejoint un "
+"groupe, vous pouvez envoyer des messages à tous les autres membres en "
+"utilisant la syntaxe « !nomdugroupe ». Vous ne voyez aucun groupe qui vous "
+"intéresse ? Essayez d’en [rechercher un](%%%%action.groupsearch%%%%) ou de "
+"[créer le vôtre !](%%%%action.newgroup%%%%)"
+
+#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
+msgid "Create a new group"
+msgstr "Créer un nouveau groupe"
+
 #: actions/groupsearch.php:52
 #, php-format
 msgid ""
@@ -1503,36 +1534,6 @@ msgstr ""
 "Pourquoi ne pas [créer un compte](%%action.register%%) et [créer le groupe](%"
 "%action.newgroup%%) vous-même !"
 
-#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
-msgid "Groups"
-msgstr "Groupes"
-
-#: actions/groups.php:64
-#, php-format
-msgid "Groups, page %d"
-msgstr "Groupes - page %d"
-
-#: actions/groups.php:90
-#, php-format
-msgid ""
-"%%%%site.name%%%% groups let you find and talk with people of similar "
-"interests. After you join a group you can send messages to all other members "
-"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
-"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
-"%%%%)"
-msgstr ""
-"Les groupes de %%%%site.name%%%% permettent de trouver et de parler avec des "
-"personnes qui ont des intérêts en commun avec vous. Après avoir rejoint un "
-"groupe, vous pouvez envoyer des messages à tous les autres membres en "
-"utilisant la syntaxe « !nomdugroupe ». Vous ne voyez aucun groupe qui vous "
-"intéresse ? Essayez d’en [rechercher un](%%%%action.groupsearch%%%%) ou de "
-"[créer le vôtre !](%%%%action.newgroup%%%%)"
-
-#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
-msgid "Create a new group"
-msgstr "Créer un nouveau groupe"
-
 #: actions/groupunblock.php:91
 msgid "Only an admin can unblock group members."
 msgstr "Seul un administrateur peut débloquer les membres du groupes."
@@ -1732,7 +1733,7 @@ msgstr "Message personnel"
 msgid "Optionally add a personal message to the invitation."
 msgstr "Ajouter un message personnel à l’invitation (optionnel)."
 
-#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:222
 msgid "Send"
 msgstr "Envoyer"
 
@@ -1840,57 +1841,57 @@ msgstr "Impossible de retirer l’utilisateur %s du groupe %s"
 msgid "%s left group %s"
 msgstr "%s a quitté le groupe %s"
 
-#: actions/login.php:82 actions/register.php:137
+#: actions/login.php:83 actions/register.php:137
 msgid "Already logged in."
 msgstr "Déjà connecté."
 
-#: actions/login.php:113 actions/login.php:123
+#: actions/login.php:114 actions/login.php:124
 msgid "Invalid or expired token."
 msgstr "Jeton invalide ou expiré."
 
-#: actions/login.php:146
+#: actions/login.php:147
 msgid "Incorrect username or password."
 msgstr "Identifiant ou mot de passe incorrect."
 
-#: actions/login.php:152
+#: actions/login.php:153
 msgid "Error setting user. You are probably not authorized."
 msgstr "Abonnements par défaut"
 
-#: actions/login.php:207 actions/login.php:260 lib/action.php:458
+#: actions/login.php:208 actions/login.php:261 lib/action.php:458
 #: lib/logingroupnav.php:79
 msgid "Login"
 msgstr "Ouvrir une session"
 
-#: actions/login.php:246
+#: actions/login.php:247
 msgid "Login to site"
 msgstr "Ouverture de session"
 
-#: actions/login.php:249 actions/profilesettings.php:106
+#: actions/login.php:250 actions/profilesettings.php:106
 #: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
 #: lib/groupeditform.php:152 lib/userprofile.php:131
 msgid "Nickname"
 msgstr "Pseudo"
 
-#: actions/login.php:252 actions/register.php:428
+#: actions/login.php:253 actions/register.php:428
 #: lib/accountsettingsaction.php:116
 msgid "Password"
 msgstr "Mot de passe"
 
-#: actions/login.php:255 actions/register.php:477
+#: actions/login.php:256 actions/register.php:477
 msgid "Remember me"
 msgstr "Se souvenir de moi"
 
-#: actions/login.php:256 actions/register.php:479
+#: actions/login.php:257 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 "
 "ordinateurs publics ou partagés)"
 
-#: actions/login.php:266
+#: actions/login.php:267
 msgid "Lost or forgotten password?"
 msgstr "Mot de passe perdu ?"
 
-#: actions/login.php:285
+#: actions/login.php:286
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -1898,7 +1899,7 @@ msgstr ""
 "Pour des raisons de sécurité, veuillez entrer à nouveau votre identifiant et "
 "votre mot de passe afin d’enregistrer vos préférences."
 
-#: actions/login.php:289
+#: actions/login.php:290
 #, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -1974,7 +1975,7 @@ msgstr "Message envoyé"
 msgid "Direct message to %s sent"
 msgstr "Votre message a été envoyé à %s"
 
-#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:242 lib/channel.php:170
 msgid "Ajax Error"
 msgstr "Erreur Ajax"
 
@@ -1982,7 +1983,7 @@ msgstr "Erreur Ajax"
 msgid "New notice"
 msgstr "Nouvel avis"
 
-#: actions/newnotice.php:206
+#: actions/newnotice.php:208
 msgid "Notice posted"
 msgstr "Avis publié"
 
@@ -2065,8 +2066,8 @@ msgstr "type de contenu "
 msgid "Only "
 msgstr "Seulement "
 
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996
-#: lib/api.php:1024 lib/api.php:1134
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011
+#: lib/api.php:1039 lib/api.php:1149
 msgid "Not a supported data format."
 msgstr "Format de données non supporté."
 
@@ -3663,6 +3664,26 @@ msgstr "Jabber"
 msgid "SMS"
 msgstr "SMS"
 
+#: actions/tag.php:68
+#, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr "Avis marqués %s - page %d"
+
+#: actions/tag.php:86
+#, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "Flux des avis pour la marque %s (RSS 1.0)"
+
+#: actions/tag.php:92
+#, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "Flux des avis pour la marque %s (RSS 2.0)"
+
+#: actions/tag.php:98
+#, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "Flux des avis pour la marque %s (Atom)"
+
 #: actions/tagother.php:33
 msgid "Not logged in"
 msgstr "Aucune session ouverte"
@@ -3712,26 +3733,6 @@ msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 "Remplissez les champs suivants pour marquer vos abonnés ou vos abonnements."
 
-#: actions/tag.php:68
-#, php-format
-msgid "Notices tagged with %s, page %d"
-msgstr "Avis marqués %s - page %d"
-
-#: actions/tag.php:86
-#, php-format
-msgid "Notice feed for tag %s (RSS 1.0)"
-msgstr "Flux des avis pour la marque %s (RSS 1.0)"
-
-#: actions/tag.php:92
-#, php-format
-msgid "Notice feed for tag %s (RSS 2.0)"
-msgstr "Flux des avis pour la marque %s (RSS 2.0)"
-
-#: actions/tag.php:98
-#, php-format
-msgid "Notice feed for tag %s (Atom)"
-msgstr "Flux des avis pour la marque %s (Atom)"
-
 #: actions/tagrss.php:35
 msgid "No such tag."
 msgstr "Cette marque n’existe pas."
@@ -4040,22 +4041,22 @@ msgstr "Impossible de mettre à jour le message avec un nouvel URI."
 msgid "DB error inserting hashtag: %s"
 msgstr "Erreur de base de donnée en insérant la marque (hashtag) : %s"
 
-#: classes/Notice.php:179
+#: classes/Notice.php:188
 msgid "Problem saving notice. Too long."
 msgstr "Problème lors de l’enregistrement de l’avis ; trop long."
 
-#: classes/Notice.php:183
+#: classes/Notice.php:192
 msgid "Problem saving notice. Unknown user."
 msgstr "Erreur lors de l’enregistrement de l’avis. Utilisateur inconnu."
 
-#: classes/Notice.php:188
+#: classes/Notice.php:197
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 "Trop d’avis, trop vite ! Faites une pause et publiez à nouveau dans quelques "
 "minutes."
 
-#: classes/Notice.php:194
+#: classes/Notice.php:203
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
@@ -4063,19 +4064,24 @@ msgstr ""
 "Trop de messages en double trop vite ! Prenez une pause et publiez à nouveau "
 "dans quelques minutes."
 
-#: classes/Notice.php:200
+#: classes/Notice.php:209
 msgid "You are banned from posting notices on this site."
 msgstr "Il vous est interdit de poster des avis sur ce site."
 
-#: classes/Notice.php:265 classes/Notice.php:290
+#: classes/Notice.php:274 classes/Notice.php:299
 msgid "Problem saving notice."
 msgstr "Problème lors de l’enregistrement de l’avis."
 
-#: classes/Notice.php:1124
+#: classes/Notice.php:1115
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Erreur de base de donnée en insérant la réponse :%s"
 
+#: classes/User.php:347
+#, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr "Bienvenu à %1$s, @%2$s !"
+
 #: classes/User_group.php:380
 msgid "Could not create group."
 msgstr "Impossible de créer le groupe."
@@ -4084,11 +4090,6 @@ msgstr "Impossible de créer le groupe."
 msgid "Could not set group membership."
 msgstr "Impossible d'établir l’inscription au groupe."
 
-#: classes/User.php:347
-#, php-format
-msgid "Welcome to %1$s, @%2$s!"
-msgstr "Bienvenu à %1$s, @%2$s !"
-
 #: lib/accountsettingsaction.php:108
 msgid "Change your profile settings"
 msgstr "Modifier vos paramètres de profil"
@@ -4393,7 +4394,7 @@ msgstr ""
 msgid "Notice with that id does not exist"
 msgstr "Aucun avis avec cet identifiant n’existe"
 
-#: lib/command.php:168 lib/command.php:416 lib/command.php:471
+#: lib/command.php:168 lib/command.php:416 lib/command.php:472
 msgid "User has no last notice"
 msgstr "Aucun avis récent pour cet utilisateur"
 
@@ -4444,99 +4445,100 @@ msgstr ""
 "Avis trop long ! La taille maximale est de %d caractères ; vous en avez "
 "entré %d."
 
-#: lib/command.php:439
+#: lib/command.php:440
 #, php-format
 msgid "Reply to %s sent"
 msgstr "Réponse à %s envoyée"
 
-#: lib/command.php:441
+#: lib/command.php:442
 msgid "Error saving notice."
 msgstr "Problème lors de l’enregistrement de l’avis."
 
-#: lib/command.php:495
+#: lib/command.php:496
 msgid "Specify the name of the user to subscribe to"
 msgstr "Indiquez le nom de l’utilisateur auquel vous souhaitez vous abonner"
 
-#: lib/command.php:502
+#: lib/command.php:503
 #, php-format
 msgid "Subscribed to %s"
 msgstr "Abonné à %s"
 
-#: lib/command.php:523
+#: lib/command.php:524
 msgid "Specify the name of the user to unsubscribe from"
 msgstr "Indiquez le nom de l’utilisateur duquel vous souhaitez vous désabonner"
 
-#: lib/command.php:530
+#: lib/command.php:531
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr "Désabonné de %s"
 
-#: lib/command.php:548 lib/command.php:571
+#: lib/command.php:549 lib/command.php:572
 msgid "Command not yet implemented."
 msgstr "Cette commande n’a pas encore été implémentée."
 
-#: lib/command.php:551
+#: lib/command.php:552
 msgid "Notification off."
 msgstr "Avertissements désactivés."
 
-#: lib/command.php:553
+#: lib/command.php:554
 msgid "Can't turn off notification."
 msgstr "Impossible de désactiver les avertissements."
 
-#: lib/command.php:574
+#: lib/command.php:575
 msgid "Notification on."
 msgstr "Avertissements activés."
 
-#: lib/command.php:576
+#: lib/command.php:577
 msgid "Can't turn on notification."
 msgstr "Impossible d’activer les avertissements."
 
-#: lib/command.php:588
+#: lib/command.php:590
 msgid "Login command is disabled"
-msgstr ""
+msgstr "La commande d'ouverture de session est désactivée"
 
-#: lib/command.php:602
-#, fuzzy, php-format
+#: lib/command.php:604
+#, php-format
 msgid "Could not create login token for %s"
-msgstr "Impossible de créer les alias."
+msgstr "Impossible de créer le jeton d'ouverture de session pour %s"
 
-#: lib/command.php:607
+#: lib/command.php:609
 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
+"Ce lien n’est utilisable qu’une seule fois, et est valable uniquement "
+"pendant 2 minutes : %s"
 
-#: lib/command.php:623
+#: lib/command.php:625
 msgid "You are not subscribed to anyone."
 msgstr "Vous n'êtes pas abonné(e) à personne."
 
-#: lib/command.php:625
+#: lib/command.php:627
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Vous êtes abonné à cette personne :"
 msgstr[1] "Vous êtes abonné à ces personnes :"
 
-#: lib/command.php:645
+#: lib/command.php:647
 msgid "No one is subscribed to you."
 msgstr "Personne ne s'est abonné à vous."
 
-#: lib/command.php:647
+#: lib/command.php:649
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Cette personne est abonnée à vous :"
 msgstr[1] "Ces personnes sont abonnées à vous :"
 
-#: lib/command.php:667
+#: lib/command.php:669
 msgid "You are not a member of any groups."
 msgstr "Vous n'êtes pas membre d'aucun groupe."
 
-#: lib/command.php:669
+#: lib/command.php:671
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Vous êtes membre de ce groupe :"
 msgstr[1] "Vous êtes membre de ces groupes :"
 
-#: lib/command.php:683
-#, fuzzy
+#: lib/command.php:685
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -4577,9 +4579,9 @@ msgstr ""
 "Commandes :\n"
 "on - activer les notifications\n"
 "off - désactiver les notifications\n"
-"help - montrer l’aide\n"
+"help - montrer cette aide\n"
 "follow <nickname> - s’abonner à l’utilisateur\n"
-"groups - lister les groupes de vous avez joint\n"
+"groups - lister les groupes que vous avez joints\n"
 "subscriptions - lister les personnes que vous suivez\n"
 "subscribers - lister les personnes qui vous suivent\n"
 "leave <nickname> - se désabonner de l’utilisateur\n"
@@ -4587,10 +4589,11 @@ msgstr ""
 "get <nickname> - obtenir le dernier avis de l’utilisateur\n"
 "whois <nickname> - obtenir le profil de cet utilisateur\n"
 "fav <nickname> - ajouter de dernier avis de l’utilisateur comme favori\n"
-"fav #<notice_id> - ajouter l’avis correspondant à l’id comme favori\n"
-"reply #<notice_id> - répondre à l’avis correspondant à l’id\n"
+"fav #<notice_id> - ajouter l’avis correspondant à l’identifiant comme "
+"favori\n"
+"reply #<notice_id> - répondre à l’avis correspondant à l’identifiant\n"
 "reply <nickname> - répondre au dernier avis de l’utilisateur\n"
-"join <group> - s’inscrire au groupe\n"
+"join <group> - rejoindre le groupe\n"
 "login - Obtenir un lien pour s’identifier sur l’interface web\n"
 "drop <group> - quitter le groupe\n"
 "stats - obtenir vos statistiques\n"
@@ -4601,7 +4604,7 @@ msgstr ""
 "last <nickname> - même effet que 'get'\n"
 "on <nickname> - pas encore implémenté.\n"
 "off <nickname> - pas encore implémenté.\n"
-"nudge <nickname> - clin d’œil : rappeler à un utilisateur de poster.\n"
+"nudge <nickname> - rappeler à un utilisateur de poster.\n"
 "invite <phone number> - pas encore implémenté.\n"
 "track <word> - pas encore implémenté.\n"
 "untrack <word> - pas encore implémenté.\n"
@@ -4670,10 +4673,6 @@ msgstr "Ajouter aux favoris"
 msgid "Favor"
 msgstr "Ajouter à mes favoris"
 
-#: lib/feedlist.php:64
-msgid "Export data"
-msgstr "Exporter les données"
-
 #: lib/feed.php:85
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
@@ -4690,6 +4689,10 @@ msgstr "Atom"
 msgid "FOAF"
 msgstr "Ami d’un ami"
 
+#: lib/feedlist.php:64
+msgid "Export data"
+msgstr "Exporter les données"
+
 #: lib/galleryaction.php:121
 msgid "Filter tags"
 msgstr "Filtrer les marques"
@@ -4853,23 +4856,6 @@ msgstr "Ouvrez une session avec un identifiant et un mot de passe"
 msgid "Sign up for a new account"
 msgstr "Créer un nouveau compte"
 
-#: lib/mailbox.php:89
-msgid "Only the user can read their own mailboxes."
-msgstr "L’accès à cette boîte de réception est réservé à son utilisateur."
-
-#: lib/mailbox.php:139
-msgid ""
-"You have no private messages. You can send private message to engage other "
-"users in conversation. People can send you messages for your eyes only."
-msgstr ""
-"Vous n’avez pas de messages privés. Vous pouvez envoyer des messages privés "
-"pour démarrer des conversations avec d’autres utilisateurs. Ceux-ci peuvent "
-"vous envoyer des messages destinés à vous seul(e)."
-
-#: lib/mailbox.php:227 lib/noticelist.php:452
-msgid "from"
-msgstr "de"
-
 #: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Confirmation de l’adresse courriel"
@@ -5131,6 +5117,23 @@ msgstr ""
 "\t%4$s\n"
 "\n"
 
+#: lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
+msgstr "L’accès à cette boîte de réception est réservé à son utilisateur."
+
+#: lib/mailbox.php:139
+msgid ""
+"You have no private messages. You can send private message to engage other "
+"users in conversation. People can send you messages for your eyes only."
+msgstr ""
+"Vous n’avez pas de messages privés. Vous pouvez envoyer des messages privés "
+"pour démarrer des conversations avec d’autres utilisateurs. Ceux-ci peuvent "
+"vous envoyer des messages destinés à vous seul(e)."
+
+#: lib/mailbox.php:227 lib/noticelist.php:452
+msgid "from"
+msgstr "de"
+
 #: lib/mediafile.php:98 lib/mediafile.php:123
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
@@ -5195,7 +5198,7 @@ msgstr "Envoyer un message direct"
 msgid "To"
 msgstr "À"
 
-#: lib/messageform.php:161 lib/noticeform.php:185
+#: lib/messageform.php:159 lib/noticeform.php:183
 msgid "Available characters"
 msgstr "Caractères restants"
 
@@ -5208,11 +5211,11 @@ msgstr "Envoyer un avis"
 msgid "What's up, %s?"
 msgstr "Quoi de neuf, %s ?"
 
-#: lib/noticeform.php:192
+#: lib/noticeform.php:190
 msgid "Attach"
 msgstr "Attacher"
 
-#: lib/noticeform.php:196
+#: lib/noticeform.php:194
 msgid "Attach a file"
 msgstr "Attacher un fichier"
 
@@ -5281,11 +5284,11 @@ msgstr "Erreur lors de l’insertion du profil distant"
 msgid "Duplicate notice"
 msgstr "Dupliquer l’avis"
 
-#: lib/oauthstore.php:467 lib/subs.php:48
+#: lib/oauthstore.php:466 lib/subs.php:48
 msgid "You have been banned from subscribing."
 msgstr "Il vous avez été interdit de vous abonner."
 
-#: lib/oauthstore.php:492
+#: lib/oauthstore.php:491
 msgid "Couldn't insert new subscription."
 msgstr "Impossible d’insérer un nouvel abonnement."
 
@@ -5445,20 +5448,6 @@ msgstr "Abonnés de %s"
 msgid "Groups %s is a member of"
 msgstr "Groupes de %s"
 
-#: lib/subscriberspeopleselftagcloudsection.php:48
-#: lib/subscriptionspeopleselftagcloudsection.php:48
-msgid "People Tagcloud as self-tagged"
-msgstr "Nuage de marques pour une personne (ajoutées par eux-même)"
-
-#: lib/subscriberspeopletagcloudsection.php:48
-#: lib/subscriptionspeopletagcloudsection.php:48
-msgid "People Tagcloud as tagged"
-msgstr "Nuage de marques pour une personne"
-
-#: lib/subscriptionlist.php:126
-msgid "(none)"
-msgstr "(aucun)"
-
 #: lib/subs.php:52
 msgid "Already subscribed!"
 msgstr "Déjà abonné !"
@@ -5487,6 +5476,20 @@ msgstr "Impossible de supprimer l’abonnement à soi-même."
 msgid "Couldn't delete subscription."
 msgstr "Impossible de cesser l’abonnement"
 
+#: lib/subscriberspeopleselftagcloudsection.php:48
+#: lib/subscriptionspeopleselftagcloudsection.php:48
+msgid "People Tagcloud as self-tagged"
+msgstr "Nuage de marques pour une personne (ajoutées par eux-même)"
+
+#: lib/subscriberspeopletagcloudsection.php:48
+#: lib/subscriptionspeopletagcloudsection.php:48
+msgid "People Tagcloud as tagged"
+msgstr "Nuage de marques pour une personne"
+
+#: lib/subscriptionlist.php:126
+msgid "(none)"
+msgstr "(aucun)"
+
 #: lib/tagcloudsection.php:56
 msgid "None"
 msgstr "Aucun"
diff --git a/locale/ga/LC_MESSAGES/statusnet.po b/locale/ga/LC_MESSAGES/statusnet.po
index b3d15c8a47..793b136e97 100644
--- a/locale/ga/LC_MESSAGES/statusnet.po
+++ b/locale/ga/LC_MESSAGES/statusnet.po
@@ -1,5 +1,6 @@
 # Translation of StatusNet to Irish
 #
+# Author@translatewiki.net: McDutchie
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -7,12 +8,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 21:25+0000\n"
-"PO-Revision-Date: 2009-12-07 21:26:33+0000\n"
+"POT-Creation-Date: 2009-12-12 17:09+0000\n"
+"PO-Revision-Date: 2009-12-12 17:09:43+0000\n"
 "Language-Team: Irish\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n"
+"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ga\n"
 "X-Message-Group: out-statusnet\n"
@@ -27,11 +28,11 @@ msgstr "Non existe a etiqueta."
 
 #: actions/all.php:74 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofile.php:105
 #: actions/apiaccountupdateprofilebackgroundimage.php:116
-#: actions/apiaccountupdateprofileimage.php:105
-#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
-#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
-#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
+#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90
 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
@@ -44,7 +45,7 @@ msgstr "Non existe a etiqueta."
 #: actions/repliesrss.php:38 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38
 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
-#: lib/command.php:364 lib/command.php:411 lib/command.php:466
+#: lib/command.php:364 lib/command.php:411 lib/command.php:467
 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
 #: lib/subs.php:34 lib/subs.php:116
 msgid "No such user."
@@ -56,7 +57,7 @@ msgid "%s and friends, page %d"
 msgstr "%s e amigos"
 
 #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
-#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100
+#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s e amigos"
@@ -108,25 +109,25 @@ msgstr ""
 msgid "You and friends"
 msgstr "%s e amigos"
 
-#: actions/allrss.php:119 actions/apitimelinefriends.php:121
+#: actions/allrss.php:119 actions/apitimelinefriends.php:122
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Actualizacións dende %1$s e amigos en %2$s!"
 
 #: actions/apiaccountratelimitstatus.php:70
 #: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofile.php:97
 #: actions/apiaccountupdateprofilebackgroundimage.php:94
 #: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apiaccountupdateprofile.php:97
 #, fuzzy
 msgid "API method not found."
 msgstr "Método da API non atopado"
 
 #: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofile.php:89
 #: actions/apiaccountupdateprofilebackgroundimage.php:86
 #: actions/apiaccountupdateprofilecolors.php:110
-#: actions/apiaccountupdateprofileimage.php:84
-#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
+#: actions/apiaccountupdateprofileimage.php:84 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
@@ -146,9 +147,23 @@ msgstr ""
 msgid "Could not update user."
 msgstr "Non se puido actualizar o usuario."
 
+#: actions/apiaccountupdateprofile.php:112
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+msgid "User has no profile."
+msgstr "O usuario non ten perfil."
+
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "Non se puido gardar o perfil."
+
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257
 #: actions/designadminpanel.php:122 actions/newnotice.php:94
 #: lib/designsettings.php:283
 #, php-format
@@ -171,20 +186,6 @@ msgstr "Non se puideron gardar os teus axustes de Twitter!"
 msgid "Could not update your design."
 msgstr "Non se puido actualizar o usuario."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
-#: actions/apiaccountupdateprofileimage.php:130
-#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
-#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
-msgid "User has no profile."
-msgstr "O usuario non ten perfil."
-
-#: actions/apiaccountupdateprofile.php:147
-#, fuzzy
-msgid "Could not save profile."
-msgstr "Non se puido gardar o perfil."
-
 #: actions/apiblockcreate.php:105
 #, fuzzy
 msgid "You cannot block yourself!"
@@ -198,25 +199,6 @@ msgstr "Bloqueo de usuario fallido."
 msgid "Unblock user failed."
 msgstr "Desbloqueo de usuario fallido."
 
-#: actions/apidirectmessagenew.php:126
-msgid "No message text!"
-msgstr "Non hai mensaxes de texto!"
-
-#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
-#, fuzzy, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr ""
-"Iso é demasiado longo. O tamaño máximo para unha mensaxe é de 140 caracteres."
-
-#: actions/apidirectmessagenew.php:146
-msgid "Recipient user not found."
-msgstr "Usuario destinatario non atopado."
-
-#: actions/apidirectmessagenew.php:150
-msgid "Can't send direct messages to users who aren't your friend."
-msgstr ""
-"Non se pode enviar a mensaxe directa a usuarios dos que non eres amigo."
-
 #: actions/apidirectmessage.php:89
 #, fuzzy, php-format
 msgid "Direct messages from %s"
@@ -242,18 +224,37 @@ msgstr "Tódalas mensaxes directas enviadas a %s"
 #: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
-#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
-#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149
-#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
-#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156
+#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151
+#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141
+#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
 msgid "API method not found!"
 msgstr "Método da API non atopado"
 
+#: actions/apidirectmessagenew.php:126
+msgid "No message text!"
+msgstr "Non hai mensaxes de texto!"
+
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, fuzzy, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr ""
+"Iso é demasiado longo. O tamaño máximo para unha mensaxe é de 140 caracteres."
+
+#: actions/apidirectmessagenew.php:146
+msgid "Recipient user not found."
+msgstr "Usuario destinatario non atopado."
+
+#: actions/apidirectmessagenew.php:150
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr ""
+"Non se pode enviar a mensaxe directa a usuarios dos que non eres amigo."
+
 #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
 #: actions/apistatusesdestroy.php:113
 msgid "No status found with that ID."
@@ -404,16 +405,6 @@ msgstr "Non estás suscrito a ese perfil"
 msgid "Could not remove user %s to group %s."
 msgstr "Non podes seguir a este usuario: o Usuario non se atopa."
 
-#: actions/apigrouplistall.php:90 actions/usergroups.php:62
-#, php-format
-msgid "%s groups"
-msgstr ""
-
-#: actions/apigrouplistall.php:94
-#, fuzzy, php-format
-msgid "groups on %s"
-msgstr "Outras opcions"
-
 #: actions/apigrouplist.php:95
 #, fuzzy, php-format
 msgid "%s's groups"
@@ -424,6 +415,16 @@ msgstr "Usuarios"
 msgid "Groups %s is a member of on %s."
 msgstr "%1s non é unha orixe fiable."
 
+#: actions/apigrouplistall.php:90 actions/usergroups.php:62
+#, php-format
+msgid "%s groups"
+msgstr ""
+
+#: actions/apigrouplistall.php:94
+#, fuzzy, php-format
+msgid "groups on %s"
+msgstr "Outras opcions"
+
 #: actions/apistatusesdestroy.php:107
 msgid "This method requires a POST or DELETE."
 msgstr "Este método require un POST ou DELETE."
@@ -462,54 +463,54 @@ msgstr ""
 msgid "Unsupported format."
 msgstr "Formato de ficheiro de imaxe non soportado."
 
-#: actions/apitimelinefavorites.php:107
+#: actions/apitimelinefavorites.php:108
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr "%s / Favoritos dende %s"
 
-#: actions/apitimelinefavorites.php:119
+#: actions/apitimelinefavorites.php:120
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr "%s updates favorited by %s / %s."
 
-#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117
+#: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118
 #: actions/grouprss.php:131 actions/userrss.php:90
 #, php-format
 msgid "%s timeline"
 msgstr "Liña de tempo de %s"
 
-#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125
+#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
 #: actions/userrss.php:92
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Actualizacións dende %1$s en %2$s!"
 
-#: actions/apitimelinementions.php:116
+#: actions/apitimelinementions.php:117
 #, fuzzy, php-format
 msgid "%1$s / Updates mentioning %2$s"
 msgstr "%1$s / Chíos que respostan a %2$s"
 
-#: actions/apitimelinementions.php:126
+#: actions/apitimelinementions.php:127
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "Hai %1$s chíos en resposta a chíos dende %2$s / %3$s."
 
-#: actions/apitimelinepublic.php:106 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "Liña de tempo pública de %s"
 
-#: actions/apitimelinepublic.php:110 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s chíos de calquera!"
 
-#: actions/apitimelinetag.php:101 actions/tag.php:66
+#: actions/apitimelinetag.php:102 actions/tag.php:66
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Chíos tagueados con %s"
 
-#: actions/apitimelinetag.php:107 actions/tagrss.php:64
+#: actions/apitimelinetag.php:108 actions/tagrss.php:64
 #, fuzzy, php-format
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Actualizacións dende %1$s en %2$s!"
@@ -545,47 +546,47 @@ msgstr "Avatar"
 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:106 actions/avatarsettings.php:182
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:185
 #: actions/grouplogo.php:178 actions/remotesubscribe.php:191
 #: actions/userauthorization.php:72 actions/userrss.php:103
 msgid "User without matching profile"
 msgstr "Usuario sen un perfil que coincida."
 
-#: actions/avatarsettings.php:119 actions/avatarsettings.php:194
+#: actions/avatarsettings.php:119 actions/avatarsettings.php:197
 #: actions/grouplogo.php:251
 #, fuzzy
 msgid "Avatar settings"
 msgstr "Configuracións de Twitter"
 
-#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/avatarsettings.php:127 actions/avatarsettings.php:205
 #: actions/grouplogo.php:199 actions/grouplogo.php:259
 msgid "Original"
 msgstr ""
 
-#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/avatarsettings.php:142 actions/avatarsettings.php:217
 #: actions/grouplogo.php:210 actions/grouplogo.php:271
 msgid "Preview"
 msgstr ""
 
-#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
+#: actions/avatarsettings.php:149 lib/deleteuserform.php:66
 #: lib/noticelist.php:550
 #, fuzzy
 msgid "Delete"
 msgstr "eliminar"
 
-#: actions/avatarsettings.php:165 actions/grouplogo.php:233
+#: actions/avatarsettings.php:166 actions/grouplogo.php:233
 msgid "Upload"
 msgstr "Subir"
 
-#: actions/avatarsettings.php:228 actions/grouplogo.php:286
+#: actions/avatarsettings.php:231 actions/grouplogo.php:286
 msgid "Crop"
 msgstr ""
 
-#: actions/avatarsettings.php:265 actions/disfavor.php:74
+#: actions/avatarsettings.php:268 actions/disfavor.php:74
 #: actions/emailsettings.php:238 actions/favor.php:75
 #: actions/groupblock.php:66 actions/grouplogo.php:309
 #: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -596,34 +597,77 @@ msgstr ""
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Houbo un problema co teu token de sesión. Tentao de novo, anda..."
 
-#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
+#: actions/avatarsettings.php:281 actions/designadminpanel.php:103
 #: actions/emailsettings.php:256 actions/grouplogo.php:319
 #: actions/imsettings.php:220 actions/recoverpassword.php:44
 #: actions/smssettings.php:248 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "Envio de formulario non esperada."
 
-#: actions/avatarsettings.php:322
+#: actions/avatarsettings.php:328
 msgid "Pick a square area of the image to be your avatar"
 msgstr ""
 
-#: actions/avatarsettings.php:337 actions/grouplogo.php:377
+#: actions/avatarsettings.php:343 actions/grouplogo.php:377
 msgid "Lost our file data."
 msgstr ""
 
-#: actions/avatarsettings.php:360
+#: actions/avatarsettings.php:366
 msgid "Avatar updated."
 msgstr "Avatar actualizado."
 
-#: actions/avatarsettings.php:363
+#: actions/avatarsettings.php:369
 msgid "Failed updating avatar."
 msgstr "Acounteceu un fallo ó actualizar o avatar."
 
-#: actions/avatarsettings.php:387
+#: actions/avatarsettings.php:393
 #, fuzzy
 msgid "Avatar deleted."
 msgstr "Avatar actualizado."
 
+#: actions/block.php:69
+#, fuzzy
+msgid "You already blocked that user."
+msgstr "Xa bloqueaches a este usuario."
+
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
+msgid "Block user"
+msgstr "Bloquear usuario"
+
+#: actions/block.php:130
+msgid ""
+"Are you sure you want to block this user? Afterwards, they will be "
+"unsubscribed from you, unable to subscribe to you in the future, and you "
+"will not be notified of any @-replies from them."
+msgstr ""
+"Seguro que queres bloquear a este usuario? Despois diso, vai ser de-suscrito "
+"do teur perfil, non será capaz de suscribirse a ti nun futuro, e non vas a "
+"ser notificado de ningunha resposta-@ del."
+
+#: actions/block.php:143 actions/deletenotice.php:145
+#: actions/deleteuser.php:147 actions/groupblock.php:178
+msgid "No"
+msgstr "No"
+
+#: actions/block.php:143 actions/deleteuser.php:147
+#, fuzzy
+msgid "Do not block this user"
+msgstr "Bloquear usuario"
+
+#: actions/block.php:144 actions/deletenotice.php:146
+#: actions/deleteuser.php:148 actions/groupblock.php:179
+msgid "Yes"
+msgstr "Si"
+
+#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
+#, fuzzy
+msgid "Block this user"
+msgstr "Bloquear usuario"
+
+#: actions/block.php:162
+msgid "Failed to save block information."
+msgstr "Erro ao gardar información de bloqueo."
+
 #: actions/blockedfromgroup.php:73 actions/editgroup.php:84
 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
 #: actions/groupmembers.php:76 actions/grouprss.php:91
@@ -668,49 +712,6 @@ msgstr "Desbloquear"
 msgid "Unblock this user"
 msgstr "Bloquear usuario"
 
-#: actions/block.php:69
-#, fuzzy
-msgid "You already blocked that user."
-msgstr "Xa bloqueaches a este usuario."
-
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
-msgid "Block user"
-msgstr "Bloquear usuario"
-
-#: actions/block.php:130
-msgid ""
-"Are you sure you want to block this user? Afterwards, they will be "
-"unsubscribed from you, unable to subscribe to you in the future, and you "
-"will not be notified of any @-replies from them."
-msgstr ""
-"Seguro que queres bloquear a este usuario? Despois diso, vai ser de-suscrito "
-"do teur perfil, non será capaz de suscribirse a ti nun futuro, e non vas a "
-"ser notificado de ningunha resposta-@ del."
-
-#: actions/block.php:143 actions/deletenotice.php:145
-#: actions/deleteuser.php:147 actions/groupblock.php:178
-msgid "No"
-msgstr "No"
-
-#: actions/block.php:143 actions/deleteuser.php:147
-#, fuzzy
-msgid "Do not block this user"
-msgstr "Bloquear usuario"
-
-#: actions/block.php:144 actions/deletenotice.php:146
-#: actions/deleteuser.php:148 actions/groupblock.php:179
-msgid "Yes"
-msgstr "Si"
-
-#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
-#, fuzzy
-msgid "Block this user"
-msgstr "Bloquear usuario"
-
-#: actions/block.php:162
-msgid "Failed to save block information."
-msgstr "Erro ao gardar información de bloqueo."
-
 #: actions/bookmarklet.php:50
 #, fuzzy
 msgid "Post to "
@@ -1065,7 +1066,7 @@ msgstr "Enderezo de correo"
 
 #: actions/emailsettings.php:123
 msgid "Email address, like \"UserName@example.org\""
-msgstr "Dirección de correo, coma \"Nomede Usuario@exemplo.org\""
+msgstr "Dirección de correo, coma \"Nomede Usuario@example.org\""
 
 #: actions/emailsettings.php:126 actions/imsettings.php:133
 #: actions/smssettings.php:145
@@ -1201,6 +1202,14 @@ msgstr "Dirección de correo entrante eliminada."
 msgid "New incoming email address added."
 msgstr "Engadida nova dirección de correo entrante."
 
+#: actions/favor.php:79
+msgid "This notice is already a favorite!"
+msgstr "Este chío xa é un favorito!"
+
+#: actions/favor.php:92 lib/disfavorform.php:140
+msgid "Disfavor favorite"
+msgstr "Desactivar favorito"
+
 #: actions/favorited.php:65 lib/popularnoticesection.php:88
 #: lib/publicgroupnav.php:93
 msgid "Popular notices"
@@ -1244,14 +1253,6 @@ msgstr "Chíos favoritos de %s"
 msgid "Updates favored by %1$s on %2$s!"
 msgstr "Actualizacións dende %1$s en %2$s!"
 
-#: actions/favor.php:79
-msgid "This notice is already a favorite!"
-msgstr "Este chío xa é un favorito!"
-
-#: actions/favor.php:92 lib/disfavorform.php:140
-msgid "Disfavor favorite"
-msgstr "Desactivar favorito"
-
 #: actions/featured.php:69 lib/featureduserssection.php:87
 #: lib/publicgroupnav.php:89
 msgid "Featured users"
@@ -1496,6 +1497,31 @@ msgstr ""
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "Actualizacións dende %1$s en %2$s!"
 
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 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 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/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
+#, fuzzy
+msgid "Create a new group"
+msgstr "Crear nova conta"
+
 #: actions/groupsearch.php:52
 #, fuzzy, php-format
 msgid ""
@@ -1530,31 +1556,6 @@ msgid ""
 "action.newgroup%%) yourself!"
 msgstr ""
 
-#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 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 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/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
-#, fuzzy
-msgid "Create a new group"
-msgstr "Crear nova conta"
-
 #: actions/groupunblock.php:91
 msgid "Only an admin can unblock group members."
 msgstr ""
@@ -1748,7 +1749,7 @@ msgstr "Mensaxe persoal"
 msgid "Optionally add a personal message to the invitation."
 msgstr "Opcionalmente engadir unha mensaxe persoal á invitación."
 
-#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:222
 msgid "Send"
 msgstr "Enviar"
 
@@ -1857,57 +1858,57 @@ msgstr "Non podes seguir a este usuario: o Usuario non se atopa."
 msgid "%s left group %s"
 msgstr ""
 
-#: actions/login.php:82 actions/register.php:137
+#: actions/login.php:83 actions/register.php:137
 msgid "Already logged in."
 msgstr "Sesión xa iniciada"
 
-#: actions/login.php:113 actions/login.php:123
+#: actions/login.php:114 actions/login.php:124
 #, fuzzy
 msgid "Invalid or expired token."
 msgstr "Contido do chío inválido"
 
-#: actions/login.php:146
+#: actions/login.php:147
 msgid "Incorrect username or password."
 msgstr "Usuario ou contrasinal incorrectos."
 
-#: actions/login.php:152
+#: actions/login.php:153
 #, fuzzy
 msgid "Error setting user. You are probably not authorized."
 msgstr "Non está autorizado."
 
-#: actions/login.php:207 actions/login.php:260 lib/action.php:458
+#: actions/login.php:208 actions/login.php:261 lib/action.php:458
 #: lib/logingroupnav.php:79
 msgid "Login"
 msgstr "Inicio de sesión"
 
-#: actions/login.php:246
+#: actions/login.php:247
 msgid "Login to site"
 msgstr ""
 
-#: actions/login.php:249 actions/profilesettings.php:106
+#: actions/login.php:250 actions/profilesettings.php:106
 #: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
 #: lib/groupeditform.php:152 lib/userprofile.php:131
 msgid "Nickname"
 msgstr "Alcume"
 
-#: actions/login.php:252 actions/register.php:428
+#: actions/login.php:253 actions/register.php:428
 #: lib/accountsettingsaction.php:116
 msgid "Password"
 msgstr "Contrasinal"
 
-#: actions/login.php:255 actions/register.php:477
+#: actions/login.php:256 actions/register.php:477
 msgid "Remember me"
 msgstr "Lembrarme"
 
-#: actions/login.php:256 actions/register.php:479
+#: actions/login.php:257 actions/register.php:479
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Endiante acceder automáticamente, coidado en equipos compartidos!"
 
-#: actions/login.php:266
+#: actions/login.php:267
 msgid "Lost or forgotten password?"
 msgstr "¿Perdeches a contrasinal?"
 
-#: actions/login.php:285
+#: actions/login.php:286
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -1915,7 +1916,7 @@ msgstr ""
 "Por razóns de seguranza, por favor re-insire o teu nome de usuario e "
 "contrasinal antes de cambiar as túas preferenzas."
 
-#: actions/login.php:289
+#: actions/login.php:290
 #, fuzzy, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -1990,7 +1991,7 @@ msgstr "Non hai mensaxes de texto!"
 msgid "Direct message to %s sent"
 msgstr "Mensaxe directo a %s enviado"
 
-#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:242 lib/channel.php:170
 msgid "Ajax Error"
 msgstr "Erro de Ajax"
 
@@ -1998,7 +1999,7 @@ msgstr "Erro de Ajax"
 msgid "New notice"
 msgstr "Novo chío"
 
-#: actions/newnotice.php:206
+#: actions/newnotice.php:208
 msgid "Notice posted"
 msgstr "Chío publicado"
 
@@ -2077,8 +2078,8 @@ msgstr "Conectar"
 msgid "Only "
 msgstr ""
 
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996
-#: lib/api.php:1024 lib/api.php:1134
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011
+#: lib/api.php:1039 lib/api.php:1149
 msgid "Not a supported data format."
 msgstr "Non é un formato de datos soportado."
 
@@ -3669,6 +3670,26 @@ msgstr "Jabber."
 msgid "SMS"
 msgstr "SMS"
 
+#: actions/tag.php:68
+#, fuzzy, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr "Chíos tagueados con %s"
+
+#: actions/tag.php:86
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "Fonte de chíos para %s"
+
+#: actions/tag.php:92
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "Fonte de chíos para %s"
+
+#: actions/tag.php:98
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "Fonte de chíos para %s"
+
 #: actions/tagother.php:33
 msgid "Not logged in"
 msgstr "Non estás logueado."
@@ -3721,26 +3742,6 @@ msgstr ""
 "Usa este formulario para engadir etiquetas aos teus seguidores ou aos que "
 "sigues."
 
-#: actions/tag.php:68
-#, fuzzy, php-format
-msgid "Notices tagged with %s, page %d"
-msgstr "Chíos tagueados con %s"
-
-#: actions/tag.php:86
-#, fuzzy, php-format
-msgid "Notice feed for tag %s (RSS 1.0)"
-msgstr "Fonte de chíos para %s"
-
-#: actions/tag.php:92
-#, fuzzy, php-format
-msgid "Notice feed for tag %s (RSS 2.0)"
-msgstr "Fonte de chíos para %s"
-
-#: actions/tag.php:98
-#, fuzzy, php-format
-msgid "Notice feed for tag %s (Atom)"
-msgstr "Fonte de chíos para %s"
-
 #: actions/tagrss.php:35
 msgid "No such tag."
 msgstr "Non existe a etiqueta."
@@ -4055,23 +4056,23 @@ msgstr "Non se puido actualizar a mensaxe coa nova URI."
 msgid "DB error inserting hashtag: %s"
 msgstr "Erro ó inserir o hashtag na BD: %s"
 
-#: classes/Notice.php:179
+#: classes/Notice.php:188
 #, fuzzy
 msgid "Problem saving notice. Too long."
 msgstr "Aconteceu un erro ó gardar o chío."
 
-#: classes/Notice.php:183
+#: classes/Notice.php:192
 msgid "Problem saving notice. Unknown user."
 msgstr "Aconteceu un erro ó gardar o chío. Usuario descoñecido."
 
-#: classes/Notice.php:188
+#: classes/Notice.php:197
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 "Demasiados chíos en pouco tempo; tomate un respiro e envíao de novo dentro "
 "duns minutos."
 
-#: classes/Notice.php:194
+#: classes/Notice.php:203
 #, fuzzy
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
@@ -4080,19 +4081,24 @@ msgstr ""
 "Demasiados chíos en pouco tempo; tomate un respiro e envíao de novo dentro "
 "duns minutos."
 
-#: classes/Notice.php:200
+#: classes/Notice.php:209
 msgid "You are banned from posting notices on this site."
 msgstr "Tes restrinxido o envio de chíos neste sitio."
 
-#: classes/Notice.php:265 classes/Notice.php:290
+#: classes/Notice.php:274 classes/Notice.php:299
 msgid "Problem saving notice."
 msgstr "Aconteceu un erro ó gardar o chío."
 
-#: classes/Notice.php:1124
+#: classes/Notice.php:1115
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Erro ó inserir a contestación na BD: %s"
 
+#: classes/User.php:347
+#, fuzzy, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr "Mensaxe de %1$s en %2$s"
+
 #: classes/User_group.php:380
 #, fuzzy
 msgid "Could not create group."
@@ -4103,11 +4109,6 @@ msgstr "Non se puido crear o favorito."
 msgid "Could not set group membership."
 msgstr "Non se pode gardar a subscrición."
 
-#: classes/User.php:347
-#, fuzzy, php-format
-msgid "Welcome to %1$s, @%2$s!"
-msgstr "Mensaxe de %1$s en %2$s"
-
 #: lib/accountsettingsaction.php:108
 msgid "Change your profile settings"
 msgstr "Configuración de perfil"
@@ -4438,7 +4439,7 @@ msgstr ""
 msgid "Notice with that id does not exist"
 msgstr ""
 
-#: lib/command.php:168 lib/command.php:416 lib/command.php:471
+#: lib/command.php:168 lib/command.php:416 lib/command.php:472
 msgid "User has no last notice"
 msgstr "O usuario non ten último chio."
 
@@ -4485,74 +4486,74 @@ msgstr "Erro ó enviar a mensaxe directa."
 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
+#: lib/command.php:440
 #, php-format
 msgid "Reply to %s sent"
 msgstr "Non se pode eliminar este chíos."
 
-#: lib/command.php:441
+#: lib/command.php:442
 #, fuzzy
 msgid "Error saving notice."
 msgstr "Aconteceu un erro ó gardar o chío."
 
-#: lib/command.php:495
+#: lib/command.php:496
 msgid "Specify the name of the user to subscribe to"
 msgstr "Especifica o nome do usuario ó que queres suscribirte"
 
-#: lib/command.php:502
+#: lib/command.php:503
 #, php-format
 msgid "Subscribed to %s"
 msgstr "Suscrito a %s"
 
-#: lib/command.php:523
+#: lib/command.php:524
 msgid "Specify the name of the user to unsubscribe from"
 msgstr "Especifica o nome de usuario ó que queres deixar de seguir"
 
-#: lib/command.php:530
+#: lib/command.php:531
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr "Desuscribir de %s"
 
-#: lib/command.php:548 lib/command.php:571
+#: lib/command.php:549 lib/command.php:572
 msgid "Command not yet implemented."
 msgstr "Comando non implementado."
 
-#: lib/command.php:551
+#: lib/command.php:552
 msgid "Notification off."
 msgstr "Notificación desactivada."
 
-#: lib/command.php:553
+#: lib/command.php:554
 msgid "Can't turn off notification."
 msgstr "No se pode desactivar a notificación."
 
-#: lib/command.php:574
+#: lib/command.php:575
 msgid "Notification on."
 msgstr "Notificación habilitada."
 
-#: lib/command.php:576
+#: lib/command.php:577
 msgid "Can't turn on notification."
 msgstr "Non se pode activar a notificación."
 
-#: lib/command.php:588
+#: lib/command.php:590
 msgid "Login command is disabled"
 msgstr ""
 
-#: lib/command.php:602
+#: lib/command.php:604
 #, fuzzy, php-format
 msgid "Could not create login token for %s"
 msgstr "Non se puido crear o favorito."
 
-#: lib/command.php:607
+#: lib/command.php:609
 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:623
+#: lib/command.php:625
 #, fuzzy
 msgid "You are not subscribed to anyone."
 msgstr "Non estás suscrito a ese perfil"
 
-#: lib/command.php:625
+#: lib/command.php:627
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Xa estas suscrito a estes usuarios:"
@@ -4561,12 +4562,12 @@ msgstr[2] ""
 msgstr[3] ""
 msgstr[4] ""
 
-#: lib/command.php:645
+#: lib/command.php:647
 #, fuzzy
 msgid "No one is subscribed to you."
 msgstr "Outro usuario non se puido suscribir a ti."
 
-#: lib/command.php:647
+#: lib/command.php:649
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Outro usuario non se puido suscribir a ti."
@@ -4575,12 +4576,12 @@ msgstr[2] ""
 msgstr[3] ""
 msgstr[4] ""
 
-#: lib/command.php:667
+#: lib/command.php:669
 #, fuzzy
 msgid "You are not a member of any groups."
 msgstr "Non estás suscrito a ese perfil"
 
-#: lib/command.php:669
+#: lib/command.php:671
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Non estás suscrito a ese perfil"
@@ -4589,7 +4590,7 @@ msgstr[2] ""
 msgstr[3] ""
 msgstr[4] ""
 
-#: lib/command.php:683
+#: lib/command.php:685
 #, fuzzy
 msgid ""
 "Commands:\n"
@@ -4717,10 +4718,6 @@ msgstr "%s chíos favoritos"
 msgid "Favor"
 msgstr "Gostame"
 
-#: lib/feedlist.php:64
-msgid "Export data"
-msgstr ""
-
 #: lib/feed.php:85
 msgid "RSS 1.0"
 msgstr ""
@@ -4737,6 +4734,10 @@ msgstr ""
 msgid "FOAF"
 msgstr ""
 
+#: lib/feedlist.php:64
+msgid "Export data"
+msgstr ""
+
 #: lib/galleryaction.php:121
 msgid "Filter tags"
 msgstr "Filtrar etiquetas"
@@ -4908,21 +4909,6 @@ msgstr "Accede co teu nome de usuario e contrasinal."
 msgid "Sign up for a new account"
 msgstr "Crear nova conta"
 
-#: lib/mailbox.php:89
-msgid "Only the user can read their own mailboxes."
-msgstr "Só o usuario pode ler os seus propios buzóns."
-
-#: lib/mailbox.php:139
-msgid ""
-"You have no private messages. You can send private message to engage other "
-"users in conversation. People can send you messages for your eyes only."
-msgstr ""
-
-#: lib/mailbox.php:227 lib/noticelist.php:452
-#, fuzzy
-msgid "from"
-msgstr " dende "
-
 #: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Confirmar correo electrónico"
@@ -5161,6 +5147,21 @@ msgid ""
 "\n"
 msgstr ""
 
+#: lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
+msgstr "Só o usuario pode ler os seus propios buzóns."
+
+#: lib/mailbox.php:139
+msgid ""
+"You have no private messages. You can send private message to engage other "
+"users in conversation. People can send you messages for your eyes only."
+msgstr ""
+
+#: lib/mailbox.php:227 lib/noticelist.php:452
+#, fuzzy
+msgid "from"
+msgstr " dende "
+
 #: lib/mediafile.php:98 lib/mediafile.php:123
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
@@ -5222,7 +5223,7 @@ msgstr "Eliminar chío"
 msgid "To"
 msgstr "A"
 
-#: lib/messageform.php:161 lib/noticeform.php:185
+#: lib/messageform.php:159 lib/noticeform.php:183
 #, fuzzy
 msgid "Available characters"
 msgstr "6 ou máis caracteres"
@@ -5237,11 +5238,11 @@ msgstr "Dar un toque"
 msgid "What's up, %s?"
 msgstr "¿Que pasa, %s?"
 
-#: lib/noticeform.php:192
+#: lib/noticeform.php:190
 msgid "Attach"
 msgstr ""
 
-#: lib/noticeform.php:196
+#: lib/noticeform.php:194
 msgid "Attach a file"
 msgstr ""
 
@@ -5318,12 +5319,12 @@ msgstr "Aconteceu un erro ó inserir o perfil remoto"
 msgid "Duplicate notice"
 msgstr "Eliminar chío"
 
-#: lib/oauthstore.php:467 lib/subs.php:48
+#: lib/oauthstore.php:466 lib/subs.php:48
 #, fuzzy
 msgid "You have been banned from subscribing."
 msgstr "Este usuario non che permite suscribirte a el."
 
-#: lib/oauthstore.php:492
+#: lib/oauthstore.php:491
 msgid "Couldn't insert new subscription."
 msgstr "Non se puido inserir a nova subscrición."
 
@@ -5495,20 +5496,6 @@ msgstr "Suscrito a %s"
 msgid "Groups %s is a member of"
 msgstr ""
 
-#: lib/subscriberspeopleselftagcloudsection.php:48
-#: lib/subscriptionspeopleselftagcloudsection.php:48
-msgid "People Tagcloud as self-tagged"
-msgstr ""
-
-#: lib/subscriberspeopletagcloudsection.php:48
-#: lib/subscriptionspeopletagcloudsection.php:48
-msgid "People Tagcloud as tagged"
-msgstr ""
-
-#: lib/subscriptionlist.php:126
-msgid "(none)"
-msgstr "(nada)"
-
 #: lib/subs.php:52
 msgid "Already subscribed!"
 msgstr ""
@@ -5539,6 +5526,20 @@ msgstr "Non se pode eliminar a subscrición."
 msgid "Couldn't delete subscription."
 msgstr "Non se pode eliminar a subscrición."
 
+#: 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/subscriptionlist.php:126
+msgid "(none)"
+msgstr "(nada)"
+
 #: lib/tagcloudsection.php:56
 #, fuzzy
 msgid "None"
diff --git a/locale/he/LC_MESSAGES/statusnet.po b/locale/he/LC_MESSAGES/statusnet.po
index a6d463d533..48606c28a0 100644
--- a/locale/he/LC_MESSAGES/statusnet.po
+++ b/locale/he/LC_MESSAGES/statusnet.po
@@ -7,12 +7,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 21:25+0000\n"
-"PO-Revision-Date: 2009-12-07 21:26:36+0000\n"
+"POT-Creation-Date: 2009-12-12 17:09+0000\n"
+"PO-Revision-Date: 2009-12-12 17:09:46+0000\n"
 "Language-Team: Hebrew\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n"
+"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: out-statusnet\n"
@@ -26,11 +26,11 @@ msgstr "אין הודעה כזו."
 
 #: actions/all.php:74 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofile.php:105
 #: actions/apiaccountupdateprofilebackgroundimage.php:116
-#: actions/apiaccountupdateprofileimage.php:105
-#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
-#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
-#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
+#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90
 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
@@ -43,7 +43,7 @@ msgstr "אין הודעה כזו."
 #: actions/repliesrss.php:38 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38
 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
-#: lib/command.php:364 lib/command.php:411 lib/command.php:466
+#: lib/command.php:364 lib/command.php:411 lib/command.php:467
 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
 #: lib/subs.php:34 lib/subs.php:116
 msgid "No such user."
@@ -55,7 +55,7 @@ msgid "%s and friends, page %d"
 msgstr "%s וחברים"
 
 #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
-#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100
+#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s וחברים"
@@ -107,25 +107,25 @@ msgstr ""
 msgid "You and friends"
 msgstr "%s וחברים"
 
-#: actions/allrss.php:119 actions/apitimelinefriends.php:121
+#: actions/allrss.php:119 actions/apitimelinefriends.php:122
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr ""
 
 #: actions/apiaccountratelimitstatus.php:70
 #: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofile.php:97
 #: actions/apiaccountupdateprofilebackgroundimage.php:94
 #: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apiaccountupdateprofile.php:97
 #, fuzzy
 msgid "API method not found."
 msgstr "קוד האישור לא נמצא."
 
 #: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofile.php:89
 #: actions/apiaccountupdateprofilebackgroundimage.php:86
 #: actions/apiaccountupdateprofilecolors.php:110
-#: actions/apiaccountupdateprofileimage.php:84
-#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
+#: actions/apiaccountupdateprofileimage.php:84 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
@@ -145,9 +145,23 @@ msgstr ""
 msgid "Could not update user."
 msgstr "עידכון המשתמש נכשל."
 
+#: actions/apiaccountupdateprofile.php:112
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+msgid "User has no profile."
+msgstr "למשתמש אין פרופיל."
+
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "שמירת הפרופיל נכשלה."
+
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257
 #: actions/designadminpanel.php:122 actions/newnotice.php:94
 #: lib/designsettings.php:283
 #, php-format
@@ -169,20 +183,6 @@ msgstr ""
 msgid "Could not update your design."
 msgstr "עידכון המשתמש נכשל."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
-#: actions/apiaccountupdateprofileimage.php:130
-#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
-#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
-msgid "User has no profile."
-msgstr "למשתמש אין פרופיל."
-
-#: actions/apiaccountupdateprofile.php:147
-#, fuzzy
-msgid "Could not save profile."
-msgstr "שמירת הפרופיל נכשלה."
-
 #: actions/apiblockcreate.php:105
 #, fuzzy
 msgid "You cannot block yourself!"
@@ -196,23 +196,6 @@ msgstr ""
 msgid "Unblock user failed."
 msgstr ""
 
-#: actions/apidirectmessagenew.php:126
-msgid "No message text!"
-msgstr ""
-
-#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
-#, fuzzy, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr "זה ארוך מידי. אורך מירבי להודעה הוא 140 אותיות."
-
-#: actions/apidirectmessagenew.php:146
-msgid "Recipient user not found."
-msgstr ""
-
-#: actions/apidirectmessagenew.php:150
-msgid "Can't send direct messages to users who aren't your friend."
-msgstr ""
-
 #: actions/apidirectmessage.php:89
 #, php-format
 msgid "Direct messages from %s"
@@ -238,18 +221,35 @@ msgstr ""
 #: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
-#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
-#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149
-#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
-#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156
+#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151
+#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141
+#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
 msgid "API method not found!"
 msgstr ""
 
+#: actions/apidirectmessagenew.php:126
+msgid "No message text!"
+msgstr ""
+
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, fuzzy, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "זה ארוך מידי. אורך מירבי להודעה הוא 140 אותיות."
+
+#: actions/apidirectmessagenew.php:146
+msgid "Recipient user not found."
+msgstr ""
+
+#: actions/apidirectmessagenew.php:150
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr ""
+
 #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
 #: actions/apistatusesdestroy.php:113
 msgid "No status found with that ID."
@@ -398,16 +398,6 @@ msgstr "לא שלחנו אלינו את הפרופיל הזה"
 msgid "Could not remove user %s to group %s."
 msgstr "נכשלה יצירת OpenID מתוך: %s"
 
-#: actions/apigrouplistall.php:90 actions/usergroups.php:62
-#, php-format
-msgid "%s groups"
-msgstr ""
-
-#: actions/apigrouplistall.php:94
-#, php-format
-msgid "groups on %s"
-msgstr ""
-
 #: actions/apigrouplist.php:95
 #, fuzzy, php-format
 msgid "%s's groups"
@@ -418,6 +408,16 @@ msgstr "פרופיל"
 msgid "Groups %s is a member of on %s."
 msgstr "לא שלחנו אלינו את הפרופיל הזה"
 
+#: actions/apigrouplistall.php:90 actions/usergroups.php:62
+#, php-format
+msgid "%s groups"
+msgstr ""
+
+#: actions/apigrouplistall.php:94
+#, php-format
+msgid "groups on %s"
+msgstr ""
+
 #: actions/apistatusesdestroy.php:107
 msgid "This method requires a POST or DELETE."
 msgstr ""
@@ -455,54 +455,54 @@ msgstr ""
 msgid "Unsupported format."
 msgstr "פורמט התמונה אינו נתמך."
 
-#: actions/apitimelinefavorites.php:107
+#: actions/apitimelinefavorites.php:108
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr ""
 
-#: actions/apitimelinefavorites.php:119
+#: actions/apitimelinefavorites.php:120
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr ""
 
-#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117
+#: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118
 #: actions/grouprss.php:131 actions/userrss.php:90
 #, php-format
 msgid "%s timeline"
 msgstr ""
 
-#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125
+#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
 #: actions/userrss.php:92
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr ""
 
-#: actions/apitimelinementions.php:116
+#: actions/apitimelinementions.php:117
 #, fuzzy, php-format
 msgid "%1$s / Updates mentioning %2$s"
 msgstr "הסטטוס של %1$s ב-%2$s "
 
-#: actions/apitimelinementions.php:126
+#: actions/apitimelinementions.php:127
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr ""
 
-#: actions/apitimelinepublic.php:106 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr ""
 
-#: actions/apitimelinepublic.php:110 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr ""
 
-#: actions/apitimelinetag.php:101 actions/tag.php:66
+#: actions/apitimelinetag.php:102 actions/tag.php:66
 #, php-format
 msgid "Notices tagged with %s"
 msgstr ""
 
-#: actions/apitimelinetag.php:107 actions/tagrss.php:64
+#: actions/apitimelinetag.php:108 actions/tagrss.php:64
 #, fuzzy, php-format
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr "מיקרובלוג מאת %s"
@@ -539,47 +539,47 @@ msgstr "תמונה"
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr ""
 
-#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:185
 #: actions/grouplogo.php:178 actions/remotesubscribe.php:191
 #: actions/userauthorization.php:72 actions/userrss.php:103
 msgid "User without matching profile"
 msgstr ""
 
-#: actions/avatarsettings.php:119 actions/avatarsettings.php:194
+#: actions/avatarsettings.php:119 actions/avatarsettings.php:197
 #: actions/grouplogo.php:251
 #, fuzzy
 msgid "Avatar settings"
 msgstr "הגדרות"
 
-#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/avatarsettings.php:127 actions/avatarsettings.php:205
 #: actions/grouplogo.php:199 actions/grouplogo.php:259
 msgid "Original"
 msgstr ""
 
-#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/avatarsettings.php:142 actions/avatarsettings.php:217
 #: actions/grouplogo.php:210 actions/grouplogo.php:271
 msgid "Preview"
 msgstr ""
 
-#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
+#: actions/avatarsettings.php:149 lib/deleteuserform.php:66
 #: lib/noticelist.php:550
 #, fuzzy
 msgid "Delete"
 msgstr "מחק"
 
-#: actions/avatarsettings.php:165 actions/grouplogo.php:233
+#: actions/avatarsettings.php:166 actions/grouplogo.php:233
 msgid "Upload"
 msgstr "ההעלה"
 
-#: actions/avatarsettings.php:228 actions/grouplogo.php:286
+#: actions/avatarsettings.php:231 actions/grouplogo.php:286
 msgid "Crop"
 msgstr ""
 
-#: actions/avatarsettings.php:265 actions/disfavor.php:74
+#: actions/avatarsettings.php:268 actions/disfavor.php:74
 #: actions/emailsettings.php:238 actions/favor.php:75
 #: actions/groupblock.php:66 actions/grouplogo.php:309
 #: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -590,34 +590,75 @@ msgstr ""
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
-#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
+#: actions/avatarsettings.php:281 actions/designadminpanel.php:103
 #: actions/emailsettings.php:256 actions/grouplogo.php:319
 #: actions/imsettings.php:220 actions/recoverpassword.php:44
 #: actions/smssettings.php:248 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "הגשת טופס לא צפויה."
 
-#: actions/avatarsettings.php:322
+#: actions/avatarsettings.php:328
 msgid "Pick a square area of the image to be your avatar"
 msgstr ""
 
-#: actions/avatarsettings.php:337 actions/grouplogo.php:377
+#: actions/avatarsettings.php:343 actions/grouplogo.php:377
 msgid "Lost our file data."
 msgstr ""
 
-#: actions/avatarsettings.php:360
+#: actions/avatarsettings.php:366
 msgid "Avatar updated."
 msgstr "התמונה עודכנה."
 
-#: actions/avatarsettings.php:363
+#: actions/avatarsettings.php:369
 msgid "Failed updating avatar."
 msgstr "עדכון התמונה נכשל."
 
-#: actions/avatarsettings.php:387
+#: actions/avatarsettings.php:393
 #, fuzzy
 msgid "Avatar deleted."
 msgstr "התמונה עודכנה."
 
+#: actions/block.php:69
+#, fuzzy
+msgid "You already blocked that user."
+msgstr "כבר נכנסת למערכת!"
+
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
+#, fuzzy
+msgid "Block user"
+msgstr "אין משתמש כזה."
+
+#: actions/block.php:130
+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/block.php:143 actions/deletenotice.php:145
+#: actions/deleteuser.php:147 actions/groupblock.php:178
+msgid "No"
+msgstr "לא"
+
+#: actions/block.php:143 actions/deleteuser.php:147
+#, fuzzy
+msgid "Do not block this user"
+msgstr "אין משתמש כזה."
+
+#: actions/block.php:144 actions/deletenotice.php:146
+#: actions/deleteuser.php:148 actions/groupblock.php:179
+msgid "Yes"
+msgstr "כן"
+
+#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
+#, fuzzy
+msgid "Block this user"
+msgstr "אין משתמש כזה."
+
+#: actions/block.php:162
+msgid "Failed to save block information."
+msgstr ""
+
 #: actions/blockedfromgroup.php:73 actions/editgroup.php:84
 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
 #: actions/groupmembers.php:76 actions/grouprss.php:91
@@ -662,47 +703,6 @@ msgstr ""
 msgid "Unblock this user"
 msgstr "אין משתמש כזה."
 
-#: actions/block.php:69
-#, fuzzy
-msgid "You already blocked that user."
-msgstr "כבר נכנסת למערכת!"
-
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
-#, fuzzy
-msgid "Block user"
-msgstr "אין משתמש כזה."
-
-#: actions/block.php:130
-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/block.php:143 actions/deletenotice.php:145
-#: actions/deleteuser.php:147 actions/groupblock.php:178
-msgid "No"
-msgstr "לא"
-
-#: actions/block.php:143 actions/deleteuser.php:147
-#, fuzzy
-msgid "Do not block this user"
-msgstr "אין משתמש כזה."
-
-#: actions/block.php:144 actions/deletenotice.php:146
-#: actions/deleteuser.php:148 actions/groupblock.php:179
-msgid "Yes"
-msgstr "כן"
-
-#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
-#, fuzzy
-msgid "Block this user"
-msgstr "אין משתמש כזה."
-
-#: actions/block.php:162
-msgid "Failed to save block information."
-msgstr ""
-
 #: actions/bookmarklet.php:50
 msgid "Post to "
 msgstr ""
@@ -1179,6 +1179,14 @@ msgstr ""
 msgid "New incoming email address added."
 msgstr ""
 
+#: actions/favor.php:79
+msgid "This notice is already a favorite!"
+msgstr ""
+
+#: actions/favor.php:92 lib/disfavorform.php:140
+msgid "Disfavor favorite"
+msgstr ""
+
 #: actions/favorited.php:65 lib/popularnoticesection.php:88
 #: lib/publicgroupnav.php:93
 #, fuzzy
@@ -1222,14 +1230,6 @@ msgstr ""
 msgid "Updates favored by %1$s on %2$s!"
 msgstr "מיקרובלוג מאת %s"
 
-#: actions/favor.php:79
-msgid "This notice is already a favorite!"
-msgstr ""
-
-#: actions/favor.php:92 lib/disfavorform.php:140
-msgid "Disfavor favorite"
-msgstr ""
-
 #: actions/featured.php:69 lib/featureduserssection.php:87
 #: lib/publicgroupnav.php:89
 msgid "Featured users"
@@ -1473,6 +1473,31 @@ msgstr ""
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "מיקרובלוג מאת %s"
 
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 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 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/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
+#, fuzzy
+msgid "Create a new group"
+msgstr "צור חשבון חדש"
+
 #: actions/groupsearch.php:52
 #, fuzzy, php-format
 msgid ""
@@ -1507,31 +1532,6 @@ msgid ""
 "action.newgroup%%) yourself!"
 msgstr ""
 
-#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 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 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/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
-#, fuzzy
-msgid "Create a new group"
-msgstr "צור חשבון חדש"
-
 #: actions/groupunblock.php:91
 msgid "Only an admin can unblock group members."
 msgstr ""
@@ -1720,7 +1720,7 @@ msgstr ""
 msgid "Optionally add a personal message to the invitation."
 msgstr ""
 
-#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:222
 msgid "Send"
 msgstr "שלח"
 
@@ -1802,63 +1802,63 @@ msgstr "נכשלה יצירת OpenID מתוך: %s"
 msgid "%s left group %s"
 msgstr ""
 
-#: actions/login.php:82 actions/register.php:137
+#: actions/login.php:83 actions/register.php:137
 msgid "Already logged in."
 msgstr "כבר מחובר."
 
-#: actions/login.php:113 actions/login.php:123
+#: actions/login.php:114 actions/login.php:124
 #, fuzzy
 msgid "Invalid or expired token."
 msgstr "תוכן ההודעה לא חוקי"
 
-#: actions/login.php:146
+#: actions/login.php:147
 msgid "Incorrect username or password."
 msgstr "שם משתמש או סיסמה לא נכונים."
 
-#: actions/login.php:152
+#: actions/login.php:153
 #, fuzzy
 msgid "Error setting user. You are probably not authorized."
 msgstr "לא מורשה."
 
-#: actions/login.php:207 actions/login.php:260 lib/action.php:458
+#: actions/login.php:208 actions/login.php:261 lib/action.php:458
 #: lib/logingroupnav.php:79
 msgid "Login"
 msgstr "היכנס"
 
-#: actions/login.php:246
+#: actions/login.php:247
 msgid "Login to site"
 msgstr ""
 
-#: actions/login.php:249 actions/profilesettings.php:106
+#: actions/login.php:250 actions/profilesettings.php:106
 #: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
 #: lib/groupeditform.php:152 lib/userprofile.php:131
 msgid "Nickname"
 msgstr "כינוי"
 
-#: actions/login.php:252 actions/register.php:428
+#: actions/login.php:253 actions/register.php:428
 #: lib/accountsettingsaction.php:116
 msgid "Password"
 msgstr "סיסמה"
 
-#: actions/login.php:255 actions/register.php:477
+#: actions/login.php:256 actions/register.php:477
 msgid "Remember me"
 msgstr "זכור אותי"
 
-#: actions/login.php:256 actions/register.php:479
+#: actions/login.php:257 actions/register.php:479
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "בעתיד התחבר אוטומטית; לא לשימוש במחשבים ציבוריים!"
 
-#: actions/login.php:266
+#: actions/login.php:267
 msgid "Lost or forgotten password?"
 msgstr "שכחת או איבדת את הסיסמה?"
 
-#: actions/login.php:285
+#: actions/login.php:286
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 msgstr "לצרכי אבטחה, הכנס מחדש את שם המשתמש והסיסמה לפני שתשנה את ההגדרות."
 
-#: actions/login.php:289
+#: actions/login.php:290
 #, fuzzy, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -1930,7 +1930,7 @@ msgstr "הודעה חדשה"
 msgid "Direct message to %s sent"
 msgstr ""
 
-#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:242 lib/channel.php:170
 msgid "Ajax Error"
 msgstr ""
 
@@ -1938,7 +1938,7 @@ msgstr ""
 msgid "New notice"
 msgstr "הודעה חדשה"
 
-#: actions/newnotice.php:206
+#: actions/newnotice.php:208
 #, fuzzy
 msgid "Notice posted"
 msgstr "הודעות"
@@ -2016,8 +2016,8 @@ msgstr "התחבר"
 msgid "Only "
 msgstr ""
 
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996
-#: lib/api.php:1024 lib/api.php:1134
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011
+#: lib/api.php:1039 lib/api.php:1149
 msgid "Not a supported data format."
 msgstr ""
 
@@ -3540,6 +3540,26 @@ msgstr "אין זיהוי Jabber כזה."
 msgid "SMS"
 msgstr "סמס"
 
+#: actions/tag.php:68
+#, fuzzy, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr "מיקרובלוג מאת %s"
+
+#: actions/tag.php:86
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "הזנת הודעות של %s"
+
+#: actions/tag.php:92
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "הזנת הודעות של %s"
+
+#: actions/tag.php:98
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "הזנת הודעות של %s"
+
 #: actions/tagother.php:33
 #, fuzzy
 msgid "Not logged in"
@@ -3588,26 +3608,6 @@ msgstr "שמירת מידע התמונה נכשל"
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 
-#: actions/tag.php:68
-#, fuzzy, php-format
-msgid "Notices tagged with %s, page %d"
-msgstr "מיקרובלוג מאת %s"
-
-#: actions/tag.php:86
-#, fuzzy, php-format
-msgid "Notice feed for tag %s (RSS 1.0)"
-msgstr "הזנת הודעות של %s"
-
-#: actions/tag.php:92
-#, fuzzy, php-format
-msgid "Notice feed for tag %s (RSS 2.0)"
-msgstr "הזנת הודעות של %s"
-
-#: actions/tag.php:98
-#, fuzzy, php-format
-msgid "Notice feed for tag %s (Atom)"
-msgstr "הזנת הודעות של %s"
-
 #: actions/tagrss.php:35
 #, fuzzy
 msgid "No such tag."
@@ -3919,40 +3919,45 @@ msgstr ""
 msgid "DB error inserting hashtag: %s"
 msgstr ""
 
-#: classes/Notice.php:179
+#: classes/Notice.php:188
 #, fuzzy
 msgid "Problem saving notice. Too long."
 msgstr "בעיה בשמירת ההודעה."
 
-#: classes/Notice.php:183
+#: classes/Notice.php:192
 #, fuzzy
 msgid "Problem saving notice. Unknown user."
 msgstr "בעיה בשמירת ההודעה."
 
-#: classes/Notice.php:188
+#: classes/Notice.php:197
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
-#: classes/Notice.php:194
+#: classes/Notice.php:203
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
 msgstr ""
 
-#: classes/Notice.php:200
+#: classes/Notice.php:209
 msgid "You are banned from posting notices on this site."
 msgstr ""
 
-#: classes/Notice.php:265 classes/Notice.php:290
+#: classes/Notice.php:274 classes/Notice.php:299
 msgid "Problem saving notice."
 msgstr "בעיה בשמירת ההודעה."
 
-#: classes/Notice.php:1124
+#: classes/Notice.php:1115
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "שגיאת מסד נתונים בהכנסת התגובה: %s"
 
+#: classes/User.php:347
+#, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr ""
+
 #: classes/User_group.php:380
 #, fuzzy
 msgid "Could not create group."
@@ -3963,11 +3968,6 @@ msgstr "שמירת מידע התמונה נכשל"
 msgid "Could not set group membership."
 msgstr "יצירת המנוי נכשלה."
 
-#: classes/User.php:347
-#, php-format
-msgid "Welcome to %1$s, @%2$s!"
-msgstr ""
-
 #: lib/accountsettingsaction.php:108
 msgid "Change your profile settings"
 msgstr ""
@@ -4285,7 +4285,7 @@ msgstr ""
 msgid "Notice with that id does not exist"
 msgstr ""
 
-#: lib/command.php:168 lib/command.php:416 lib/command.php:471
+#: lib/command.php:168 lib/command.php:416 lib/command.php:472
 msgid "User has no last notice"
 msgstr ""
 
@@ -4332,102 +4332,102 @@ msgstr ""
 msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr ""
 
-#: lib/command.php:439
+#: lib/command.php:440
 #, fuzzy, php-format
 msgid "Reply to %s sent"
 msgstr "תגובת עבור %s"
 
-#: lib/command.php:441
+#: lib/command.php:442
 #, fuzzy
 msgid "Error saving notice."
 msgstr "בעיה בשמירת ההודעה."
 
-#: lib/command.php:495
+#: lib/command.php:496
 msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: lib/command.php:502
+#: lib/command.php:503
 #, php-format
 msgid "Subscribed to %s"
 msgstr ""
 
-#: lib/command.php:523
+#: lib/command.php:524
 msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: lib/command.php:530
+#: lib/command.php:531
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr ""
 
-#: lib/command.php:548 lib/command.php:571
+#: lib/command.php:549 lib/command.php:572
 msgid "Command not yet implemented."
 msgstr ""
 
-#: lib/command.php:551
+#: lib/command.php:552
 msgid "Notification off."
 msgstr ""
 
-#: lib/command.php:553
+#: lib/command.php:554
 msgid "Can't turn off notification."
 msgstr ""
 
-#: lib/command.php:574
+#: lib/command.php:575
 msgid "Notification on."
 msgstr ""
 
-#: lib/command.php:576
+#: lib/command.php:577
 msgid "Can't turn on notification."
 msgstr ""
 
-#: lib/command.php:588
+#: lib/command.php:590
 msgid "Login command is disabled"
 msgstr ""
 
-#: lib/command.php:602
+#: lib/command.php:604
 #, fuzzy, php-format
 msgid "Could not create login token for %s"
 msgstr "שמירת מידע התמונה נכשל"
 
-#: lib/command.php:607
+#: lib/command.php:609
 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:623
+#: lib/command.php:625
 #, fuzzy
 msgid "You are not subscribed to anyone."
 msgstr "לא שלחנו אלינו את הפרופיל הזה"
 
-#: lib/command.php:625
+#: lib/command.php:627
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "לא שלחנו אלינו את הפרופיל הזה"
 msgstr[1] "לא שלחנו אלינו את הפרופיל הזה"
 
-#: lib/command.php:645
+#: lib/command.php:647
 #, fuzzy
 msgid "No one is subscribed to you."
 msgstr "הרשמה מרוחקת"
 
-#: lib/command.php:647
+#: lib/command.php:649
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "הרשמה מרוחקת"
 msgstr[1] "הרשמה מרוחקת"
 
-#: lib/command.php:667
+#: lib/command.php:669
 #, fuzzy
 msgid "You are not a member of any groups."
 msgstr "לא שלחנו אלינו את הפרופיל הזה"
 
-#: lib/command.php:669
+#: lib/command.php:671
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "לא שלחנו אלינו את הפרופיל הזה"
 msgstr[1] "לא שלחנו אלינו את הפרופיל הזה"
 
-#: lib/command.php:683
+#: lib/command.php:685
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -4527,10 +4527,6 @@ msgstr "אין הודעה כזו."
 msgid "Favor"
 msgstr ""
 
-#: lib/feedlist.php:64
-msgid "Export data"
-msgstr ""
-
 #: lib/feed.php:85
 msgid "RSS 1.0"
 msgstr ""
@@ -4547,6 +4543,10 @@ msgstr ""
 msgid "FOAF"
 msgstr ""
 
+#: lib/feedlist.php:64
+msgid "Export data"
+msgstr ""
+
 #: lib/galleryaction.php:121
 msgid "Filter tags"
 msgstr ""
@@ -4716,20 +4716,6 @@ msgstr "שם המשתמש או הסיסמה לא חוקיים"
 msgid "Sign up for a new account"
 msgstr "צור חשבון חדש"
 
-#: lib/mailbox.php:89
-msgid "Only the user can read their own mailboxes."
-msgstr ""
-
-#: lib/mailbox.php:139
-msgid ""
-"You have no private messages. You can send private message to engage other "
-"users in conversation. People can send you messages for your eyes only."
-msgstr ""
-
-#: lib/mailbox.php:227 lib/noticelist.php:452
-msgid "from"
-msgstr ""
-
 #: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr ""
@@ -4911,6 +4897,20 @@ msgid ""
 "\n"
 msgstr ""
 
+#: lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
+msgstr ""
+
+#: lib/mailbox.php:139
+msgid ""
+"You have no private messages. You can send private message to engage other "
+"users in conversation. People can send you messages for your eyes only."
+msgstr ""
+
+#: lib/mailbox.php:227 lib/noticelist.php:452
+msgid "from"
+msgstr ""
+
 #: lib/mediafile.php:98 lib/mediafile.php:123
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
@@ -4972,7 +4972,7 @@ msgstr ""
 msgid "To"
 msgstr "אל"
 
-#: lib/messageform.php:161 lib/noticeform.php:185
+#: lib/messageform.php:159 lib/noticeform.php:183
 #, fuzzy
 msgid "Available characters"
 msgstr "לפחות 6 אותיות"
@@ -4987,11 +4987,11 @@ msgstr "הודעה חדשה"
 msgid "What's up, %s?"
 msgstr "מה המצב %s?"
 
-#: lib/noticeform.php:192
+#: lib/noticeform.php:190
 msgid "Attach"
 msgstr ""
 
-#: lib/noticeform.php:196
+#: lib/noticeform.php:194
 msgid "Attach a file"
 msgstr ""
 
@@ -5064,11 +5064,11 @@ msgstr "שגיאה בהכנסת פרופיל מרוחק"
 msgid "Duplicate notice"
 msgstr "הודעה חדשה"
 
-#: lib/oauthstore.php:467 lib/subs.php:48
+#: lib/oauthstore.php:466 lib/subs.php:48
 msgid "You have been banned from subscribing."
 msgstr ""
 
-#: lib/oauthstore.php:492
+#: lib/oauthstore.php:491
 msgid "Couldn't insert new subscription."
 msgstr "הכנסת מנוי חדש נכשלה."
 
@@ -5237,20 +5237,6 @@ msgstr "הרשמה מרוחקת"
 msgid "Groups %s is a member of"
 msgstr ""
 
-#: lib/subscriberspeopleselftagcloudsection.php:48
-#: lib/subscriptionspeopleselftagcloudsection.php:48
-msgid "People Tagcloud as self-tagged"
-msgstr ""
-
-#: lib/subscriberspeopletagcloudsection.php:48
-#: lib/subscriptionspeopletagcloudsection.php:48
-msgid "People Tagcloud as tagged"
-msgstr ""
-
-#: lib/subscriptionlist.php:126
-msgid "(none)"
-msgstr ""
-
 #: lib/subs.php:52
 msgid "Already subscribed!"
 msgstr ""
@@ -5282,6 +5268,20 @@ msgstr "מחיקת המנוי לא הצליחה."
 msgid "Couldn't delete subscription."
 msgstr "מחיקת המנוי לא הצליחה."
 
+#: lib/subscriberspeopleselftagcloudsection.php:48
+#: lib/subscriptionspeopleselftagcloudsection.php:48
+msgid "People Tagcloud as self-tagged"
+msgstr ""
+
+#: lib/subscriberspeopletagcloudsection.php:48
+#: lib/subscriptionspeopletagcloudsection.php:48
+msgid "People Tagcloud as tagged"
+msgstr ""
+
+#: lib/subscriptionlist.php:126
+msgid "(none)"
+msgstr ""
+
 #: lib/tagcloudsection.php:56
 #, fuzzy
 msgid "None"
diff --git a/locale/hsb/LC_MESSAGES/statusnet.po b/locale/hsb/LC_MESSAGES/statusnet.po
index 9bea1de8fc..4ef3a75860 100644
--- a/locale/hsb/LC_MESSAGES/statusnet.po
+++ b/locale/hsb/LC_MESSAGES/statusnet.po
@@ -1,5 +1,6 @@
 # Translation of StatusNet to Upper Sorbian
 #
+# Author@translatewiki.net: McDutchie
 # Author@translatewiki.net: Michawiki
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -8,12 +9,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 21:25+0000\n"
-"PO-Revision-Date: 2009-12-07 21:26:39+0000\n"
+"POT-Creation-Date: 2009-12-12 17:09+0000\n"
+"PO-Revision-Date: 2009-12-12 17:09:49+0000\n"
 "Language-Team: Dutch\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n"
+"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: hsb\n"
 "X-Message-Group: out-statusnet\n"
@@ -27,11 +28,11 @@ msgstr "Strona njeeksistuje"
 
 #: actions/all.php:74 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofile.php:105
 #: actions/apiaccountupdateprofilebackgroundimage.php:116
-#: actions/apiaccountupdateprofileimage.php:105
-#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
-#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
-#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
+#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90
 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
@@ -44,7 +45,7 @@ msgstr "Strona njeeksistuje"
 #: actions/repliesrss.php:38 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38
 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
-#: lib/command.php:364 lib/command.php:411 lib/command.php:466
+#: lib/command.php:364 lib/command.php:411 lib/command.php:467
 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
 #: lib/subs.php:34 lib/subs.php:116
 msgid "No such user."
@@ -56,7 +57,7 @@ msgid "%s and friends, page %d"
 msgstr "%s a přećeljo, bok %d"
 
 #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
-#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100
+#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s a přećeljo"
@@ -107,24 +108,24 @@ msgstr ""
 msgid "You and friends"
 msgstr "Ty a přećeljo"
 
-#: actions/allrss.php:119 actions/apitimelinefriends.php:121
+#: actions/allrss.php:119 actions/apitimelinefriends.php:122
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr ""
 
 #: actions/apiaccountratelimitstatus.php:70
 #: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofile.php:97
 #: actions/apiaccountupdateprofilebackgroundimage.php:94
 #: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apiaccountupdateprofile.php:97
 msgid "API method not found."
 msgstr "API-metoda njenamakana."
 
 #: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofile.php:89
 #: actions/apiaccountupdateprofilebackgroundimage.php:86
 #: actions/apiaccountupdateprofilecolors.php:110
-#: actions/apiaccountupdateprofileimage.php:84
-#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
+#: actions/apiaccountupdateprofileimage.php:84 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
@@ -143,9 +144,22 @@ msgstr ""
 msgid "Could not update user."
 msgstr "Wužiwar njeje so dał aktualizować."
 
+#: actions/apiaccountupdateprofile.php:112
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+msgid "User has no profile."
+msgstr "Wužiwar nima profil."
+
+#: actions/apiaccountupdateprofile.php:147
+msgid "Could not save profile."
+msgstr "Profil njeje so składować dał."
+
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257
 #: actions/designadminpanel.php:122 actions/newnotice.php:94
 #: lib/designsettings.php:283
 #, php-format
@@ -166,19 +180,6 @@ msgstr ""
 msgid "Could not update your design."
 msgstr "Design njeda so aktualizować."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
-#: actions/apiaccountupdateprofileimage.php:130
-#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
-#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
-msgid "User has no profile."
-msgstr "Wužiwar nima profil."
-
-#: actions/apiaccountupdateprofile.php:147
-msgid "Could not save profile."
-msgstr "Profil njeje so składować dał."
-
 #: actions/apiblockcreate.php:105
 msgid "You cannot block yourself!"
 msgstr "Njemóžeš so samoho blokować."
@@ -191,23 +192,6 @@ msgstr ""
 msgid "Unblock user failed."
 msgstr ""
 
-#: actions/apidirectmessagenew.php:126
-msgid "No message text!"
-msgstr "Žadyn powěsćowy tekst!"
-
-#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
-#, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr "To je předołho. Maksimalna powěsćowa wulkosć je %d znamješkow."
-
-#: actions/apidirectmessagenew.php:146
-msgid "Recipient user not found."
-msgstr "Přijimowar njenamakany."
-
-#: actions/apidirectmessagenew.php:150
-msgid "Can't send direct messages to users who aren't your friend."
-msgstr ""
-
 #: actions/apidirectmessage.php:89
 #, php-format
 msgid "Direct messages from %s"
@@ -233,18 +217,35 @@ msgstr "Wšě do %s pósłane direktne powěsće"
 #: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
-#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
-#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149
-#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
-#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156
+#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151
+#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141
+#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
 msgid "API method not found!"
 msgstr "API-metoda njenamakana!"
 
+#: actions/apidirectmessagenew.php:126
+msgid "No message text!"
+msgstr "Žadyn powěsćowy tekst!"
+
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "To je předołho. Maksimalna powěsćowa wulkosć je %d znamješkow."
+
+#: actions/apidirectmessagenew.php:146
+msgid "Recipient user not found."
+msgstr "Přijimowar njenamakany."
+
+#: actions/apidirectmessagenew.php:150
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr ""
+
 #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
 #: actions/apistatusesdestroy.php:113
 msgid "No status found with that ID."
@@ -387,16 +388,6 @@ msgstr "Njejsy čłon tuteje skupiny."
 msgid "Could not remove user %s to group %s."
 msgstr ""
 
-#: actions/apigrouplistall.php:90 actions/usergroups.php:62
-#, php-format
-msgid "%s groups"
-msgstr ""
-
-#: actions/apigrouplistall.php:94
-#, php-format
-msgid "groups on %s"
-msgstr "skupiny na %s"
-
 #: actions/apigrouplist.php:95
 #, php-format
 msgid "%s's groups"
@@ -407,6 +398,16 @@ msgstr ""
 msgid "Groups %s is a member of on %s."
 msgstr ""
 
+#: actions/apigrouplistall.php:90 actions/usergroups.php:62
+#, php-format
+msgid "%s groups"
+msgstr ""
+
+#: actions/apigrouplistall.php:94
+#, php-format
+msgid "groups on %s"
+msgstr "skupiny na %s"
+
 #: actions/apistatusesdestroy.php:107
 msgid "This method requires a POST or DELETE."
 msgstr "Tuta metoda wužaduje sej POST abo DELETE."
@@ -442,54 +443,54 @@ msgstr ""
 msgid "Unsupported format."
 msgstr "Njepodpěrany format."
 
-#: actions/apitimelinefavorites.php:107
+#: actions/apitimelinefavorites.php:108
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr ""
 
-#: actions/apitimelinefavorites.php:119
+#: actions/apitimelinefavorites.php:120
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr ""
 
-#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117
+#: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118
 #: actions/grouprss.php:131 actions/userrss.php:90
 #, php-format
 msgid "%s timeline"
 msgstr ""
 
-#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125
+#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
 #: actions/userrss.php:92
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr ""
 
-#: actions/apitimelinementions.php:116
+#: actions/apitimelinementions.php:117
 #, php-format
 msgid "%1$s / Updates mentioning %2$s"
 msgstr ""
 
-#: actions/apitimelinementions.php:126
+#: actions/apitimelinementions.php:127
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr ""
 
-#: actions/apitimelinepublic.php:106 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr ""
 
-#: actions/apitimelinepublic.php:110 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr ""
 
-#: actions/apitimelinetag.php:101 actions/tag.php:66
+#: actions/apitimelinetag.php:102 actions/tag.php:66
 #, php-format
 msgid "Notices tagged with %s"
 msgstr ""
 
-#: actions/apitimelinetag.php:107 actions/tagrss.php:64
+#: actions/apitimelinetag.php:108 actions/tagrss.php:64
 #, php-format
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr ""
@@ -525,45 +526,45 @@ msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr ""
 "Móžeš swój wosobinski awatar nahrać. Maksimalna datajowa wulkosć je %s."
 
-#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:185
 #: actions/grouplogo.php:178 actions/remotesubscribe.php:191
 #: actions/userauthorization.php:72 actions/userrss.php:103
 msgid "User without matching profile"
 msgstr "Wužiwar bjez hodźaceho so profila"
 
-#: actions/avatarsettings.php:119 actions/avatarsettings.php:194
+#: actions/avatarsettings.php:119 actions/avatarsettings.php:197
 #: actions/grouplogo.php:251
 msgid "Avatar settings"
 msgstr "Nastajenja awatara"
 
-#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/avatarsettings.php:127 actions/avatarsettings.php:205
 #: actions/grouplogo.php:199 actions/grouplogo.php:259
 msgid "Original"
 msgstr "Original"
 
-#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/avatarsettings.php:142 actions/avatarsettings.php:217
 #: actions/grouplogo.php:210 actions/grouplogo.php:271
 msgid "Preview"
 msgstr "Přehlad"
 
-#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
+#: actions/avatarsettings.php:149 lib/deleteuserform.php:66
 #: lib/noticelist.php:550
 msgid "Delete"
 msgstr "Zničić"
 
-#: actions/avatarsettings.php:165 actions/grouplogo.php:233
+#: actions/avatarsettings.php:166 actions/grouplogo.php:233
 msgid "Upload"
 msgstr "Nahrać"
 
-#: actions/avatarsettings.php:228 actions/grouplogo.php:286
+#: actions/avatarsettings.php:231 actions/grouplogo.php:286
 msgid "Crop"
 msgstr ""
 
-#: actions/avatarsettings.php:265 actions/disfavor.php:74
+#: actions/avatarsettings.php:268 actions/disfavor.php:74
 #: actions/emailsettings.php:238 actions/favor.php:75
 #: actions/groupblock.php:66 actions/grouplogo.php:309
 #: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -574,33 +575,70 @@ msgstr ""
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
-#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
+#: actions/avatarsettings.php:281 actions/designadminpanel.php:103
 #: actions/emailsettings.php:256 actions/grouplogo.php:319
 #: actions/imsettings.php:220 actions/recoverpassword.php:44
 #: actions/smssettings.php:248 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr ""
 
-#: actions/avatarsettings.php:322
+#: actions/avatarsettings.php:328
 msgid "Pick a square area of the image to be your avatar"
 msgstr ""
 
-#: actions/avatarsettings.php:337 actions/grouplogo.php:377
+#: actions/avatarsettings.php:343 actions/grouplogo.php:377
 msgid "Lost our file data."
 msgstr ""
 
-#: actions/avatarsettings.php:360
+#: actions/avatarsettings.php:366
 msgid "Avatar updated."
 msgstr "Awatar zaktualizowany."
 
-#: actions/avatarsettings.php:363
+#: actions/avatarsettings.php:369
 msgid "Failed updating avatar."
 msgstr ""
 
-#: actions/avatarsettings.php:387
+#: actions/avatarsettings.php:393
 msgid "Avatar deleted."
 msgstr "Awatar zničeny."
 
+#: actions/block.php:69
+msgid "You already blocked that user."
+msgstr "Sy tutoho wužiwarja hižo zablokował."
+
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
+msgid "Block user"
+msgstr "Wužiwarja blokować"
+
+#: actions/block.php:130
+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/block.php:143 actions/deletenotice.php:145
+#: actions/deleteuser.php:147 actions/groupblock.php:178
+msgid "No"
+msgstr "Ně"
+
+#: actions/block.php:143 actions/deleteuser.php:147
+msgid "Do not block this user"
+msgstr "Tutoho wužiwarja njeblokować"
+
+#: actions/block.php:144 actions/deletenotice.php:146
+#: actions/deleteuser.php:148 actions/groupblock.php:179
+msgid "Yes"
+msgstr "Haj"
+
+#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
+msgid "Block this user"
+msgstr "Tutoho wužiwarja blokować"
+
+#: actions/block.php:162
+msgid "Failed to save block information."
+msgstr ""
+
 #: actions/blockedfromgroup.php:73 actions/editgroup.php:84
 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
 #: actions/groupmembers.php:76 actions/grouprss.php:91
@@ -641,43 +679,6 @@ msgstr ""
 msgid "Unblock this user"
 msgstr ""
 
-#: actions/block.php:69
-msgid "You already blocked that user."
-msgstr "Sy tutoho wužiwarja hižo zablokował."
-
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
-msgid "Block user"
-msgstr "Wužiwarja blokować"
-
-#: actions/block.php:130
-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/block.php:143 actions/deletenotice.php:145
-#: actions/deleteuser.php:147 actions/groupblock.php:178
-msgid "No"
-msgstr "Ně"
-
-#: actions/block.php:143 actions/deleteuser.php:147
-msgid "Do not block this user"
-msgstr "Tutoho wužiwarja njeblokować"
-
-#: actions/block.php:144 actions/deletenotice.php:146
-#: actions/deleteuser.php:148 actions/groupblock.php:179
-msgid "Yes"
-msgstr "Haj"
-
-#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
-msgid "Block this user"
-msgstr "Tutoho wužiwarja blokować"
-
-#: actions/block.php:162
-msgid "Failed to save block information."
-msgstr ""
-
 #: actions/bookmarklet.php:50
 msgid "Post to "
 msgstr ""
@@ -1004,7 +1005,7 @@ msgstr "E-mejlowa adresa"
 
 #: actions/emailsettings.php:123
 msgid "Email address, like \"UserName@example.org\""
-msgstr "E-mejlowa adresa, kaž na př. \"WužiwarskeMjeno@přikład.org\""
+msgstr "E-mejlowa adresa, kaž na př. \"WužiwarskeMjeno@example.org\""
 
 #: actions/emailsettings.php:126 actions/imsettings.php:133
 #: actions/smssettings.php:145
@@ -1136,6 +1137,14 @@ msgstr "Adresa za dochadźaće e-mejle wotstronjena."
 msgid "New incoming email address added."
 msgstr "Nowa adresa za dochadźace e-mejle přidata."
 
+#: actions/favor.php:79
+msgid "This notice is already a favorite!"
+msgstr "Tuta zdźělenka je hižo faworit!"
+
+#: actions/favor.php:92 lib/disfavorform.php:140
+msgid "Disfavor favorite"
+msgstr ""
+
 #: actions/favorited.php:65 lib/popularnoticesection.php:88
 #: lib/publicgroupnav.php:93
 msgid "Popular notices"
@@ -1178,14 +1187,6 @@ msgstr ""
 msgid "Updates favored by %1$s on %2$s!"
 msgstr ""
 
-#: actions/favor.php:79
-msgid "This notice is already a favorite!"
-msgstr "Tuta zdźělenka je hižo faworit!"
-
-#: actions/favor.php:92 lib/disfavorform.php:140
-msgid "Disfavor favorite"
-msgstr ""
-
 #: actions/featured.php:69 lib/featureduserssection.php:87
 #: lib/publicgroupnav.php:89
 msgid "Featured users"
@@ -1412,6 +1413,30 @@ msgstr "Tutoho wužiwarja k administratorej činić"
 msgid "Updates from members of %1$s on %2$s!"
 msgstr ""
 
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+msgid "Groups"
+msgstr "Skupiny"
+
+#: actions/groups.php:64
+#, php-format
+msgid "Groups, page %d"
+msgstr "Skupiny, strona %d"
+
+#: actions/groups.php:90
+#, php-format
+msgid ""
+"%%%%site.name%%%% groups let you find and talk with people of similar "
+"interests. After you join a group you can send messages to all other members "
+"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
+"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
+"%%%%)"
+msgstr ""
+
+#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
+msgid "Create a new group"
+msgstr "Nowu skupinu wutworić"
+
 #: actions/groupsearch.php:52
 #, php-format
 msgid ""
@@ -1442,30 +1467,6 @@ msgid ""
 "action.newgroup%%) yourself!"
 msgstr ""
 
-#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
-msgid "Groups"
-msgstr "Skupiny"
-
-#: actions/groups.php:64
-#, php-format
-msgid "Groups, page %d"
-msgstr "Skupiny, strona %d"
-
-#: actions/groups.php:90
-#, php-format
-msgid ""
-"%%%%site.name%%%% groups let you find and talk with people of similar "
-"interests. After you join a group you can send messages to all other members "
-"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
-"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
-"%%%%)"
-msgstr ""
-
-#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
-msgid "Create a new group"
-msgstr "Nowu skupinu wutworić"
-
 #: actions/groupunblock.php:91
 msgid "Only an admin can unblock group members."
 msgstr ""
@@ -1645,7 +1646,7 @@ msgstr "Wosobinska powěsć"
 msgid "Optionally add a personal message to the invitation."
 msgstr "Wosobinsku powěsć po dobrozdaću přeprošenju přidać."
 
-#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:222
 msgid "Send"
 msgstr "Pósłać"
 
@@ -1725,61 +1726,61 @@ msgstr ""
 msgid "%s left group %s"
 msgstr ""
 
-#: actions/login.php:82 actions/register.php:137
+#: actions/login.php:83 actions/register.php:137
 msgid "Already logged in."
 msgstr "Hižo přizjewjeny."
 
-#: actions/login.php:113 actions/login.php:123
+#: actions/login.php:114 actions/login.php:124
 msgid "Invalid or expired token."
 msgstr ""
 
-#: actions/login.php:146
+#: actions/login.php:147
 msgid "Incorrect username or password."
 msgstr "Wopačne wužiwarske mjeno abo hesło."
 
-#: actions/login.php:152
+#: actions/login.php:153
 msgid "Error setting user. You are probably not authorized."
 msgstr "Zmylk při nastajenju wužiwarja. Snano njejsy awtorizowany."
 
-#: actions/login.php:207 actions/login.php:260 lib/action.php:458
+#: actions/login.php:208 actions/login.php:261 lib/action.php:458
 #: lib/logingroupnav.php:79
 msgid "Login"
 msgstr "Přizjewić"
 
-#: actions/login.php:246
+#: actions/login.php:247
 msgid "Login to site"
 msgstr "Při sydle přizjewić"
 
-#: actions/login.php:249 actions/profilesettings.php:106
+#: actions/login.php:250 actions/profilesettings.php:106
 #: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
 #: lib/groupeditform.php:152 lib/userprofile.php:131
 msgid "Nickname"
 msgstr "Přimjeno"
 
-#: actions/login.php:252 actions/register.php:428
+#: actions/login.php:253 actions/register.php:428
 #: lib/accountsettingsaction.php:116
 msgid "Password"
 msgstr "Hesło"
 
-#: actions/login.php:255 actions/register.php:477
+#: actions/login.php:256 actions/register.php:477
 msgid "Remember me"
 msgstr "Składować"
 
-#: actions/login.php:256 actions/register.php:479
+#: actions/login.php:257 actions/register.php:479
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 
-#: actions/login.php:266
+#: actions/login.php:267
 msgid "Lost or forgotten password?"
 msgstr "Hesło zhubjene abo zabyte?"
 
-#: actions/login.php:285
+#: actions/login.php:286
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 msgstr ""
 
-#: actions/login.php:289
+#: actions/login.php:290
 #, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -1848,7 +1849,7 @@ msgstr "Powěsć pósłana"
 msgid "Direct message to %s sent"
 msgstr ""
 
-#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:242 lib/channel.php:170
 msgid "Ajax Error"
 msgstr "Zmylk Ajax"
 
@@ -1856,7 +1857,7 @@ msgstr "Zmylk Ajax"
 msgid "New notice"
 msgstr "Nowa zdźělenka"
 
-#: actions/newnotice.php:206
+#: actions/newnotice.php:208
 msgid "Notice posted"
 msgstr "Zdźělenka wotpósłana"
 
@@ -1930,8 +1931,8 @@ msgstr ""
 msgid "Only "
 msgstr "Jenož "
 
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996
-#: lib/api.php:1024 lib/api.php:1134
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011
+#: lib/api.php:1039 lib/api.php:1149
 msgid "Not a supported data format."
 msgstr "Njeje podpěrany datowy format."
 
@@ -3403,6 +3404,26 @@ msgstr "Jabber"
 msgid "SMS"
 msgstr "SMS"
 
+#: actions/tag.php:68
+#, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr ""
+
+#: actions/tag.php:86
+#, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr ""
+
+#: actions/tag.php:92
+#, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr ""
+
+#: actions/tag.php:98
+#, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr ""
+
 #: actions/tagother.php:33
 msgid "Not logged in"
 msgstr "Njepřizjewjeny"
@@ -3447,26 +3468,6 @@ msgstr ""
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 
-#: actions/tag.php:68
-#, php-format
-msgid "Notices tagged with %s, page %d"
-msgstr ""
-
-#: actions/tag.php:86
-#, php-format
-msgid "Notice feed for tag %s (RSS 1.0)"
-msgstr ""
-
-#: actions/tag.php:92
-#, php-format
-msgid "Notice feed for tag %s (RSS 2.0)"
-msgstr ""
-
-#: actions/tag.php:98
-#, php-format
-msgid "Notice feed for tag %s (Atom)"
-msgstr ""
-
 #: actions/tagrss.php:35
 msgid "No such tag."
 msgstr ""
@@ -3755,38 +3756,43 @@ msgstr ""
 msgid "DB error inserting hashtag: %s"
 msgstr ""
 
-#: classes/Notice.php:179
+#: classes/Notice.php:188
 msgid "Problem saving notice. Too long."
 msgstr ""
 
-#: classes/Notice.php:183
+#: classes/Notice.php:192
 msgid "Problem saving notice. Unknown user."
 msgstr ""
 
-#: classes/Notice.php:188
+#: classes/Notice.php:197
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
-#: classes/Notice.php:194
+#: classes/Notice.php:203
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
 msgstr ""
 
-#: classes/Notice.php:200
+#: classes/Notice.php:209
 msgid "You are banned from posting notices on this site."
 msgstr ""
 
-#: classes/Notice.php:265 classes/Notice.php:290
+#: classes/Notice.php:274 classes/Notice.php:299
 msgid "Problem saving notice."
 msgstr ""
 
-#: classes/Notice.php:1124
+#: classes/Notice.php:1115
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr ""
 
+#: classes/User.php:347
+#, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr ""
+
 #: classes/User_group.php:380
 msgid "Could not create group."
 msgstr ""
@@ -3795,11 +3801,6 @@ msgstr ""
 msgid "Could not set group membership."
 msgstr ""
 
-#: classes/User.php:347
-#, php-format
-msgid "Welcome to %1$s, @%2$s!"
-msgstr ""
-
 #: lib/accountsettingsaction.php:108
 msgid "Change your profile settings"
 msgstr ""
@@ -4096,7 +4097,7 @@ msgstr ""
 msgid "Notice with that id does not exist"
 msgstr ""
 
-#: lib/command.php:168 lib/command.php:416 lib/command.php:471
+#: lib/command.php:168 lib/command.php:416 lib/command.php:472
 msgid "User has no last notice"
 msgstr ""
 
@@ -4143,72 +4144,72 @@ msgstr ""
 msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr ""
 
-#: lib/command.php:439
+#: lib/command.php:440
 #, php-format
 msgid "Reply to %s sent"
 msgstr ""
 
-#: lib/command.php:441
+#: lib/command.php:442
 msgid "Error saving notice."
 msgstr ""
 
-#: lib/command.php:495
+#: lib/command.php:496
 msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: lib/command.php:502
+#: lib/command.php:503
 #, php-format
 msgid "Subscribed to %s"
 msgstr ""
 
-#: lib/command.php:523
+#: lib/command.php:524
 msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: lib/command.php:530
+#: lib/command.php:531
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr ""
 
-#: lib/command.php:548 lib/command.php:571
+#: lib/command.php:549 lib/command.php:572
 msgid "Command not yet implemented."
 msgstr ""
 
-#: lib/command.php:551
+#: lib/command.php:552
 msgid "Notification off."
 msgstr ""
 
-#: lib/command.php:553
+#: lib/command.php:554
 msgid "Can't turn off notification."
 msgstr ""
 
-#: lib/command.php:574
+#: lib/command.php:575
 msgid "Notification on."
 msgstr ""
 
-#: lib/command.php:576
+#: lib/command.php:577
 msgid "Can't turn on notification."
 msgstr ""
 
-#: lib/command.php:588
+#: lib/command.php:590
 msgid "Login command is disabled"
 msgstr ""
 
-#: lib/command.php:602
-#, fuzzy, php-format
+#: lib/command.php:604
+#, php-format
 msgid "Could not create login token for %s"
-msgstr "Aliasy njejsu so dali wutworić."
+msgstr "Njeje móžno było, přizjewjenske znamješko za %s wutworić"
 
-#: lib/command.php:607
+#: lib/command.php:609
 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:623
+#: lib/command.php:625
 msgid "You are not subscribed to anyone."
 msgstr ""
 
-#: lib/command.php:625
+#: lib/command.php:627
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Sy tutu wosobu abonował:"
@@ -4216,11 +4217,11 @@ msgstr[1] "Sy tutej wosobje abonował:"
 msgstr[2] "Sy tute wosoby abonował:"
 msgstr[3] "Sy tute wosoby abonował:"
 
-#: lib/command.php:645
+#: lib/command.php:647
 msgid "No one is subscribed to you."
 msgstr ""
 
-#: lib/command.php:647
+#: lib/command.php:649
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Tuta wosoba je će abonowała:"
@@ -4228,11 +4229,11 @@ msgstr[1] "Tutej wosobje stej će abonowałoj:"
 msgstr[2] "Tute wosoby su će abonowali:"
 msgstr[3] "Tute wosoby su će abonowali:"
 
-#: lib/command.php:667
+#: lib/command.php:669
 msgid "You are not a member of any groups."
 msgstr ""
 
-#: lib/command.php:669
+#: lib/command.php:671
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Sy čłon tuteje skupiny:"
@@ -4240,7 +4241,7 @@ msgstr[1] "Sy čłon tuteju skupinow:"
 msgstr[2] "Sy čłon tutych skupinow:"
 msgstr[3] "Sy čłon tutych skupinow:"
 
-#: lib/command.php:683
+#: lib/command.php:685
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -4336,10 +4337,6 @@ msgstr ""
 msgid "Favor"
 msgstr ""
 
-#: lib/feedlist.php:64
-msgid "Export data"
-msgstr ""
-
 #: lib/feed.php:85
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
@@ -4356,6 +4353,10 @@ msgstr "Atom"
 msgid "FOAF"
 msgstr "FOAF"
 
+#: lib/feedlist.php:64
+msgid "Export data"
+msgstr ""
+
 #: lib/galleryaction.php:121
 msgid "Filter tags"
 msgstr ""
@@ -4514,20 +4515,6 @@ msgstr "Přizjewjenje z wužiwarskim mjenom a hesłom"
 msgid "Sign up for a new account"
 msgstr "Nowe konto registrować"
 
-#: lib/mailbox.php:89
-msgid "Only the user can read their own mailboxes."
-msgstr ""
-
-#: lib/mailbox.php:139
-msgid ""
-"You have no private messages. You can send private message to engage other "
-"users in conversation. People can send you messages for your eyes only."
-msgstr ""
-
-#: lib/mailbox.php:227 lib/noticelist.php:452
-msgid "from"
-msgstr "wot"
-
 #: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Wobkrućenje e-mejloweje adresy"
@@ -4706,6 +4693,20 @@ msgid ""
 "\n"
 msgstr ""
 
+#: lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
+msgstr ""
+
+#: lib/mailbox.php:139
+msgid ""
+"You have no private messages. You can send private message to engage other "
+"users in conversation. People can send you messages for your eyes only."
+msgstr ""
+
+#: lib/mailbox.php:227 lib/noticelist.php:452
+msgid "from"
+msgstr "wot"
+
 #: lib/mediafile.php:98 lib/mediafile.php:123
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
@@ -4766,7 +4767,7 @@ msgstr "Direktnu zdźělenku pósłać"
 msgid "To"
 msgstr "Komu"
 
-#: lib/messageform.php:161 lib/noticeform.php:185
+#: lib/messageform.php:159 lib/noticeform.php:183
 msgid "Available characters"
 msgstr "K dispoziciji stejace znamješka"
 
@@ -4779,11 +4780,11 @@ msgstr "Zdźělenku pósłać"
 msgid "What's up, %s?"
 msgstr ""
 
-#: lib/noticeform.php:192
+#: lib/noticeform.php:190
 msgid "Attach"
 msgstr "Připowěsnyć"
 
-#: lib/noticeform.php:196
+#: lib/noticeform.php:194
 msgid "Attach a file"
 msgstr "Dataju připowěsnyć"
 
@@ -4852,11 +4853,11 @@ msgstr "Zmylk při zasunjenju zdaleneho profila"
 msgid "Duplicate notice"
 msgstr "Dwójna zdźělenka"
 
-#: lib/oauthstore.php:467 lib/subs.php:48
+#: lib/oauthstore.php:466 lib/subs.php:48
 msgid "You have been banned from subscribing."
 msgstr ""
 
-#: lib/oauthstore.php:492
+#: lib/oauthstore.php:491
 msgid "Couldn't insert new subscription."
 msgstr ""
 
@@ -5016,20 +5017,6 @@ msgstr ""
 msgid "Groups %s is a member of"
 msgstr ""
 
-#: lib/subscriberspeopleselftagcloudsection.php:48
-#: lib/subscriptionspeopleselftagcloudsection.php:48
-msgid "People Tagcloud as self-tagged"
-msgstr ""
-
-#: lib/subscriberspeopletagcloudsection.php:48
-#: lib/subscriptionspeopletagcloudsection.php:48
-msgid "People Tagcloud as tagged"
-msgstr ""
-
-#: lib/subscriptionlist.php:126
-msgid "(none)"
-msgstr "(žadyn)"
-
 #: lib/subs.php:52
 msgid "Already subscribed!"
 msgstr "Hižo abonowany!"
@@ -5051,14 +5038,27 @@ msgid "Not subscribed!"
 msgstr "Njeje abonowany!"
 
 #: lib/subs.php:133
-#, fuzzy
 msgid "Couldn't delete self-subscription."
-msgstr "Abonoment njeje so dał zničić."
+msgstr "Sebjeabonement njeje so dał zničić."
 
 #: lib/subs.php:146
 msgid "Couldn't delete subscription."
 msgstr "Abonoment njeje so dał zničić."
 
+#: 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/subscriptionlist.php:126
+msgid "(none)"
+msgstr "(žadyn)"
+
 #: lib/tagcloudsection.php:56
 msgid "None"
 msgstr "Žadyn"
diff --git a/locale/is/LC_MESSAGES/statusnet.po b/locale/is/LC_MESSAGES/statusnet.po
index 16e4b7435a..2eb8678b6e 100644
--- a/locale/is/LC_MESSAGES/statusnet.po
+++ b/locale/is/LC_MESSAGES/statusnet.po
@@ -7,12 +7,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 21:25+0000\n"
-"PO-Revision-Date: 2009-12-07 21:26:42+0000\n"
+"POT-Creation-Date: 2009-12-12 17:09+0000\n"
+"PO-Revision-Date: 2009-12-12 17:09:52+0000\n"
 "Language-Team: Icelandic\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n"
+"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: is\n"
 "X-Message-Group: out-statusnet\n"
@@ -28,11 +28,11 @@ msgstr "Ekkert þannig merki."
 
 #: actions/all.php:74 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofile.php:105
 #: actions/apiaccountupdateprofilebackgroundimage.php:116
-#: actions/apiaccountupdateprofileimage.php:105
-#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
-#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
-#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
+#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90
 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
@@ -45,7 +45,7 @@ msgstr "Ekkert þannig merki."
 #: actions/repliesrss.php:38 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38
 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
-#: lib/command.php:364 lib/command.php:411 lib/command.php:466
+#: lib/command.php:364 lib/command.php:411 lib/command.php:467
 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
 #: lib/subs.php:34 lib/subs.php:116
 msgid "No such user."
@@ -57,7 +57,7 @@ msgid "%s and friends, page %d"
 msgstr "%s og vinirnir, síða %d"
 
 #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
-#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100
+#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s og vinirnir"
@@ -108,25 +108,25 @@ msgstr ""
 msgid "You and friends"
 msgstr ""
 
-#: actions/allrss.php:119 actions/apitimelinefriends.php:121
+#: actions/allrss.php:119 actions/apitimelinefriends.php:122
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Færslur frá %1$s og vinum á %2$s!"
 
 #: actions/apiaccountratelimitstatus.php:70
 #: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofile.php:97
 #: actions/apiaccountupdateprofilebackgroundimage.php:94
 #: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apiaccountupdateprofile.php:97
 #, fuzzy
 msgid "API method not found."
 msgstr "Aðferð í forritsskilum fannst ekki!"
 
 #: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofile.php:89
 #: actions/apiaccountupdateprofilebackgroundimage.php:86
 #: actions/apiaccountupdateprofilecolors.php:110
-#: actions/apiaccountupdateprofileimage.php:84
-#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
+#: actions/apiaccountupdateprofileimage.php:84 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
@@ -146,9 +146,23 @@ msgstr ""
 msgid "Could not update user."
 msgstr "Gat ekki uppfært notanda."
 
+#: actions/apiaccountupdateprofile.php:112
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+msgid "User has no profile."
+msgstr "Notandi hefur enga persónulega síðu."
+
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "Gat ekki vistað persónulega síðu."
+
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257
 #: actions/designadminpanel.php:122 actions/newnotice.php:94
 #: lib/designsettings.php:283
 #, php-format
@@ -170,20 +184,6 @@ msgstr ""
 msgid "Could not update your design."
 msgstr "Gat ekki uppfært hóp."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
-#: actions/apiaccountupdateprofileimage.php:130
-#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
-#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
-msgid "User has no profile."
-msgstr "Notandi hefur enga persónulega síðu."
-
-#: actions/apiaccountupdateprofile.php:147
-#, fuzzy
-msgid "Could not save profile."
-msgstr "Gat ekki vistað persónulega síðu."
-
 #: actions/apiblockcreate.php:105
 #, fuzzy
 msgid "You cannot block yourself!"
@@ -197,23 +197,6 @@ msgstr "Mistókst að loka á notanda."
 msgid "Unblock user failed."
 msgstr "Mistókst að opna fyrir notanda."
 
-#: actions/apidirectmessagenew.php:126
-msgid "No message text!"
-msgstr "Enginn texti í skilaboðum!"
-
-#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
-#, fuzzy, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr "Þetta er of langt. Hámarkslengd skilaboða er 140 tákn."
-
-#: actions/apidirectmessagenew.php:146
-msgid "Recipient user not found."
-msgstr "Móttakandi fannst ekki."
-
-#: actions/apidirectmessagenew.php:150
-msgid "Can't send direct messages to users who aren't your friend."
-msgstr "Gat ekki sent bein skilaboð til notenda sem eru ekki vinir þínir."
-
 #: actions/apidirectmessage.php:89
 #, fuzzy, php-format
 msgid "Direct messages from %s"
@@ -239,18 +222,35 @@ msgstr "Öll bein skilaboð til %s"
 #: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
-#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
-#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149
-#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
-#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156
+#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151
+#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141
+#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
 msgid "API method not found!"
 msgstr "Aðferð í forritsskilum fannst ekki!"
 
+#: actions/apidirectmessagenew.php:126
+msgid "No message text!"
+msgstr "Enginn texti í skilaboðum!"
+
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, fuzzy, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "Þetta er of langt. Hámarkslengd skilaboða er 140 tákn."
+
+#: actions/apidirectmessagenew.php:146
+msgid "Recipient user not found."
+msgstr "Móttakandi fannst ekki."
+
+#: actions/apidirectmessagenew.php:150
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr "Gat ekki sent bein skilaboð til notenda sem eru ekki vinir þínir."
+
 #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
 #: actions/apistatusesdestroy.php:113
 msgid "No status found with that ID."
@@ -398,16 +398,6 @@ msgstr "Þú ert ekki meðlimur í þessum hópi."
 msgid "Could not remove user %s to group %s."
 msgstr "Gat ekki fjarlægt notandann %s úr hópnum %s"
 
-#: actions/apigrouplistall.php:90 actions/usergroups.php:62
-#, php-format
-msgid "%s groups"
-msgstr "Hópar %s"
-
-#: actions/apigrouplistall.php:94
-#, fuzzy, php-format
-msgid "groups on %s"
-msgstr "Hópsaðgerðir"
-
 #: actions/apigrouplist.php:95
 #, fuzzy, php-format
 msgid "%s's groups"
@@ -418,6 +408,16 @@ msgstr "Hópar %s"
 msgid "Groups %s is a member of on %s."
 msgstr "Hópar sem %s er meðlimur í"
 
+#: actions/apigrouplistall.php:90 actions/usergroups.php:62
+#, php-format
+msgid "%s groups"
+msgstr "Hópar %s"
+
+#: actions/apigrouplistall.php:94
+#, fuzzy, php-format
+msgid "groups on %s"
+msgstr "Hópsaðgerðir"
+
 #: actions/apistatusesdestroy.php:107
 msgid "This method requires a POST or DELETE."
 msgstr "Þessi aðferð krefst POST eða DELETE."
@@ -454,54 +454,54 @@ msgstr ""
 msgid "Unsupported format."
 msgstr "Skráarsnið myndar ekki stutt."
 
-#: actions/apitimelinefavorites.php:107
+#: actions/apitimelinefavorites.php:108
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr "%s / Uppáhaldsbabl frá %s"
 
-#: actions/apitimelinefavorites.php:119
+#: actions/apitimelinefavorites.php:120
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr "%s færslur gerðar að uppáhaldsbabli af %s / %s."
 
-#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117
+#: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118
 #: actions/grouprss.php:131 actions/userrss.php:90
 #, php-format
 msgid "%s timeline"
 msgstr "Rás %s"
 
-#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125
+#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
 #: actions/userrss.php:92
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Færslur frá %1$s á %2$s!"
 
-#: actions/apitimelinementions.php:116
+#: actions/apitimelinementions.php:117
 #, php-format
 msgid "%1$s / Updates mentioning %2$s"
 msgstr ""
 
-#: actions/apitimelinementions.php:126
+#: actions/apitimelinementions.php:127
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s færslur sem svara færslum frá %2$s / %3$s."
 
-#: actions/apitimelinepublic.php:106 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "Almenningsrás %s"
 
-#: actions/apitimelinepublic.php:110 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s færslur frá öllum!"
 
-#: actions/apitimelinetag.php:101 actions/tag.php:66
+#: actions/apitimelinetag.php:102 actions/tag.php:66
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Babl merkt með %s"
 
-#: actions/apitimelinetag.php:107 actions/tagrss.php:64
+#: actions/apitimelinetag.php:108 actions/tagrss.php:64
 #, php-format
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr ""
@@ -536,45 +536,45 @@ msgstr "Mynd"
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr ""
 
-#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:185
 #: actions/grouplogo.php:178 actions/remotesubscribe.php:191
 #: actions/userauthorization.php:72 actions/userrss.php:103
 msgid "User without matching profile"
 msgstr "Notandi með enga persónulega síðu sem passar við"
 
-#: actions/avatarsettings.php:119 actions/avatarsettings.php:194
+#: actions/avatarsettings.php:119 actions/avatarsettings.php:197
 #: actions/grouplogo.php:251
 msgid "Avatar settings"
 msgstr "Stillingar fyrir mynd"
 
-#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/avatarsettings.php:127 actions/avatarsettings.php:205
 #: actions/grouplogo.php:199 actions/grouplogo.php:259
 msgid "Original"
 msgstr "Upphafleg mynd"
 
-#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/avatarsettings.php:142 actions/avatarsettings.php:217
 #: actions/grouplogo.php:210 actions/grouplogo.php:271
 msgid "Preview"
 msgstr "Forsýn"
 
-#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
+#: actions/avatarsettings.php:149 lib/deleteuserform.php:66
 #: lib/noticelist.php:550
 msgid "Delete"
 msgstr "Eyða"
 
-#: actions/avatarsettings.php:165 actions/grouplogo.php:233
+#: actions/avatarsettings.php:166 actions/grouplogo.php:233
 msgid "Upload"
 msgstr "Hlaða upp"
 
-#: actions/avatarsettings.php:228 actions/grouplogo.php:286
+#: actions/avatarsettings.php:231 actions/grouplogo.php:286
 msgid "Crop"
 msgstr "Skera af"
 
-#: actions/avatarsettings.php:265 actions/disfavor.php:74
+#: actions/avatarsettings.php:268 actions/disfavor.php:74
 #: actions/emailsettings.php:238 actions/favor.php:75
 #: actions/groupblock.php:66 actions/grouplogo.php:309
 #: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -585,34 +585,73 @@ msgstr "Skera af"
 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."
 
-#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
+#: actions/avatarsettings.php:281 actions/designadminpanel.php:103
 #: actions/emailsettings.php:256 actions/grouplogo.php:319
 #: actions/imsettings.php:220 actions/recoverpassword.php:44
 #: actions/smssettings.php:248 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "Bjóst ekki við innsendingu eyðublaðs."
 
-#: actions/avatarsettings.php:322
+#: actions/avatarsettings.php:328
 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:337 actions/grouplogo.php:377
+#: actions/avatarsettings.php:343 actions/grouplogo.php:377
 msgid "Lost our file data."
 msgstr "Týndum skráargögnunum okkar"
 
-#: actions/avatarsettings.php:360
+#: actions/avatarsettings.php:366
 msgid "Avatar updated."
 msgstr "Mynd hefur verið uppfærð."
 
-#: actions/avatarsettings.php:363
+#: actions/avatarsettings.php:369
 msgid "Failed updating avatar."
 msgstr "Mistókst að uppfæra mynd"
 
-#: actions/avatarsettings.php:387
+#: actions/avatarsettings.php:393
 msgid "Avatar deleted."
 msgstr ""
 
+#: actions/block.php:69
+#, fuzzy
+msgid "You already blocked that user."
+msgstr "Þú hefur nú þegar lokað á þennan notanda."
+
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
+msgid "Block user"
+msgstr "Loka á notanda"
+
+#: actions/block.php:130
+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/block.php:143 actions/deletenotice.php:145
+#: actions/deleteuser.php:147 actions/groupblock.php:178
+msgid "No"
+msgstr "Nei"
+
+#: actions/block.php:143 actions/deleteuser.php:147
+#, fuzzy
+msgid "Do not block this user"
+msgstr "Opna á þennan notanda"
+
+#: actions/block.php:144 actions/deletenotice.php:146
+#: actions/deleteuser.php:148 actions/groupblock.php:179
+msgid "Yes"
+msgstr "Já"
+
+#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
+msgid "Block this user"
+msgstr "Loka á þennan notanda"
+
+#: actions/block.php:162
+msgid "Failed to save block information."
+msgstr "Mistókst að vista upplýsingar um notendalokun"
+
 #: actions/blockedfromgroup.php:73 actions/editgroup.php:84
 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
 #: actions/groupmembers.php:76 actions/grouprss.php:91
@@ -653,45 +692,6 @@ msgstr "Opna"
 msgid "Unblock this user"
 msgstr "Opna á þennan notanda"
 
-#: actions/block.php:69
-#, fuzzy
-msgid "You already blocked that user."
-msgstr "Þú hefur nú þegar lokað á þennan notanda."
-
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
-msgid "Block user"
-msgstr "Loka á notanda"
-
-#: actions/block.php:130
-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/block.php:143 actions/deletenotice.php:145
-#: actions/deleteuser.php:147 actions/groupblock.php:178
-msgid "No"
-msgstr "Nei"
-
-#: actions/block.php:143 actions/deleteuser.php:147
-#, fuzzy
-msgid "Do not block this user"
-msgstr "Opna á þennan notanda"
-
-#: actions/block.php:144 actions/deletenotice.php:146
-#: actions/deleteuser.php:148 actions/groupblock.php:179
-msgid "Yes"
-msgstr "Já"
-
-#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
-msgid "Block this user"
-msgstr "Loka á þennan notanda"
-
-#: actions/block.php:162
-msgid "Failed to save block information."
-msgstr "Mistókst að vista upplýsingar um notendalokun"
-
 #: actions/bookmarklet.php:50
 #, fuzzy
 msgid "Post to "
@@ -1166,6 +1166,14 @@ msgstr "Móttökutölvupóstfang fjarlægt."
 msgid "New incoming email address added."
 msgstr "Nýju móttökutölvupóstfangi bætt við."
 
+#: actions/favor.php:79
+msgid "This notice is already a favorite!"
+msgstr "Þetta babl er nú þegar í uppáhaldi!"
+
+#: actions/favor.php:92 lib/disfavorform.php:140
+msgid "Disfavor favorite"
+msgstr "Ekki lengur í uppáhaldi"
+
 #: actions/favorited.php:65 lib/popularnoticesection.php:88
 #: lib/publicgroupnav.php:93
 msgid "Popular notices"
@@ -1208,14 +1216,6 @@ msgstr "Uppáhaldsbabl %s"
 msgid "Updates favored by %1$s on %2$s!"
 msgstr "Færslur frá %1$s á %2$s!"
 
-#: actions/favor.php:79
-msgid "This notice is already a favorite!"
-msgstr "Þetta babl er nú þegar í uppáhaldi!"
-
-#: actions/favor.php:92 lib/disfavorform.php:140
-msgid "Disfavor favorite"
-msgstr "Ekki lengur í uppáhaldi"
-
 #: actions/featured.php:69 lib/featureduserssection.php:87
 #: lib/publicgroupnav.php:89
 msgid "Featured users"
@@ -1446,6 +1446,30 @@ msgstr ""
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "Færslur frá %1$s á %2$s!"
 
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+msgid "Groups"
+msgstr "Hópar"
+
+#: actions/groups.php:64
+#, php-format
+msgid "Groups, page %d"
+msgstr "Hópar, síða %d"
+
+#: actions/groups.php:90
+#, php-format
+msgid ""
+"%%%%site.name%%%% groups let you find and talk with people of similar "
+"interests. After you join a group you can send messages to all other members "
+"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
+"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
+"%%%%)"
+msgstr ""
+
+#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
+msgid "Create a new group"
+msgstr "Búa til nýjan hóp"
+
 #: actions/groupsearch.php:52
 #, php-format
 msgid ""
@@ -1476,30 +1500,6 @@ msgid ""
 "action.newgroup%%) yourself!"
 msgstr ""
 
-#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
-msgid "Groups"
-msgstr "Hópar"
-
-#: actions/groups.php:64
-#, php-format
-msgid "Groups, page %d"
-msgstr "Hópar, síða %d"
-
-#: actions/groups.php:90
-#, php-format
-msgid ""
-"%%%%site.name%%%% groups let you find and talk with people of similar "
-"interests. After you join a group you can send messages to all other members "
-"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
-"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
-"%%%%)"
-msgstr ""
-
-#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
-msgid "Create a new group"
-msgstr "Búa til nýjan hóp"
-
 #: actions/groupunblock.php:91
 msgid "Only an admin can unblock group members."
 msgstr ""
@@ -1696,7 +1696,7 @@ msgstr "Persónuleg skilaboð"
 msgid "Optionally add a personal message to the invitation."
 msgstr "Bættu persónulegum skilaboðum við boðskortið ef þú vilt."
 
-#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:222
 msgid "Send"
 msgstr "Senda"
 
@@ -1802,59 +1802,59 @@ msgstr "Gat ekki fjarlægt notandann %s úr hópnum %s"
 msgid "%s left group %s"
 msgstr "%s gekk úr hópnum %s"
 
-#: actions/login.php:82 actions/register.php:137
+#: actions/login.php:83 actions/register.php:137
 msgid "Already logged in."
 msgstr "Þú hefur nú þegar skráð þig inn."
 
-#: actions/login.php:113 actions/login.php:123
+#: actions/login.php:114 actions/login.php:124
 #, fuzzy
 msgid "Invalid or expired token."
 msgstr "Ótækt bablinnihald"
 
-#: actions/login.php:146
+#: actions/login.php:147
 msgid "Incorrect username or password."
 msgstr "Rangt notendanafn eða lykilorð."
 
-#: actions/login.php:152
+#: actions/login.php:153
 #, fuzzy
 msgid "Error setting user. You are probably not authorized."
 msgstr "Engin heimild."
 
-#: actions/login.php:207 actions/login.php:260 lib/action.php:458
+#: actions/login.php:208 actions/login.php:261 lib/action.php:458
 #: lib/logingroupnav.php:79
 msgid "Login"
 msgstr "Innskráning"
 
-#: actions/login.php:246
+#: actions/login.php:247
 msgid "Login to site"
 msgstr "Skrá þig inn á síðuna"
 
-#: actions/login.php:249 actions/profilesettings.php:106
+#: actions/login.php:250 actions/profilesettings.php:106
 #: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
 #: lib/groupeditform.php:152 lib/userprofile.php:131
 msgid "Nickname"
 msgstr "Stuttnefni"
 
-#: actions/login.php:252 actions/register.php:428
+#: actions/login.php:253 actions/register.php:428
 #: lib/accountsettingsaction.php:116
 msgid "Password"
 msgstr "Lykilorð"
 
-#: actions/login.php:255 actions/register.php:477
+#: actions/login.php:256 actions/register.php:477
 msgid "Remember me"
 msgstr "Muna eftir mér"
 
-#: actions/login.php:256 actions/register.php:479
+#: actions/login.php:257 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 "
 "með þér!"
 
-#: actions/login.php:266
+#: actions/login.php:267
 msgid "Lost or forgotten password?"
 msgstr "Tapað eða gleymt lykilorð?"
 
-#: actions/login.php:285
+#: actions/login.php:286
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -1862,7 +1862,7 @@ msgstr ""
 "Af öryggisástæðum, vinsamlegast sláðu aftur inn notendanafnið þitt og "
 "lykilorð áður en þú breytir stillingunum þínum."
 
-#: actions/login.php:289
+#: actions/login.php:290
 #, fuzzy, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -1936,7 +1936,7 @@ msgstr ""
 msgid "Direct message to %s sent"
 msgstr "Bein skilaboð send til %s"
 
-#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:242 lib/channel.php:170
 msgid "Ajax Error"
 msgstr "Ajax villa"
 
@@ -1944,7 +1944,7 @@ msgstr "Ajax villa"
 msgid "New notice"
 msgstr "Nýtt babl"
 
-#: actions/newnotice.php:206
+#: actions/newnotice.php:208
 msgid "Notice posted"
 msgstr "Babl sent inn"
 
@@ -2022,8 +2022,8 @@ msgstr ""
 msgid "Only "
 msgstr ""
 
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996
-#: lib/api.php:1024 lib/api.php:1134
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011
+#: lib/api.php:1039 lib/api.php:1149
 msgid "Not a supported data format."
 msgstr "Enginn stuðningur við gagnasnið."
 
@@ -3567,6 +3567,26 @@ msgstr "Jabber snarskilaboðaþjónusta"
 msgid "SMS"
 msgstr "SMS"
 
+#: actions/tag.php:68
+#, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr "Babl merkt með %s, síða %d"
+
+#: actions/tag.php:86
+#, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr ""
+
+#: actions/tag.php:92
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "Bablveita fyrir %s"
+
+#: actions/tag.php:98
+#, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr ""
+
 #: actions/tagother.php:33
 msgid "Not logged in"
 msgstr "Ekki innskráð(ur)"
@@ -3617,26 +3637,6 @@ msgstr ""
 "Notaðu þetta eyðublað til að bæta við merkjum við áskrifendur þína eða þau "
 "sem þú ert áskrifandi að."
 
-#: actions/tag.php:68
-#, php-format
-msgid "Notices tagged with %s, page %d"
-msgstr "Babl merkt með %s, síða %d"
-
-#: actions/tag.php:86
-#, php-format
-msgid "Notice feed for tag %s (RSS 1.0)"
-msgstr ""
-
-#: actions/tag.php:92
-#, fuzzy, php-format
-msgid "Notice feed for tag %s (RSS 2.0)"
-msgstr "Bablveita fyrir %s"
-
-#: actions/tag.php:98
-#, php-format
-msgid "Notice feed for tag %s (Atom)"
-msgstr ""
-
 #: actions/tagrss.php:35
 msgid "No such tag."
 msgstr "Ekkert þannig merki."
@@ -3947,40 +3947,45 @@ msgstr "Gat ekki uppfært skilaboð með nýju veffangi."
 msgid "DB error inserting hashtag: %s"
 msgstr "Gagnagrunnsvilla við innsetningu myllumerkis: %s"
 
-#: classes/Notice.php:179
+#: classes/Notice.php:188
 msgid "Problem saving notice. Too long."
 msgstr ""
 
-#: classes/Notice.php:183
+#: classes/Notice.php:192
 msgid "Problem saving notice. Unknown user."
 msgstr "Gat ekki vistað babl. Óþekktur notandi."
 
-#: classes/Notice.php:188
+#: classes/Notice.php:197
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 "Of mikið babl í einu; slakaðu aðeins á og haltu svo áfram eftir nokkrar "
 "mínútur."
 
-#: classes/Notice.php:194
+#: classes/Notice.php:203
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
 msgstr ""
 
-#: classes/Notice.php:200
+#: classes/Notice.php:209
 msgid "You are banned from posting notices on this site."
 msgstr "Það hefur verið lagt bann við babli frá þér á þessari síðu."
 
-#: classes/Notice.php:265 classes/Notice.php:290
+#: classes/Notice.php:274 classes/Notice.php:299
 msgid "Problem saving notice."
 msgstr "Vandamál komu upp við að vista babl."
 
-#: classes/Notice.php:1124
+#: classes/Notice.php:1115
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Gagnagrunnsvilla við innsetningu svars: %s"
 
+#: classes/User.php:347
+#, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr ""
+
 #: classes/User_group.php:380
 msgid "Could not create group."
 msgstr "Gat ekki búið til hóp."
@@ -3989,11 +3994,6 @@ msgstr "Gat ekki búið til hóp."
 msgid "Could not set group membership."
 msgstr "Gat ekki skráð hópmeðlimi."
 
-#: classes/User.php:347
-#, php-format
-msgid "Welcome to %1$s, @%2$s!"
-msgstr ""
-
 #: lib/accountsettingsaction.php:108
 msgid "Change your profile settings"
 msgstr "Breyta persónulegu stillingunum þínum"
@@ -4306,7 +4306,7 @@ msgstr ""
 msgid "Notice with that id does not exist"
 msgstr ""
 
-#: lib/command.php:168 lib/command.php:416 lib/command.php:471
+#: lib/command.php:168 lib/command.php:416 lib/command.php:472
 msgid "User has no last notice"
 msgstr "Notandi hefur ekkert nýtt babl"
 
@@ -4353,102 +4353,102 @@ msgstr "Villa kom upp við að senda bein skilaboð"
 msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr "Skilaboð eru of löng - 140 tákn eru í mesta lagi leyfð en þú sendir %d"
 
-#: lib/command.php:439
+#: lib/command.php:440
 #, fuzzy, php-format
 msgid "Reply to %s sent"
 msgstr "Svara þessu babli"
 
-#: lib/command.php:441
+#: lib/command.php:442
 #, fuzzy
 msgid "Error saving notice."
 msgstr "Vandamál komu upp við að vista babl."
 
-#: lib/command.php:495
+#: lib/command.php:496
 msgid "Specify the name of the user to subscribe to"
 msgstr "Tilgreindu nafn notandans sem þú vilt gerast áskrifandi að"
 
-#: lib/command.php:502
+#: lib/command.php:503
 #, php-format
 msgid "Subscribed to %s"
 msgstr "Nú ert þú áskrifandi að %s"
 
-#: lib/command.php:523
+#: lib/command.php:524
 msgid "Specify the name of the user to unsubscribe from"
 msgstr "Tilgreindu nafn notandans sem þú vilt hætta sem áskrifandi að"
 
-#: lib/command.php:530
+#: lib/command.php:531
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr "Nú ert þú ekki lengur áskrifandi að %s"
 
-#: lib/command.php:548 lib/command.php:571
+#: lib/command.php:549 lib/command.php:572
 msgid "Command not yet implemented."
 msgstr "Skipun hefur ekki verið fullbúin"
 
-#: lib/command.php:551
+#: lib/command.php:552
 msgid "Notification off."
 msgstr "Tilkynningar af."
 
-#: lib/command.php:553
+#: lib/command.php:554
 msgid "Can't turn off notification."
 msgstr "Get ekki slökkt á tilkynningum."
 
-#: lib/command.php:574
+#: lib/command.php:575
 msgid "Notification on."
 msgstr "Tilkynningar á."
 
-#: lib/command.php:576
+#: lib/command.php:577
 msgid "Can't turn on notification."
 msgstr "Get ekki kveikt á tilkynningum."
 
-#: lib/command.php:588
+#: lib/command.php:590
 msgid "Login command is disabled"
 msgstr ""
 
-#: lib/command.php:602
+#: lib/command.php:604
 #, fuzzy, php-format
 msgid "Could not create login token for %s"
 msgstr "Gat ekki búið til uppáhald."
 
-#: lib/command.php:607
+#: lib/command.php:609
 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:623
+#: lib/command.php:625
 #, fuzzy
 msgid "You are not subscribed to anyone."
 msgstr "Þú ert ekki áskrifandi."
 
-#: lib/command.php:625
+#: lib/command.php:627
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Þú ert nú þegar í áskrift að þessum notendum:"
 msgstr[1] "Þú ert nú þegar í áskrift að þessum notendum:"
 
-#: lib/command.php:645
+#: lib/command.php:647
 #, fuzzy
 msgid "No one is subscribed to you."
 msgstr "Gat ekki leyft öðrum að gerast áskrifandi að þér."
 
-#: lib/command.php:647
+#: lib/command.php:649
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Gat ekki leyft öðrum að gerast áskrifandi að þér."
 msgstr[1] "Gat ekki leyft öðrum að gerast áskrifandi að þér."
 
-#: lib/command.php:667
+#: lib/command.php:669
 #, fuzzy
 msgid "You are not a member of any groups."
 msgstr "Þú ert ekki meðlimur í þessum hópi."
 
-#: lib/command.php:669
+#: lib/command.php:671
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Þú ert ekki meðlimur í þessum hópi."
 msgstr[1] "Þú ert ekki meðlimur í þessum hópi."
 
-#: lib/command.php:683
+#: lib/command.php:685
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -4547,10 +4547,6 @@ msgstr "Setja þetta babl í uppáhald"
 msgid "Favor"
 msgstr "Uppáhald"
 
-#: lib/feedlist.php:64
-msgid "Export data"
-msgstr "Flytja út gögn"
-
 #: lib/feed.php:85
 msgid "RSS 1.0"
 msgstr ""
@@ -4567,6 +4563,10 @@ msgstr ""
 msgid "FOAF"
 msgstr ""
 
+#: lib/feedlist.php:64
+msgid "Export data"
+msgstr "Flytja út gögn"
+
 #: lib/galleryaction.php:121
 msgid "Filter tags"
 msgstr "Sía merki"
@@ -4728,21 +4728,6 @@ msgstr "Skráðu þig inn með notendanafni og lykilorði"
 msgid "Sign up for a new account"
 msgstr "Búðu til nýjan aðgang"
 
-#: lib/mailbox.php:89
-msgid "Only the user can read their own mailboxes."
-msgstr "Aðeins notandinn getur lesið hans eigin pósthólf."
-
-#: lib/mailbox.php:139
-msgid ""
-"You have no private messages. You can send private message to engage other "
-"users in conversation. People can send you messages for your eyes only."
-msgstr ""
-
-#: lib/mailbox.php:227 lib/noticelist.php:452
-#, fuzzy
-msgid "from"
-msgstr "frá"
-
 #: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Staðfesting tölvupóstfangs"
@@ -4929,6 +4914,21 @@ msgid ""
 "\n"
 msgstr ""
 
+#: lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
+msgstr "Aðeins notandinn getur lesið hans eigin pósthólf."
+
+#: lib/mailbox.php:139
+msgid ""
+"You have no private messages. You can send private message to engage other "
+"users in conversation. People can send you messages for your eyes only."
+msgstr ""
+
+#: lib/mailbox.php:227 lib/noticelist.php:452
+#, fuzzy
+msgid "from"
+msgstr "frá"
+
 #: lib/mediafile.php:98 lib/mediafile.php:123
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
@@ -4990,7 +4990,7 @@ msgstr "Senda bein skilaboð"
 msgid "To"
 msgstr "Til"
 
-#: lib/messageform.php:161 lib/noticeform.php:185
+#: lib/messageform.php:159 lib/noticeform.php:183
 msgid "Available characters"
 msgstr "Leyfileg tákn"
 
@@ -5003,11 +5003,11 @@ msgstr "Senda babl"
 msgid "What's up, %s?"
 msgstr "Hvað er að frétta %s?"
 
-#: lib/noticeform.php:192
+#: lib/noticeform.php:190
 msgid "Attach"
 msgstr ""
 
-#: lib/noticeform.php:196
+#: lib/noticeform.php:194
 msgid "Attach a file"
 msgstr ""
 
@@ -5078,12 +5078,12 @@ msgstr "Villa kom upp við að setja inn persónulega fjarsíðu"
 msgid "Duplicate notice"
 msgstr "Eyða babli"
 
-#: lib/oauthstore.php:467 lib/subs.php:48
+#: lib/oauthstore.php:466 lib/subs.php:48
 #, fuzzy
 msgid "You have been banned from subscribing."
 msgstr "Þessi notandi hefur bannað þér að gerast áskrifandi"
 
-#: lib/oauthstore.php:492
+#: lib/oauthstore.php:491
 msgid "Couldn't insert new subscription."
 msgstr "Gat ekki sett inn nýja áskrift."
 
@@ -5248,20 +5248,6 @@ msgstr "Fólk sem eru áskrifendur að %s"
 msgid "Groups %s is a member of"
 msgstr "Hópar sem %s er meðlimur í"
 
-#: 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/subscriptionlist.php:126
-msgid "(none)"
-msgstr "(ekkert)"
-
 #: lib/subs.php:52
 msgid "Already subscribed!"
 msgstr ""
@@ -5292,6 +5278,20 @@ msgstr "Gat ekki eytt áskrift."
 msgid "Couldn't delete subscription."
 msgstr "Gat ekki eytt áskrift."
 
+#: 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/subscriptionlist.php:126
+msgid "(none)"
+msgstr "(ekkert)"
+
 #: lib/tagcloudsection.php:56
 msgid "None"
 msgstr "Ekkert"
diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po
index b86ca75b94..6a85f3dc25 100644
--- a/locale/it/LC_MESSAGES/statusnet.po
+++ b/locale/it/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 21:25+0000\n"
-"PO-Revision-Date: 2009-12-07 21:26:45+0000\n"
+"POT-Creation-Date: 2009-12-12 17:09+0000\n"
+"PO-Revision-Date: 2009-12-12 17:09:55+0000\n"
 "Language-Team: Italian\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n"
+"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: it\n"
 "X-Message-Group: out-statusnet\n"
@@ -27,11 +27,11 @@ msgstr "Nessuna tale etichetta."
 
 #: actions/all.php:74 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofile.php:105
 #: actions/apiaccountupdateprofilebackgroundimage.php:116
-#: actions/apiaccountupdateprofileimage.php:105
-#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
-#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
-#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
+#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90
 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
@@ -44,7 +44,7 @@ msgstr "Nessuna tale etichetta."
 #: actions/repliesrss.php:38 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38
 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
-#: lib/command.php:364 lib/command.php:411 lib/command.php:466
+#: lib/command.php:364 lib/command.php:411 lib/command.php:467
 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
 #: lib/subs.php:34 lib/subs.php:116
 msgid "No such user."
@@ -56,7 +56,7 @@ msgid "%s and friends, page %d"
 msgstr "%s e amici, pagina %d"
 
 #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
-#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100
+#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s e amici"
@@ -108,25 +108,25 @@ msgstr ""
 msgid "You and friends"
 msgstr "%s e amici"
 
-#: actions/allrss.php:119 actions/apitimelinefriends.php:121
+#: actions/allrss.php:119 actions/apitimelinefriends.php:122
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Aggiornamenti da %1$s e amici su %2$s!"
 
 #: actions/apiaccountratelimitstatus.php:70
 #: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofile.php:97
 #: actions/apiaccountupdateprofilebackgroundimage.php:94
 #: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apiaccountupdateprofile.php:97
 #, fuzzy
 msgid "API method not found."
 msgstr "Metodo delle API non trovato!"
 
 #: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofile.php:89
 #: actions/apiaccountupdateprofilebackgroundimage.php:86
 #: actions/apiaccountupdateprofilecolors.php:110
-#: actions/apiaccountupdateprofileimage.php:84
-#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
+#: actions/apiaccountupdateprofileimage.php:84 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
@@ -146,9 +146,23 @@ msgstr ""
 msgid "Could not update user."
 msgstr "Impossibile aggiornare l'utente."
 
+#: actions/apiaccountupdateprofile.php:112
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+msgid "User has no profile."
+msgstr "L'utente non ha un profilo."
+
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "Impossibile salvare il profilo."
+
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257
 #: actions/designadminpanel.php:122 actions/newnotice.php:94
 #: lib/designsettings.php:283
 #, php-format
@@ -171,20 +185,6 @@ msgstr "Impossibile salvare le tue impostazioni di Twitter!"
 msgid "Could not update your design."
 msgstr "Impossibile aggiornare l'utente."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
-#: actions/apiaccountupdateprofileimage.php:130
-#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
-#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
-msgid "User has no profile."
-msgstr "L'utente non ha un profilo."
-
-#: actions/apiaccountupdateprofile.php:147
-#, fuzzy
-msgid "Could not save profile."
-msgstr "Impossibile salvare il profilo."
-
 #: actions/apiblockcreate.php:105
 #, fuzzy
 msgid "You cannot block yourself!"
@@ -198,23 +198,6 @@ msgstr "Blocco dell'utente non riuscito."
 msgid "Unblock user failed."
 msgstr "Sblocco dell'utente non riuscito."
 
-#: actions/apidirectmessagenew.php:126
-msgid "No message text!"
-msgstr "Nessun testo nel messaggio!"
-
-#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
-#, fuzzy, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr "Troppo lungo. Il massimo per un messaggio è 140 caratteri."
-
-#: actions/apidirectmessagenew.php:146
-msgid "Recipient user not found."
-msgstr "Utente destinatario non trovato."
-
-#: actions/apidirectmessagenew.php:150
-msgid "Can't send direct messages to users who aren't your friend."
-msgstr "Non puoi inviare messaggi diretti a utenti che non sono amici tuoi."
-
 #: actions/apidirectmessage.php:89
 #, fuzzy, php-format
 msgid "Direct messages from %s"
@@ -240,18 +223,35 @@ msgstr "Tutti i messaggi diretti inviati a %s"
 #: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
-#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
-#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149
-#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
-#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156
+#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151
+#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141
+#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
 msgid "API method not found!"
 msgstr "Metodo delle API non trovato!"
 
+#: actions/apidirectmessagenew.php:126
+msgid "No message text!"
+msgstr "Nessun testo nel messaggio!"
+
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, fuzzy, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "Troppo lungo. Il massimo per un messaggio è 140 caratteri."
+
+#: actions/apidirectmessagenew.php:146
+msgid "Recipient user not found."
+msgstr "Utente destinatario non trovato."
+
+#: actions/apidirectmessagenew.php:150
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr "Non puoi inviare messaggi diretti a utenti che non sono amici tuoi."
+
 #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
 #: actions/apistatusesdestroy.php:113
 msgid "No status found with that ID."
@@ -404,16 +404,6 @@ msgstr "Non sei un membro di quel gruppo."
 msgid "Could not remove user %s to group %s."
 msgstr "Impossibile rimuovere l'utente %s dal gruppo %s"
 
-#: actions/apigrouplistall.php:90 actions/usergroups.php:62
-#, php-format
-msgid "%s groups"
-msgstr "Gruppi di %s"
-
-#: actions/apigrouplistall.php:94
-#, fuzzy, php-format
-msgid "groups on %s"
-msgstr "Azioni dei gruppi"
-
 #: actions/apigrouplist.php:95
 #, fuzzy, php-format
 msgid "%s's groups"
@@ -424,6 +414,16 @@ msgstr "Gruppi di %s"
 msgid "Groups %s is a member of on %s."
 msgstr "Il gruppo %s è membro di"
 
+#: actions/apigrouplistall.php:90 actions/usergroups.php:62
+#, php-format
+msgid "%s groups"
+msgstr "Gruppi di %s"
+
+#: actions/apigrouplistall.php:94
+#, fuzzy, php-format
+msgid "groups on %s"
+msgstr "Azioni dei gruppi"
+
 #: actions/apistatusesdestroy.php:107
 msgid "This method requires a POST or DELETE."
 msgstr "Questo metodo richiede POST o DELETE."
@@ -461,54 +461,54 @@ msgstr ""
 msgid "Unsupported format."
 msgstr "Formato file immagine non supportato."
 
-#: actions/apitimelinefavorites.php:107
+#: actions/apitimelinefavorites.php:108
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr "%s / Preferiti da %s"
 
-#: actions/apitimelinefavorites.php:119
+#: actions/apitimelinefavorites.php:120
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr "%s aggiornamenti preferiti da %s / %s"
 
-#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117
+#: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118
 #: actions/grouprss.php:131 actions/userrss.php:90
 #, php-format
 msgid "%s timeline"
 msgstr "Attività di %s"
 
-#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125
+#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
 #: actions/userrss.php:92
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Aggiornamenti da %1$s su %2$s!"
 
-#: actions/apitimelinementions.php:116
+#: actions/apitimelinementions.php:117
 #, fuzzy, php-format
 msgid "%1$s / Updates mentioning %2$s"
 msgstr "%1$s / Aggiornamenti in risposta a %2$s"
 
-#: actions/apitimelinementions.php:126
+#: actions/apitimelinementions.php:127
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s aggiornamenti in risposta agli aggiornamenti da %2$s / %3$s"
 
-#: actions/apitimelinepublic.php:106 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "attività pubblica di %s"
 
-#: actions/apitimelinepublic.php:110 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "Aggiornamenti di %s da tutti!"
 
-#: actions/apitimelinetag.php:101 actions/tag.php:66
+#: actions/apitimelinetag.php:102 actions/tag.php:66
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Messaggi etichettati con %s"
 
-#: actions/apitimelinetag.php:107 actions/tagrss.php:64
+#: actions/apitimelinetag.php:108 actions/tagrss.php:64
 #, fuzzy, php-format
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Aggiornamenti da %1$s su %2$s!"
@@ -544,45 +544,45 @@ msgstr "Immagine"
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr "Qui puoi caricare la tua immagine personale."
 
-#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:185
 #: actions/grouplogo.php:178 actions/remotesubscribe.php:191
 #: actions/userauthorization.php:72 actions/userrss.php:103
 msgid "User without matching profile"
 msgstr "Utente senza profilo corrispondente"
 
-#: actions/avatarsettings.php:119 actions/avatarsettings.php:194
+#: actions/avatarsettings.php:119 actions/avatarsettings.php:197
 #: actions/grouplogo.php:251
 msgid "Avatar settings"
 msgstr "Impostazioni immagine"
 
-#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/avatarsettings.php:127 actions/avatarsettings.php:205
 #: actions/grouplogo.php:199 actions/grouplogo.php:259
 msgid "Original"
 msgstr "Originale"
 
-#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/avatarsettings.php:142 actions/avatarsettings.php:217
 #: actions/grouplogo.php:210 actions/grouplogo.php:271
 msgid "Preview"
 msgstr "Anteprima"
 
-#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
+#: actions/avatarsettings.php:149 lib/deleteuserform.php:66
 #: lib/noticelist.php:550
 msgid "Delete"
 msgstr "Elimina"
 
-#: actions/avatarsettings.php:165 actions/grouplogo.php:233
+#: actions/avatarsettings.php:166 actions/grouplogo.php:233
 msgid "Upload"
 msgstr "Carica"
 
-#: actions/avatarsettings.php:228 actions/grouplogo.php:286
+#: actions/avatarsettings.php:231 actions/grouplogo.php:286
 msgid "Crop"
 msgstr "Ritaglia"
 
-#: actions/avatarsettings.php:265 actions/disfavor.php:74
+#: actions/avatarsettings.php:268 actions/disfavor.php:74
 #: actions/emailsettings.php:238 actions/favor.php:75
 #: actions/groupblock.php:66 actions/grouplogo.php:309
 #: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -593,34 +593,73 @@ msgstr "Ritaglia"
 msgid "There was a problem with your session token. Try again, please."
 msgstr "C'è stato un problema con il tuo token di sessione. Prova di nuovo."
 
-#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
+#: actions/avatarsettings.php:281 actions/designadminpanel.php:103
 #: actions/emailsettings.php:256 actions/grouplogo.php:319
 #: actions/imsettings.php:220 actions/recoverpassword.php:44
 #: actions/smssettings.php:248 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "Invio del modulo inaspettato."
 
-#: actions/avatarsettings.php:322
+#: actions/avatarsettings.php:328
 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:337 actions/grouplogo.php:377
+#: actions/avatarsettings.php:343 actions/grouplogo.php:377
 msgid "Lost our file data."
 msgstr "Perso il nostro file di dati."
 
-#: actions/avatarsettings.php:360
+#: actions/avatarsettings.php:366
 msgid "Avatar updated."
 msgstr "Immagine aggiornata."
 
-#: actions/avatarsettings.php:363
+#: actions/avatarsettings.php:369
 msgid "Failed updating avatar."
 msgstr "Errore nell'aggiornare l'immagine."
 
-#: actions/avatarsettings.php:387
+#: actions/avatarsettings.php:393
 #, fuzzy
 msgid "Avatar deleted."
 msgstr "Immagine aggiornata."
 
+#: actions/block.php:69
+#, fuzzy
+msgid "You already blocked that user."
+msgstr "Hai già bloccato questo utente."
+
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
+msgid "Block user"
+msgstr "Blocca utente"
+
+#: actions/block.php:130
+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/block.php:143 actions/deletenotice.php:145
+#: actions/deleteuser.php:147 actions/groupblock.php:178
+msgid "No"
+msgstr "No"
+
+#: actions/block.php:143 actions/deleteuser.php:147
+#, fuzzy
+msgid "Do not block this user"
+msgstr "Sblocca questo utente"
+
+#: actions/block.php:144 actions/deletenotice.php:146
+#: actions/deleteuser.php:148 actions/groupblock.php:179
+msgid "Yes"
+msgstr "Sì"
+
+#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
+msgid "Block this user"
+msgstr "Blocca questo utente"
+
+#: actions/block.php:162
+msgid "Failed to save block information."
+msgstr "Salvataggio delle informazioni per il blocco non riuscito."
+
 #: actions/blockedfromgroup.php:73 actions/editgroup.php:84
 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
 #: actions/groupmembers.php:76 actions/grouprss.php:91
@@ -663,45 +702,6 @@ msgstr "Sblocca"
 msgid "Unblock this user"
 msgstr "Sblocca questo utente"
 
-#: actions/block.php:69
-#, fuzzy
-msgid "You already blocked that user."
-msgstr "Hai già bloccato questo utente."
-
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
-msgid "Block user"
-msgstr "Blocca utente"
-
-#: actions/block.php:130
-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/block.php:143 actions/deletenotice.php:145
-#: actions/deleteuser.php:147 actions/groupblock.php:178
-msgid "No"
-msgstr "No"
-
-#: actions/block.php:143 actions/deleteuser.php:147
-#, fuzzy
-msgid "Do not block this user"
-msgstr "Sblocca questo utente"
-
-#: actions/block.php:144 actions/deletenotice.php:146
-#: actions/deleteuser.php:148 actions/groupblock.php:179
-msgid "Yes"
-msgstr "Sì"
-
-#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
-msgid "Block this user"
-msgstr "Blocca questo utente"
-
-#: actions/block.php:162
-msgid "Failed to save block information."
-msgstr "Salvataggio delle informazioni per il blocco non riuscito."
-
 #: actions/bookmarklet.php:50
 #, fuzzy
 msgid "Post to "
@@ -1190,6 +1190,14 @@ msgstr "Indirizzo email di ricezione rimosso."
 msgid "New incoming email address added."
 msgstr "Nuovo indirizzo email di ricezione aggiunto."
 
+#: actions/favor.php:79
+msgid "This notice is already a favorite!"
+msgstr "Questo messaggio è già un preferito!"
+
+#: actions/favor.php:92 lib/disfavorform.php:140
+msgid "Disfavor favorite"
+msgstr "Rimuovi preferito"
+
 #: actions/favorited.php:65 lib/popularnoticesection.php:88
 #: lib/publicgroupnav.php:93
 msgid "Popular notices"
@@ -1232,14 +1240,6 @@ msgstr "Messaggi preferiti di %s"
 msgid "Updates favored by %1$s on %2$s!"
 msgstr "Aggiornamenti da %1$s su %2$s!"
 
-#: actions/favor.php:79
-msgid "This notice is already a favorite!"
-msgstr "Questo messaggio è già un preferito!"
-
-#: actions/favor.php:92 lib/disfavorform.php:140
-msgid "Disfavor favorite"
-msgstr "Rimuovi preferito"
-
 #: actions/featured.php:69 lib/featureduserssection.php:87
 #: lib/publicgroupnav.php:89
 msgid "Featured users"
@@ -1487,6 +1487,30 @@ msgstr ""
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "Aggiornamenti da %1$s su %2$s!"
 
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+msgid "Groups"
+msgstr "Gruppi"
+
+#: actions/groups.php:64
+#, php-format
+msgid "Groups, page %d"
+msgstr "Gruppi, pagina %d"
+
+#: actions/groups.php:90
+#, php-format
+msgid ""
+"%%%%site.name%%%% groups let you find and talk with people of similar "
+"interests. After you join a group you can send messages to all other members "
+"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
+"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
+"%%%%)"
+msgstr ""
+
+#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
+msgid "Create a new group"
+msgstr "Crea un nuovo gruppo"
+
 #: actions/groupsearch.php:52
 #, fuzzy, php-format
 msgid ""
@@ -1520,30 +1544,6 @@ msgid ""
 "action.newgroup%%) yourself!"
 msgstr ""
 
-#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
-msgid "Groups"
-msgstr "Gruppi"
-
-#: actions/groups.php:64
-#, php-format
-msgid "Groups, page %d"
-msgstr "Gruppi, pagina %d"
-
-#: actions/groups.php:90
-#, php-format
-msgid ""
-"%%%%site.name%%%% groups let you find and talk with people of similar "
-"interests. After you join a group you can send messages to all other members "
-"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
-"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
-"%%%%)"
-msgstr ""
-
-#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
-msgid "Create a new group"
-msgstr "Crea un nuovo gruppo"
-
 #: actions/groupunblock.php:91
 msgid "Only an admin can unblock group members."
 msgstr ""
@@ -1741,7 +1741,7 @@ msgstr "Messaggio personale"
 msgid "Optionally add a personal message to the invitation."
 msgstr "Puoi aggiungere un messaggio personale agli inviti."
 
-#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:222
 msgid "Send"
 msgstr "Invia"
 
@@ -1847,57 +1847,57 @@ msgstr "Impossibile rimuovere l'utente %s dal gruppo %s"
 msgid "%s left group %s"
 msgstr "%s ha lasciato il gruppo %s"
 
-#: actions/login.php:82 actions/register.php:137
+#: actions/login.php:83 actions/register.php:137
 msgid "Already logged in."
 msgstr "Accesso già effettuato."
 
-#: actions/login.php:113 actions/login.php:123
+#: actions/login.php:114 actions/login.php:124
 #, fuzzy
 msgid "Invalid or expired token."
 msgstr "Contenuto del messaggio non valido"
 
-#: actions/login.php:146
+#: actions/login.php:147
 msgid "Incorrect username or password."
 msgstr "Nome utente o password non corretto."
 
-#: actions/login.php:152
+#: actions/login.php:153
 #, fuzzy
 msgid "Error setting user. You are probably not authorized."
 msgstr "Non autorizzato."
 
-#: actions/login.php:207 actions/login.php:260 lib/action.php:458
+#: actions/login.php:208 actions/login.php:261 lib/action.php:458
 #: lib/logingroupnav.php:79
 msgid "Login"
 msgstr "Accedi"
 
-#: actions/login.php:246
+#: actions/login.php:247
 msgid "Login to site"
 msgstr "Accedi al sito"
 
-#: actions/login.php:249 actions/profilesettings.php:106
+#: actions/login.php:250 actions/profilesettings.php:106
 #: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
 #: lib/groupeditform.php:152 lib/userprofile.php:131
 msgid "Nickname"
 msgstr "Soprannome"
 
-#: actions/login.php:252 actions/register.php:428
+#: actions/login.php:253 actions/register.php:428
 #: lib/accountsettingsaction.php:116
 msgid "Password"
 msgstr "Password"
 
-#: actions/login.php:255 actions/register.php:477
+#: actions/login.php:256 actions/register.php:477
 msgid "Remember me"
 msgstr "Ricordami"
 
-#: actions/login.php:256 actions/register.php:479
+#: actions/login.php:257 actions/register.php:479
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Accedi automaticamente in futuro; non per computer condivisi!"
 
-#: actions/login.php:266
+#: actions/login.php:267
 msgid "Lost or forgotten password?"
 msgstr "Password persa o dimenticata?"
 
-#: actions/login.php:285
+#: actions/login.php:286
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -1905,7 +1905,7 @@ msgstr ""
 "Per motivi di sicurezza è necessario reinserire il proprio nome utente e la "
 "propria password prima di modificare le impostazioni."
 
-#: actions/login.php:289
+#: actions/login.php:290
 #, fuzzy, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -1978,7 +1978,7 @@ msgstr "Messaggio"
 msgid "Direct message to %s sent"
 msgstr "Messaggio diretto a %s inviato"
 
-#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:242 lib/channel.php:170
 msgid "Ajax Error"
 msgstr "Errore di Ajax"
 
@@ -1986,7 +1986,7 @@ msgstr "Errore di Ajax"
 msgid "New notice"
 msgstr "Nuovo messaggio"
 
-#: actions/newnotice.php:206
+#: actions/newnotice.php:208
 msgid "Notice posted"
 msgstr "Messaggio inviato"
 
@@ -2065,8 +2065,8 @@ msgstr "Connetti"
 msgid "Only "
 msgstr ""
 
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996
-#: lib/api.php:1024 lib/api.php:1134
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011
+#: lib/api.php:1039 lib/api.php:1149
 msgid "Not a supported data format."
 msgstr "Non è un formato di dati supportato."
 
@@ -3628,6 +3628,26 @@ msgstr "Jabber"
 msgid "SMS"
 msgstr "SMS"
 
+#: actions/tag.php:68
+#, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr "Messaggi etichettati con %s, pagina %d"
+
+#: actions/tag.php:86
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "Feed dei messaggi per %s"
+
+#: actions/tag.php:92
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "Feed dei messaggi per %s"
+
+#: actions/tag.php:98
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "Feed dei messaggi per %s"
+
 #: actions/tagother.php:33
 msgid "Not logged in"
 msgstr "Non connesso"
@@ -3677,26 +3697,6 @@ msgstr ""
 "Usa questo modulo per aggiungere etichette ai tuoi abbonati o ai tuoi "
 "abbonamenti."
 
-#: actions/tag.php:68
-#, php-format
-msgid "Notices tagged with %s, page %d"
-msgstr "Messaggi etichettati con %s, pagina %d"
-
-#: actions/tag.php:86
-#, fuzzy, php-format
-msgid "Notice feed for tag %s (RSS 1.0)"
-msgstr "Feed dei messaggi per %s"
-
-#: actions/tag.php:92
-#, fuzzy, php-format
-msgid "Notice feed for tag %s (RSS 2.0)"
-msgstr "Feed dei messaggi per %s"
-
-#: actions/tag.php:98
-#, fuzzy, php-format
-msgid "Notice feed for tag %s (Atom)"
-msgstr "Feed dei messaggi per %s"
-
 #: actions/tagrss.php:35
 msgid "No such tag."
 msgstr "Nessuna tale etichetta."
@@ -4011,23 +4011,23 @@ msgstr "Impossibile aggiornare il messaggio con il nuovo URI."
 msgid "DB error inserting hashtag: %s"
 msgstr "Errore del DB nell'inserire un hashtag: %s"
 
-#: classes/Notice.php:179
+#: classes/Notice.php:188
 #, fuzzy
 msgid "Problem saving notice. Too long."
 msgstr "Problema nel salvare il messaggio."
 
-#: classes/Notice.php:183
+#: classes/Notice.php:192
 msgid "Problem saving notice. Unknown user."
 msgstr "Problema nel salvare il messaggio. Utente sconosciuto."
 
-#: classes/Notice.php:188
+#: classes/Notice.php:197
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 "Troppi messaggi troppo velocemente; fai una pausa e scrivi di nuovo tra "
 "qualche minuto."
 
-#: classes/Notice.php:194
+#: classes/Notice.php:203
 #, fuzzy
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
@@ -4036,19 +4036,24 @@ msgstr ""
 "Troppi messaggi troppo velocemente; fai una pausa e scrivi di nuovo tra "
 "qualche minuto."
 
-#: classes/Notice.php:200
+#: classes/Notice.php:209
 msgid "You are banned from posting notices on this site."
 msgstr "Ti è proibito inviare messaggi su questo sito."
 
-#: classes/Notice.php:265 classes/Notice.php:290
+#: classes/Notice.php:274 classes/Notice.php:299
 msgid "Problem saving notice."
 msgstr "Problema nel salvare il messaggio."
 
-#: classes/Notice.php:1124
+#: classes/Notice.php:1115
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Errore del DB nell'inserire la risposta: %s"
 
+#: classes/User.php:347
+#, fuzzy, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr "Messaggio a %1$s su %2$s"
+
 #: classes/User_group.php:380
 msgid "Could not create group."
 msgstr "Impossibile creare il gruppo."
@@ -4057,11 +4062,6 @@ msgstr "Impossibile creare il gruppo."
 msgid "Could not set group membership."
 msgstr "Impossibile impostare la membership al gruppo."
 
-#: classes/User.php:347
-#, fuzzy, php-format
-msgid "Welcome to %1$s, @%2$s!"
-msgstr "Messaggio a %1$s su %2$s"
-
 #: lib/accountsettingsaction.php:108
 msgid "Change your profile settings"
 msgstr "Modifica le impostazioni del tuo profilo"
@@ -4376,7 +4376,7 @@ msgstr ""
 msgid "Notice with that id does not exist"
 msgstr ""
 
-#: lib/command.php:168 lib/command.php:416 lib/command.php:471
+#: lib/command.php:168 lib/command.php:416 lib/command.php:472
 msgid "User has no last notice"
 msgstr "L'utente non ha un ultimo messaggio"
 
@@ -4423,102 +4423,102 @@ msgstr "Errore nell'inviare il messaggio diretto."
 msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr "Messaggio troppo lungo - massimo 140 caratteri, inviati %d"
 
-#: lib/command.php:439
+#: lib/command.php:440
 #, fuzzy, php-format
 msgid "Reply to %s sent"
 msgstr "Rispondi a questo messaggio"
 
-#: lib/command.php:441
+#: lib/command.php:442
 #, fuzzy
 msgid "Error saving notice."
 msgstr "Problema nel salvare il messaggio."
 
-#: lib/command.php:495
+#: lib/command.php:496
 msgid "Specify the name of the user to subscribe to"
 msgstr "Specifica il nome dell'utente a cui abbonarti"
 
-#: lib/command.php:502
+#: lib/command.php:503
 #, php-format
 msgid "Subscribed to %s"
 msgstr "Abbonato a %s"
 
-#: lib/command.php:523
+#: lib/command.php:524
 msgid "Specify the name of the user to unsubscribe from"
 msgstr "Specifica il nome dell'utente da cui annullare l'abbonamento"
 
-#: lib/command.php:530
+#: lib/command.php:531
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr "Abbonamento a %s annullato"
 
-#: lib/command.php:548 lib/command.php:571
+#: lib/command.php:549 lib/command.php:572
 msgid "Command not yet implemented."
 msgstr "Comando non ancora implementato."
 
-#: lib/command.php:551
+#: lib/command.php:552
 msgid "Notification off."
 msgstr "Notifiche disattivate."
 
-#: lib/command.php:553
+#: lib/command.php:554
 msgid "Can't turn off notification."
 msgstr "Impossibile disattivare le notifiche."
 
-#: lib/command.php:574
+#: lib/command.php:575
 msgid "Notification on."
 msgstr "Notifiche attivate."
 
-#: lib/command.php:576
+#: lib/command.php:577
 msgid "Can't turn on notification."
 msgstr "Impossibile attivare le notifiche."
 
-#: lib/command.php:588
+#: lib/command.php:590
 msgid "Login command is disabled"
 msgstr ""
 
-#: lib/command.php:602
+#: lib/command.php:604
 #, fuzzy, php-format
 msgid "Could not create login token for %s"
-msgstr "Impossibile creare preferito."
+msgstr "Impossibile creare il modulo OpenID: %s"
 
-#: lib/command.php:607
+#: lib/command.php:609
 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:623
+#: lib/command.php:625
 #, fuzzy
 msgid "You are not subscribed to anyone."
 msgstr "Non sei abbonato a quel profilo."
 
-#: lib/command.php:625
+#: lib/command.php:627
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Sei già abbonato a questi utenti:"
 msgstr[1] "Sei già abbonato a questi utenti:"
 
-#: lib/command.php:645
+#: lib/command.php:647
 #, fuzzy
 msgid "No one is subscribed to you."
 msgstr "Impossibile abbonare altri a te."
 
-#: lib/command.php:647
+#: lib/command.php:649
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Impossibile abbonare altri a te."
 msgstr[1] "Impossibile abbonare altri a te."
 
-#: lib/command.php:667
+#: lib/command.php:669
 #, fuzzy
 msgid "You are not a member of any groups."
 msgstr "Non sei un membro di quel gruppo."
 
-#: lib/command.php:669
+#: lib/command.php:671
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Non sei un membro di quel gruppo."
 msgstr[1] "Non sei un membro di quel gruppo."
 
-#: lib/command.php:683
+#: lib/command.php:685
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -4618,10 +4618,6 @@ msgstr "Rendi questo messaggio un favorito"
 msgid "Favor"
 msgstr "Preferito"
 
-#: lib/feedlist.php:64
-msgid "Export data"
-msgstr "Esporta dati"
-
 #: lib/feed.php:85
 msgid "RSS 1.0"
 msgstr ""
@@ -4638,6 +4634,10 @@ msgstr ""
 msgid "FOAF"
 msgstr ""
 
+#: lib/feedlist.php:64
+msgid "Export data"
+msgstr "Esporta dati"
+
 #: lib/galleryaction.php:121
 msgid "Filter tags"
 msgstr "Filtra etichette"
@@ -4799,21 +4799,6 @@ msgstr "Accedi con nome utente e password"
 msgid "Sign up for a new account"
 msgstr "Iscriviti per un nuovo account"
 
-#: lib/mailbox.php:89
-msgid "Only the user can read their own mailboxes."
-msgstr "Solo l'utente può leggere la propria casella di posta."
-
-#: lib/mailbox.php:139
-msgid ""
-"You have no private messages. You can send private message to engage other "
-"users in conversation. People can send you messages for your eyes only."
-msgstr ""
-
-#: lib/mailbox.php:227 lib/noticelist.php:452
-#, fuzzy
-msgid "from"
-msgstr " via "
-
 #: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Conferma indirizzo email"
@@ -5006,6 +4991,21 @@ msgid ""
 "\n"
 msgstr ""
 
+#: lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
+msgstr "Solo l'utente può leggere la propria casella di posta."
+
+#: lib/mailbox.php:139
+msgid ""
+"You have no private messages. You can send private message to engage other "
+"users in conversation. People can send you messages for your eyes only."
+msgstr ""
+
+#: lib/mailbox.php:227 lib/noticelist.php:452
+#, fuzzy
+msgid "from"
+msgstr " via "
+
 #: lib/mediafile.php:98 lib/mediafile.php:123
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
@@ -5066,7 +5066,7 @@ msgstr "Invia un messaggio diretto"
 msgid "To"
 msgstr "A"
 
-#: lib/messageform.php:161 lib/noticeform.php:185
+#: lib/messageform.php:159 lib/noticeform.php:183
 msgid "Available characters"
 msgstr "Caratteri disponibili"
 
@@ -5079,11 +5079,11 @@ msgstr "Invia un messaggio"
 msgid "What's up, %s?"
 msgstr "Cosa succede, %s?"
 
-#: lib/noticeform.php:192
+#: lib/noticeform.php:190
 msgid "Attach"
 msgstr ""
 
-#: lib/noticeform.php:196
+#: lib/noticeform.php:194
 msgid "Attach a file"
 msgstr ""
 
@@ -5155,12 +5155,12 @@ msgstr "Errore nell'inserire un profilo remoto"
 msgid "Duplicate notice"
 msgstr "Elimina messaggio"
 
-#: lib/oauthstore.php:467 lib/subs.php:48
+#: lib/oauthstore.php:466 lib/subs.php:48
 #, fuzzy
 msgid "You have been banned from subscribing."
 msgstr "Quell'utente ti ha bloccato dall'abbonarti."
 
-#: lib/oauthstore.php:492
+#: lib/oauthstore.php:491
 msgid "Couldn't insert new subscription."
 msgstr "Impossibile inserire un nuovo abbonamento."
 
@@ -5328,20 +5328,6 @@ msgstr "Persone abbonate a %s"
 msgid "Groups %s is a member of"
 msgstr "Il gruppo %s è membro di"
 
-#: 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/subscriptionlist.php:126
-msgid "(none)"
-msgstr "(nessuna)"
-
 #: lib/subs.php:52
 msgid "Already subscribed!"
 msgstr ""
@@ -5372,6 +5358,20 @@ msgstr "Impossibile eliminare l'abbonamento."
 msgid "Couldn't delete subscription."
 msgstr "Impossibile eliminare l'abbonamento."
 
+#: 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/subscriptionlist.php:126
+msgid "(none)"
+msgstr "(nessuna)"
+
 #: lib/tagcloudsection.php:56
 msgid "None"
 msgstr "Nessuno"
diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po
index 74baa8e281..3880ce1551 100644
--- a/locale/ja/LC_MESSAGES/statusnet.po
+++ b/locale/ja/LC_MESSAGES/statusnet.po
@@ -2,6 +2,7 @@
 #
 # Author@translatewiki.net: Aotake
 # Author@translatewiki.net: Fryed-peach
+# Author@translatewiki.net: Whym
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -9,12 +10,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 21:25+0000\n"
-"PO-Revision-Date: 2009-12-07 21:26:48+0000\n"
+"POT-Creation-Date: 2009-12-12 17:09+0000\n"
+"PO-Revision-Date: 2009-12-12 17:09:58+0000\n"
 "Language-Team: Japanese\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n"
+"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ja\n"
 "X-Message-Group: out-statusnet\n"
@@ -27,11 +28,11 @@ msgstr "そのようなページはありません。"
 
 #: actions/all.php:74 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofile.php:105
 #: actions/apiaccountupdateprofilebackgroundimage.php:116
-#: actions/apiaccountupdateprofileimage.php:105
-#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
-#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
-#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
+#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90
 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
@@ -44,19 +45,19 @@ msgstr "そのようなページはありません。"
 #: actions/repliesrss.php:38 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38
 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
-#: lib/command.php:364 lib/command.php:411 lib/command.php:466
+#: lib/command.php:364 lib/command.php:411 lib/command.php:467
 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
 #: lib/subs.php:34 lib/subs.php:116
 msgid "No such user."
-msgstr "そのようなユーザはいません。"
+msgstr "そのような利用者はいません。"
 
 #: actions/all.php:84
 #, php-format
 msgid "%s and friends, page %d"
-msgstr "%sとともだち、%dページ"
+msgstr "%s と友人、%dページ"
 
 #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
-#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100
+#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s と友人"
@@ -64,23 +65,23 @@ msgstr "%s と友人"
 #: actions/all.php:99
 #, php-format
 msgid "Feed for friends of %s (RSS 1.0)"
-msgstr "%s のともだちのフィード(RSS 1.0)"
+msgstr "%s の友人のフィード (RSS 1.0)"
 
 #: actions/all.php:107
 #, php-format
 msgid "Feed for friends of %s (RSS 2.0)"
-msgstr "%s のともだちのフィード (RSS 2.0)"
+msgstr "%s の友人のフィード (RSS 2.0)"
 
 #: actions/all.php:115
 #, php-format
 msgid "Feed for friends of %s (Atom)"
-msgstr "%s のともだちのフィード (Atom)"
+msgstr "%s の友人のフィード (Atom)"
 
 #: actions/all.php:127
 #, php-format
 msgid ""
 "This is the timeline for %s and friends but no one has posted anything yet."
-msgstr "これは%sとともだちの予定表です。まだ誰も投稿していません。"
+msgstr "これは %s と友人の予定表です。まだ誰も投稿していません。"
 
 #: actions/all.php:132
 #, php-format
@@ -97,8 +98,8 @@ 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 ""
-"プロフィールから[%sさんに合図](../%s) したり、[知らせたいことについて投稿](%%"
-"%%action.newnotice%%%%?status_textarea=%s)したりできます。"
+"プロフィールから [%s さんに合図](../%s) したり、[知らせたいことについて投稿]"
+"(%%%%action.newnotice%%%%?status_textarea=%s) したりできます。"
 
 #: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
 #, php-format
@@ -106,54 +107,67 @@ msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
 "post a notice to his or her attention."
 msgstr ""
-"[アカウントを登録](%%%%action.register%%%%) して%sさんに合図したり、お知らせ"
-"を送ってみませんか。"
+"[アカウントを登録](%%%%action.register%%%%) して %s さんに合図したり、お知ら"
+"せを送ってみませんか。"
 
 #: actions/all.php:165
 msgid "You and friends"
-msgstr "あなたとともだち"
+msgstr "あなたと友人"
 
-#: actions/allrss.php:119 actions/apitimelinefriends.php:121
+#: actions/allrss.php:119 actions/apitimelinefriends.php:122
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
-msgstr ""
+msgstr "%2$s に %1$s と友人からの更新があります！"
 
 #: actions/apiaccountratelimitstatus.php:70
 #: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofile.php:97
 #: actions/apiaccountupdateprofilebackgroundimage.php:94
 #: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apiaccountupdateprofile.php:97
-#, fuzzy
 msgid "API method not found."
-msgstr "API メソッドが見つかりません！"
+msgstr "API メソッドが見つかりません。"
 
 #: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofile.php:89
 #: actions/apiaccountupdateprofilebackgroundimage.php:86
 #: actions/apiaccountupdateprofilecolors.php:110
-#: actions/apiaccountupdateprofileimage.php:84
-#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
+#: actions/apiaccountupdateprofileimage.php:84 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:114
 msgid "This method requires a POST."
-msgstr ""
+msgstr "このメソッドには POST が必要です。"
 
 #: actions/apiaccountupdatedeliverydevice.php:105
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none"
 msgstr ""
+"「device」という名前の引数を、次の中から値を選んで、指定する必要があります: "
+"sms, im, none"
 
 #: actions/apiaccountupdatedeliverydevice.php:132
-#, fuzzy
 msgid "Could not update user."
-msgstr "ユーザを更新できません"
+msgstr "利用者を更新できませんでした。"
+
+#: actions/apiaccountupdateprofile.php:112
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+msgid "User has no profile."
+msgstr "利用者はプロフィールをもっていません。"
+
+#: actions/apiaccountupdateprofile.php:147
+msgid "Could not save profile."
+msgstr "プロフィールを保存できませんでした。"
 
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257
 #: actions/designadminpanel.php:122 actions/newnotice.php:94
 #: lib/designsettings.php:283
 #, php-format
@@ -161,63 +175,32 @@ msgid ""
 "The server was unable to handle that much POST data (%s bytes) due to its "
 "current configuration."
 msgstr ""
+"サーバーの現在の構成が理由で、大量の POST データ (%sバイト) を処理することが"
+"できませんでした。"
 
 #: actions/apiaccountupdateprofilebackgroundimage.php:136
 #: actions/apiaccountupdateprofilebackgroundimage.php:146
 #: actions/apiaccountupdateprofilecolors.php:164
 #: actions/apiaccountupdateprofilecolors.php:174
 msgid "Unable to save your design settings."
-msgstr ""
+msgstr "あなたのデザイン設定を保存できません。"
 
 #: actions/apiaccountupdateprofilebackgroundimage.php:187
 #: actions/apiaccountupdateprofilecolors.php:142
-#, fuzzy
 msgid "Could not update your design."
-msgstr "ユーザを更新できません"
-
-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
-#: actions/apiaccountupdateprofileimage.php:130
-#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
-#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
-msgid "User has no profile."
-msgstr "プロファイルがありません。"
-
-#: actions/apiaccountupdateprofile.php:147
-#, fuzzy
-msgid "Could not save profile."
-msgstr "プロファイルを保存できません"
+msgstr "デザインを更新できませんでした。"
 
 #: actions/apiblockcreate.php:105
-#, fuzzy
 msgid "You cannot block yourself!"
-msgstr "ユーザを更新できません"
+msgstr "自分自身をブロックすることはできません！"
 
 #: actions/apiblockcreate.php:119
 msgid "Block user failed."
-msgstr "ユーザのブロックに失敗しました。"
+msgstr "利用者のブロックに失敗しました。"
 
 #: actions/apiblockdestroy.php:107
 msgid "Unblock user failed."
-msgstr "ユーザのアンブロックに失敗しました。"
-
-#: actions/apidirectmessagenew.php:126
-msgid "No message text!"
-msgstr ""
-
-#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
-#, fuzzy, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr "長すぎます。通知は最大 140 字までです。"
-
-#: actions/apidirectmessagenew.php:146
-msgid "Recipient user not found."
-msgstr ""
-
-#: actions/apidirectmessagenew.php:150
-msgid "Can't send direct messages to users who aren't your friend."
-msgstr ""
+msgstr "利用者のブロック解除に失敗しました。"
 
 #: actions/apidirectmessage.php:89
 #, php-format
@@ -244,18 +227,35 @@ msgstr ""
 #: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
-#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
-#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149
-#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
-#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156
+#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151
+#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141
+#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
 msgid "API method not found!"
 msgstr "API メソッドが見つかりません！"
 
+#: actions/apidirectmessagenew.php:126
+msgid "No message text!"
+msgstr "お知らせの本文がありません！"
+
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "長すぎます。お知らせは最大 %d 字までです。"
+
+#: actions/apidirectmessagenew.php:146
+msgid "Recipient user not found."
+msgstr "受け取り手の利用者が見つかりません。"
+
+#: actions/apidirectmessagenew.php:150
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr ""
+
 #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
 #: actions/apistatusesdestroy.php:113
 msgid "No status found with that ID."
@@ -288,13 +288,12 @@ msgstr ""
 "利用者をフォローできませんでした: %s は既にあなたのリストに入っています。"
 
 #: actions/apifriendshipsdestroy.php:109
-#, fuzzy
 msgid "Could not unfollow user: User not found."
-msgstr "サーバへリダイレクトできません : %s"
+msgstr "利用者のフォローを停止できませんでした: 利用者が見つかりません。"
 
 #: actions/apifriendshipsdestroy.php:120
 msgid "You cannot unfollow yourself!"
-msgstr ""
+msgstr "自分自身をフォロー停止することはできません！"
 
 #: actions/apifriendshipsexists.php:94
 msgid "Two user ids or screen_names must be supplied."
@@ -407,16 +406,6 @@ msgstr "そのプロファイルは送信されていません。"
 msgid "Could not remove user %s to group %s."
 msgstr "OpenIDを作成できません : %s"
 
-#: actions/apigrouplistall.php:90 actions/usergroups.php:62
-#, php-format
-msgid "%s groups"
-msgstr "%s グループ"
-
-#: actions/apigrouplistall.php:94
-#, fuzzy, php-format
-msgid "groups on %s"
-msgstr "このサイト上のグループを検索する"
-
 #: actions/apigrouplist.php:95
 #, fuzzy, php-format
 msgid "%s's groups"
@@ -427,6 +416,16 @@ msgstr "%s グループ"
 msgid "Groups %s is a member of on %s."
 msgstr "そのプロファイルは送信されていません。"
 
+#: actions/apigrouplistall.php:90 actions/usergroups.php:62
+#, php-format
+msgid "%s groups"
+msgstr "%s グループ"
+
+#: actions/apigrouplistall.php:94
+#, fuzzy, php-format
+msgid "groups on %s"
+msgstr "このサイト上のグループを検索する"
+
 #: actions/apistatusesdestroy.php:107
 msgid "This method requires a POST or DELETE."
 msgstr ""
@@ -464,57 +463,57 @@ msgstr ""
 msgid "Unsupported format."
 msgstr "サポート外の画像形式です。"
 
-#: actions/apitimelinefavorites.php:107
+#: actions/apitimelinefavorites.php:108
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr ""
 
-#: actions/apitimelinefavorites.php:119
+#: actions/apitimelinefavorites.php:120
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr ""
 
-#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117
+#: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118
 #: actions/grouprss.php:131 actions/userrss.php:90
 #, php-format
 msgid "%s timeline"
 msgstr "%s のタイムライン"
 
-#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125
+#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
 #: actions/userrss.php:92
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr ""
 
-#: actions/apitimelinementions.php:116
+#: actions/apitimelinementions.php:117
 #, fuzzy, php-format
 msgid "%1$s / Updates mentioning %2$s"
 msgstr "%1$ のステータス %2$s"
 
-#: actions/apitimelinementions.php:126
+#: actions/apitimelinementions.php:127
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr ""
 
-#: actions/apitimelinepublic.php:106 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s の公開タイムライン"
 
-#: actions/apitimelinepublic.php:110 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr ""
 
-#: actions/apitimelinetag.php:101 actions/tag.php:66
+#: actions/apitimelinetag.php:102 actions/tag.php:66
 #, php-format
 msgid "Notices tagged with %s"
 msgstr ""
 
-#: actions/apitimelinetag.php:107 actions/tagrss.php:64
-#, fuzzy, php-format
+#: actions/apitimelinetag.php:108 actions/tagrss.php:64
+#, php-format
 msgid "Updates tagged with %1$s on %2$s!"
-msgstr "マイクロブログ by %s"
+msgstr "%2$s に %1$s による更新があります！"
 
 #: actions/apiusershow.php:96
 msgid "Not found."
@@ -545,48 +544,47 @@ msgstr "アバター"
 #: actions/avatarsettings.php:78
 #, php-format
 msgid "You can upload your personal avatar. The maximum file size is %s."
-msgstr ""
+msgstr "自分のアバターをアップロードできます。最大サイズは%sです。"
 
-#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:185
 #: actions/grouplogo.php:178 actions/remotesubscribe.php:191
 #: actions/userauthorization.php:72 actions/userrss.php:103
 msgid "User without matching profile"
 msgstr ""
 
-#: actions/avatarsettings.php:119 actions/avatarsettings.php:194
+#: actions/avatarsettings.php:119 actions/avatarsettings.php:197
 #: actions/grouplogo.php:251
-#, fuzzy
 msgid "Avatar settings"
-msgstr "設定"
+msgstr "アバター設定"
 
-#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/avatarsettings.php:127 actions/avatarsettings.php:205
 #: actions/grouplogo.php:199 actions/grouplogo.php:259
 msgid "Original"
 msgstr ""
 
-#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/avatarsettings.php:142 actions/avatarsettings.php:217
 #: actions/grouplogo.php:210 actions/grouplogo.php:271
 msgid "Preview"
 msgstr ""
 
-#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
+#: actions/avatarsettings.php:149 lib/deleteuserform.php:66
 #: lib/noticelist.php:550
 msgid "Delete"
 msgstr "削除"
 
-#: actions/avatarsettings.php:165 actions/grouplogo.php:233
+#: actions/avatarsettings.php:166 actions/grouplogo.php:233
 msgid "Upload"
 msgstr "アップロード"
 
-#: actions/avatarsettings.php:228 actions/grouplogo.php:286
+#: actions/avatarsettings.php:231 actions/grouplogo.php:286
 msgid "Crop"
 msgstr ""
 
-#: actions/avatarsettings.php:265 actions/disfavor.php:74
+#: actions/avatarsettings.php:268 actions/disfavor.php:74
 #: actions/emailsettings.php:238 actions/favor.php:75
 #: actions/groupblock.php:66 actions/grouplogo.php:309
 #: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -597,34 +595,74 @@ msgstr ""
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
-#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
+#: actions/avatarsettings.php:281 actions/designadminpanel.php:103
 #: actions/emailsettings.php:256 actions/grouplogo.php:319
 #: actions/imsettings.php:220 actions/recoverpassword.php:44
 #: actions/smssettings.php:248 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "予期せぬフォーム送信です。"
 
-#: actions/avatarsettings.php:322
+#: actions/avatarsettings.php:328
 msgid "Pick a square area of the image to be your avatar"
 msgstr ""
 
-#: actions/avatarsettings.php:337 actions/grouplogo.php:377
+#: actions/avatarsettings.php:343 actions/grouplogo.php:377
 msgid "Lost our file data."
 msgstr ""
 
-#: actions/avatarsettings.php:360
+#: actions/avatarsettings.php:366
 msgid "Avatar updated."
 msgstr "アバターが更新されました。"
 
-#: actions/avatarsettings.php:363
+#: actions/avatarsettings.php:369
 msgid "Failed updating avatar."
 msgstr "アバターの更新に失敗しました。"
 
-#: actions/avatarsettings.php:387
+#: actions/avatarsettings.php:393
 #, fuzzy
 msgid "Avatar deleted."
 msgstr "アバターが更新されました。"
 
+#: actions/block.php:69
+#, fuzzy
+msgid "You already blocked that user."
+msgstr "既にログイン済みです。"
+
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
+#, fuzzy
+msgid "Block user"
+msgstr "そのようなユーザはいません。"
+
+#: actions/block.php:130
+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/block.php:143 actions/deletenotice.php:145
+#: actions/deleteuser.php:147 actions/groupblock.php:178
+msgid "No"
+msgstr ""
+
+#: actions/block.php:143 actions/deleteuser.php:147
+#, fuzzy
+msgid "Do not block this user"
+msgstr "このユーザをアンブロックする"
+
+#: actions/block.php:144 actions/deletenotice.php:146
+#: actions/deleteuser.php:148 actions/groupblock.php:179
+msgid "Yes"
+msgstr ""
+
+#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
+msgid "Block this user"
+msgstr "このユーザをブロックする"
+
+#: actions/block.php:162
+msgid "Failed to save block information."
+msgstr ""
+
 #: actions/blockedfromgroup.php:73 actions/editgroup.php:84
 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
 #: actions/groupmembers.php:76 actions/grouprss.php:91
@@ -668,46 +706,6 @@ msgstr "アンブロック"
 msgid "Unblock this user"
 msgstr "このユーザをアンブロックする"
 
-#: actions/block.php:69
-#, fuzzy
-msgid "You already blocked that user."
-msgstr "既にログイン済みです。"
-
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
-#, fuzzy
-msgid "Block user"
-msgstr "そのようなユーザはいません。"
-
-#: actions/block.php:130
-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/block.php:143 actions/deletenotice.php:145
-#: actions/deleteuser.php:147 actions/groupblock.php:178
-msgid "No"
-msgstr ""
-
-#: actions/block.php:143 actions/deleteuser.php:147
-#, fuzzy
-msgid "Do not block this user"
-msgstr "このユーザをアンブロックする"
-
-#: actions/block.php:144 actions/deletenotice.php:146
-#: actions/deleteuser.php:148 actions/groupblock.php:179
-msgid "Yes"
-msgstr ""
-
-#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
-msgid "Block this user"
-msgstr "このユーザをブロックする"
-
-#: actions/block.php:162
-msgid "Failed to save block information."
-msgstr ""
-
 #: actions/bookmarklet.php:50
 msgid "Post to "
 msgstr ""
@@ -831,9 +829,8 @@ msgid ""
 msgstr ""
 
 #: actions/deleteuser.php:148 lib/deleteuserform.php:77
-#, fuzzy
 msgid "Delete this user"
-msgstr "この通知を削除"
+msgstr "このユーザーを削除"
 
 #: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
 #: lib/adminpanelaction.php:302 lib/groupnav.php:119
@@ -855,9 +852,8 @@ msgid "Theme not available: %s"
 msgstr "このページはあなたが承認したメディアタイプでは利用できません。"
 
 #: actions/designadminpanel.php:375
-#, fuzzy
 msgid "Change logo"
-msgstr "パスワードの変更"
+msgstr "ロゴの変更"
 
 #: actions/designadminpanel.php:380
 #, fuzzy
@@ -1188,6 +1184,14 @@ msgstr ""
 msgid "New incoming email address added."
 msgstr ""
 
+#: actions/favor.php:79
+msgid "This notice is already a favorite!"
+msgstr ""
+
+#: actions/favor.php:92 lib/disfavorform.php:140
+msgid "Disfavor favorite"
+msgstr ""
+
 #: actions/favorited.php:65 lib/popularnoticesection.php:88
 #: lib/publicgroupnav.php:93
 #, fuzzy
@@ -1231,14 +1235,6 @@ msgstr ""
 msgid "Updates favored by %1$s on %2$s!"
 msgstr "マイクロブログ by %s"
 
-#: actions/favor.php:79
-msgid "This notice is already a favorite!"
-msgstr ""
-
-#: actions/favor.php:92 lib/disfavorform.php:140
-msgid "Disfavor favorite"
-msgstr ""
-
 #: actions/featured.php:69 lib/featureduserssection.php:87
 #: lib/publicgroupnav.php:89
 msgid "Featured users"
@@ -1311,19 +1307,16 @@ msgstr "リモートプロファイル更新エラー"
 #: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86
 #: actions/groupunblock.php:86 actions/leavegroup.php:83
 #: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263
-#, fuzzy
 msgid "No such group."
-msgstr "そのような通知はありません。"
+msgstr "そのようなグループはありません。"
 
 #: actions/getfile.php:75
-#, fuzzy
 msgid "No such file."
-msgstr "そのような通知はありません。"
+msgstr "そのようなファイルはありません。"
 
 #: actions/getfile.php:79
-#, fuzzy
 msgid "Cannot read file."
-msgstr "そのような通知はありません。"
+msgstr "ファイルを読み込めません。"
 
 #: actions/groupblock.php:71 actions/groupunblock.php:71
 #: actions/makeadmin.php:71 actions/subedit.php:46
@@ -1433,14 +1426,12 @@ msgid "Pick a square area of the image to be the logo."
 msgstr ""
 
 #: actions/grouplogo.php:396
-#, fuzzy
 msgid "Logo updated."
-msgstr "アバターが更新されました。"
+msgstr "ロゴが更新されました。"
 
 #: actions/grouplogo.php:398
-#, fuzzy
 msgid "Failed updating logo."
-msgstr "アバターの更新に失敗しました。"
+msgstr "ロゴの更新に失敗しました。"
 
 #: actions/groupmembers.php:93 lib/groupnav.php:92
 #, php-format
@@ -1482,39 +1473,6 @@ msgstr ""
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "マイクロブログ by %s"
 
-#: actions/groupsearch.php:52
-#, fuzzy, php-format
-msgid ""
-"Search for groups on %%site.name%% by their name, location, or description. "
-"Separate the terms by spaces; they must be 3 characters or more."
-msgstr ""
-"%%site.name%% の人を名前、場所、興味から検索。検索語はスペース区切る。3字以上"
-
-#: actions/groupsearch.php:58
-#, fuzzy
-msgid "Group search"
-msgstr "ピープルサーチ"
-
-#: actions/groupsearch.php:79 actions/noticesearch.php:117
-#: actions/peoplesearch.php:83
-#, fuzzy
-msgid "No results."
-msgstr "結果なし"
-
-#: actions/groupsearch.php:82
-#, php-format
-msgid ""
-"If you can't find the group you're looking for, you can [create it](%%action."
-"newgroup%%) yourself."
-msgstr ""
-
-#: actions/groupsearch.php:85
-#, php-format
-msgid ""
-"Why not [register an account](%%action.register%%) and [create the group](%%"
-"action.newgroup%%) yourself!"
-msgstr ""
-
 #: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
 msgid "Groups"
@@ -1540,6 +1498,38 @@ msgstr ""
 msgid "Create a new group"
 msgstr "アカウントを作成"
 
+#: actions/groupsearch.php:52
+#, fuzzy, php-format
+msgid ""
+"Search for groups on %%site.name%% by their name, location, or description. "
+"Separate the terms by spaces; they must be 3 characters or more."
+msgstr ""
+"%%site.name%% の人を名前、場所、興味から検索。検索語はスペース区切る。3字以上"
+
+#: actions/groupsearch.php:58
+msgid "Group search"
+msgstr "グループの検索"
+
+#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
+#, fuzzy
+msgid "No results."
+msgstr "結果なし"
+
+#: actions/groupsearch.php:82
+#, php-format
+msgid ""
+"If you can't find the group you're looking for, you can [create it](%%action."
+"newgroup%%) yourself."
+msgstr ""
+
+#: actions/groupsearch.php:85
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and [create the group](%%"
+"action.newgroup%%) yourself!"
+msgstr ""
+
 #: actions/groupunblock.php:91
 msgid "Only an admin can unblock group members."
 msgstr ""
@@ -1727,7 +1717,7 @@ msgstr ""
 msgid "Optionally add a personal message to the invitation."
 msgstr ""
 
-#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:222
 msgid "Send"
 msgstr "送る"
 
@@ -1798,9 +1788,8 @@ msgid "You must be logged in to join a group."
 msgstr ""
 
 #: actions/joingroup.php:90 lib/command.php:217
-#, fuzzy
 msgid "You are already a member of that group"
-msgstr "既にログイン済みです。"
+msgstr "あなたは既にそのグループに参加しています。"
 
 #: actions/joingroup.php:128 lib/command.php:234
 #, fuzzy, php-format
@@ -1835,57 +1824,57 @@ msgstr "OpenIDを作成できません : %s"
 msgid "%s left group %s"
 msgstr ""
 
-#: actions/login.php:82 actions/register.php:137
+#: actions/login.php:83 actions/register.php:137
 msgid "Already logged in."
 msgstr "既にログインしています。"
 
-#: actions/login.php:113 actions/login.php:123
+#: actions/login.php:114 actions/login.php:124
 #, fuzzy
 msgid "Invalid or expired token."
 msgstr "不正な通知内容"
 
-#: actions/login.php:146
+#: actions/login.php:147
 msgid "Incorrect username or password."
 msgstr "ユーザ名またはパスワードが間違っています。"
 
-#: actions/login.php:152
+#: actions/login.php:153
 #, fuzzy
 msgid "Error setting user. You are probably not authorized."
 msgstr "認証されていません。"
 
-#: actions/login.php:207 actions/login.php:260 lib/action.php:458
+#: actions/login.php:208 actions/login.php:261 lib/action.php:458
 #: lib/logingroupnav.php:79
 msgid "Login"
 msgstr "ログイン"
 
-#: actions/login.php:246
+#: actions/login.php:247
 msgid "Login to site"
 msgstr ""
 
-#: actions/login.php:249 actions/profilesettings.php:106
+#: actions/login.php:250 actions/profilesettings.php:106
 #: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
 #: lib/groupeditform.php:152 lib/userprofile.php:131
 msgid "Nickname"
 msgstr "ニックネーム"
 
-#: actions/login.php:252 actions/register.php:428
+#: actions/login.php:253 actions/register.php:428
 #: lib/accountsettingsaction.php:116
 msgid "Password"
 msgstr "パスワード"
 
-#: actions/login.php:255 actions/register.php:477
+#: actions/login.php:256 actions/register.php:477
 msgid "Remember me"
 msgstr "ログイン状態を保持"
 
-#: actions/login.php:256 actions/register.php:479
+#: actions/login.php:257 actions/register.php:479
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "以降は自動的にログインする。共用コンピューターでは避けましょう！"
 
-#: actions/login.php:266
+#: actions/login.php:267
 msgid "Lost or forgotten password?"
 msgstr "パスワードを紛失、忘れた？"
 
-#: actions/login.php:285
+#: actions/login.php:286
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -1893,7 +1882,7 @@ msgstr ""
 "セキュリティー上の理由により、設定を変更する前にユーザ名とパスワードを入力し"
 "て下さい。"
 
-#: actions/login.php:289
+#: actions/login.php:290
 #, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -1962,7 +1951,7 @@ msgstr ""
 msgid "Direct message to %s sent"
 msgstr ""
 
-#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:242 lib/channel.php:170
 msgid "Ajax Error"
 msgstr ""
 
@@ -1970,7 +1959,7 @@ msgstr ""
 msgid "New notice"
 msgstr "新しい通知"
 
-#: actions/newnotice.php:206
+#: actions/newnotice.php:208
 #, fuzzy
 msgid "Notice posted"
 msgstr "通知"
@@ -2045,8 +2034,8 @@ msgstr "内容種別 "
 msgid "Only "
 msgstr ""
 
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996
-#: lib/api.php:1024 lib/api.php:1134
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011
+#: lib/api.php:1039 lib/api.php:1149
 msgid "Not a supported data format."
 msgstr ""
 
@@ -2112,14 +2101,12 @@ msgid "Change password"
 msgstr "パスワードの変更"
 
 #: actions/passwordsettings.php:69
-#, fuzzy
 msgid "Change your password."
-msgstr "パスワードの変更"
+msgstr "パスワードを変更します。"
 
 #: actions/passwordsettings.php:96 actions/recoverpassword.php:231
-#, fuzzy
 msgid "Password change"
-msgstr "パスワードが保存されました。"
+msgstr "パスワードの変更"
 
 #: actions/passwordsettings.php:104
 msgid "Old password"
@@ -2148,7 +2135,7 @@ msgstr "変更"
 
 #: actions/passwordsettings.php:154 actions/register.php:230
 msgid "Password must be 6 or more characters."
-msgstr ""
+msgstr "パスワードは6文字以上にする必要があります。"
 
 #: actions/passwordsettings.php:157 actions/register.php:233
 msgid "Passwords don't match."
@@ -2344,14 +2331,13 @@ msgid "URL of your homepage, blog, or profile on another site"
 msgstr "ホームページ、ブログ、プロファイル、その他サイトの URL"
 
 #: actions/profilesettings.php:122 actions/register.php:460
-#, fuzzy, php-format
+#, php-format
 msgid "Describe yourself and your interests in %d chars"
-msgstr "140字以内で自己紹介"
+msgstr "%d字以内で自分自身と自分の興味について書いてください"
 
 #: actions/profilesettings.php:125 actions/register.php:463
-#, fuzzy
 msgid "Describe yourself and your interests"
-msgstr "140字以内で自己紹介"
+msgstr "自分自身と自分の興味について書いてください"
 
 #: actions/profilesettings.php:127 actions/register.php:465
 msgid "Bio"
@@ -2366,34 +2352,36 @@ msgstr "場所"
 
 #: actions/profilesettings.php:134 actions/register.php:472
 msgid "Where you are, like \"City, State (or Region), Country\""
-msgstr "いる場所, 例えば \"City, State (or Region), Country\""
+msgstr "自分のいる場所。例：「都市, 州 (または地域), 国」"
 
 #: actions/profilesettings.php:138 actions/tagother.php:149
 #: actions/tagother.php:209 lib/subscriptionlist.php:106
 #: lib/subscriptionlist.php:108 lib/userprofile.php:209
 msgid "Tags"
-msgstr ""
+msgstr "タグ"
 
 #: actions/profilesettings.php:140
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
+"自分自身についてのタグ (アルファベット／数字／-／.／_)、カンマまたは空白区切"
+"りで"
 
 #: actions/profilesettings.php:144 actions/siteadminpanel.php:307
 msgid "Language"
-msgstr ""
+msgstr "言語"
 
 #: actions/profilesettings.php:145
 msgid "Preferred language"
-msgstr ""
+msgstr "ご希望の言語"
 
 #: actions/profilesettings.php:154
 msgid "Timezone"
-msgstr ""
+msgstr "タイムゾーン"
 
 #: actions/profilesettings.php:155
 msgid "What timezone are you normally in?"
-msgstr ""
+msgstr "普段のタイムゾーンはどれですか？"
 
 #: actions/profilesettings.php:160
 msgid ""
@@ -3591,6 +3579,26 @@ msgstr "Jabbar ID はありません。"
 msgid "SMS"
 msgstr ""
 
+#: actions/tag.php:68
+#, fuzzy, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr "マイクロブログ by %s"
+
+#: actions/tag.php:86
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "%sの通知フィード"
+
+#: actions/tag.php:92
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "%sの通知フィード"
+
+#: actions/tag.php:98
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "%sの通知フィード"
+
 #: actions/tagother.php:33
 #, fuzzy
 msgid "Not logged in"
@@ -3639,26 +3647,6 @@ msgstr "アバターを保存できません"
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 
-#: actions/tag.php:68
-#, fuzzy, php-format
-msgid "Notices tagged with %s, page %d"
-msgstr "マイクロブログ by %s"
-
-#: actions/tag.php:86
-#, fuzzy, php-format
-msgid "Notice feed for tag %s (RSS 1.0)"
-msgstr "%sの通知フィード"
-
-#: actions/tag.php:92
-#, fuzzy, php-format
-msgid "Notice feed for tag %s (RSS 2.0)"
-msgstr "%sの通知フィード"
-
-#: actions/tag.php:98
-#, fuzzy, php-format
-msgid "Notice feed for tag %s (Atom)"
-msgstr "%sの通知フィード"
-
 #: actions/tagrss.php:35
 #, fuzzy
 msgid "No such tag."
@@ -3816,9 +3804,8 @@ msgstr "承認"
 
 #: actions/userauthorization.php:210 lib/subscribeform.php:115
 #: lib/subscribeform.php:139
-#, fuzzy
 msgid "Subscribe to this user"
-msgstr "購読が許可"
+msgstr "このユーザーを購読"
 
 #: actions/userauthorization.php:211
 msgid "Reject"
@@ -3963,40 +3950,45 @@ msgstr ""
 msgid "DB error inserting hashtag: %s"
 msgstr ""
 
-#: classes/Notice.php:179
+#: classes/Notice.php:188
 #, fuzzy
 msgid "Problem saving notice. Too long."
 msgstr "通知を保存する際に問題が発生しました。"
 
-#: classes/Notice.php:183
+#: classes/Notice.php:192
 #, fuzzy
 msgid "Problem saving notice. Unknown user."
 msgstr "通知を保存する際に問題が発生しました。"
 
-#: classes/Notice.php:188
+#: classes/Notice.php:197
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
-#: classes/Notice.php:194
+#: classes/Notice.php:203
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
 msgstr ""
 
-#: classes/Notice.php:200
+#: classes/Notice.php:209
 msgid "You are banned from posting notices on this site."
 msgstr ""
 
-#: classes/Notice.php:265 classes/Notice.php:290
+#: classes/Notice.php:274 classes/Notice.php:299
 msgid "Problem saving notice."
 msgstr "通知を保存する際に問題が発生しました。"
 
-#: classes/Notice.php:1124
+#: classes/Notice.php:1115
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "返信を追加する際にデータベースエラー : %s"
 
+#: classes/User.php:347
+#, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr ""
+
 #: classes/User_group.php:380
 #, fuzzy
 msgid "Could not create group."
@@ -4007,11 +3999,6 @@ msgstr "アバターを保存できません"
 msgid "Could not set group membership."
 msgstr "サブスクリプションを作成できません"
 
-#: classes/User.php:347
-#, php-format
-msgid "Welcome to %1$s, @%2$s!"
-msgstr ""
-
 #: lib/accountsettingsaction.php:108
 msgid "Change your profile settings"
 msgstr "プロファイル設定の変更"
@@ -4327,7 +4314,7 @@ msgstr ""
 msgid "Notice with that id does not exist"
 msgstr ""
 
-#: lib/command.php:168 lib/command.php:416 lib/command.php:471
+#: lib/command.php:168 lib/command.php:416 lib/command.php:472
 msgid "User has no last notice"
 msgstr ""
 
@@ -4374,99 +4361,99 @@ msgstr ""
 msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr ""
 
-#: lib/command.php:439
+#: lib/command.php:440
 #, fuzzy, php-format
 msgid "Reply to %s sent"
 msgstr "この通知へ返信"
 
-#: lib/command.php:441
+#: lib/command.php:442
 #, fuzzy
 msgid "Error saving notice."
 msgstr "通知を保存する際に問題が発生しました。"
 
-#: lib/command.php:495
+#: lib/command.php:496
 msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: lib/command.php:502
+#: lib/command.php:503
 #, php-format
 msgid "Subscribed to %s"
 msgstr ""
 
-#: lib/command.php:523
+#: lib/command.php:524
 msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: lib/command.php:530
+#: lib/command.php:531
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr ""
 
-#: lib/command.php:548 lib/command.php:571
+#: lib/command.php:549 lib/command.php:572
 msgid "Command not yet implemented."
 msgstr ""
 
-#: lib/command.php:551
+#: lib/command.php:552
 msgid "Notification off."
 msgstr ""
 
-#: lib/command.php:553
+#: lib/command.php:554
 msgid "Can't turn off notification."
 msgstr ""
 
-#: lib/command.php:574
+#: lib/command.php:575
 msgid "Notification on."
 msgstr ""
 
-#: lib/command.php:576
+#: lib/command.php:577
 msgid "Can't turn on notification."
 msgstr ""
 
-#: lib/command.php:588
+#: lib/command.php:590
 msgid "Login command is disabled"
 msgstr ""
 
-#: lib/command.php:602
-#, fuzzy, php-format
+#: lib/command.php:604
+#, php-format
 msgid "Could not create login token for %s"
-msgstr "アバターを保存できません"
+msgstr "%s 用のログイン・トークンを作成できませんでした"
 
-#: lib/command.php:607
+#: lib/command.php:609
 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:623
+#: lib/command.php:625
 #, fuzzy
 msgid "You are not subscribed to anyone."
 msgstr "そのプロファイルは送信されていません。"
 
-#: lib/command.php:625
+#: lib/command.php:627
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "そのプロファイルは送信されていません。"
 
-#: lib/command.php:645
+#: lib/command.php:647
 #, fuzzy
 msgid "No one is subscribed to you."
 msgstr "リモートサブスクライブ"
 
-#: lib/command.php:647
+#: lib/command.php:649
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "リモートサブスクライブ"
 
-#: lib/command.php:667
+#: lib/command.php:669
 #, fuzzy
 msgid "You are not a member of any groups."
 msgstr "そのプロファイルは送信されていません。"
 
-#: lib/command.php:669
+#: lib/command.php:671
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "そのプロファイルは送信されていません。"
 
-#: lib/command.php:683
+#: lib/command.php:685
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -4566,10 +4553,6 @@ msgstr "この通知をお気に入りにする"
 msgid "Favor"
 msgstr ""
 
-#: lib/feedlist.php:64
-msgid "Export data"
-msgstr "データのエクスポート"
-
 #: lib/feed.php:85
 msgid "RSS 1.0"
 msgstr ""
@@ -4586,6 +4569,10 @@ msgstr ""
 msgid "FOAF"
 msgstr ""
 
+#: lib/feedlist.php:64
+msgid "Export data"
+msgstr "データのエクスポート"
+
 #: lib/galleryaction.php:121
 msgid "Filter tags"
 msgstr "タグのフィルター"
@@ -4748,20 +4735,6 @@ msgstr "ユーザ名とパスワードでログイン"
 msgid "Sign up for a new account"
 msgstr "新しいアカウントでサインアップ"
 
-#: lib/mailbox.php:89
-msgid "Only the user can read their own mailboxes."
-msgstr ""
-
-#: lib/mailbox.php:139
-msgid ""
-"You have no private messages. You can send private message to engage other "
-"users in conversation. People can send you messages for your eyes only."
-msgstr ""
-
-#: lib/mailbox.php:227 lib/noticelist.php:452
-msgid "from"
-msgstr "から "
-
 #: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "メールアドレス確認"
@@ -4944,6 +4917,20 @@ msgid ""
 "\n"
 msgstr ""
 
+#: lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
+msgstr ""
+
+#: lib/mailbox.php:139
+msgid ""
+"You have no private messages. You can send private message to engage other "
+"users in conversation. People can send you messages for your eyes only."
+msgstr ""
+
+#: lib/mailbox.php:227 lib/noticelist.php:452
+msgid "from"
+msgstr "から "
+
 #: lib/mediafile.php:98 lib/mediafile.php:123
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
@@ -5005,7 +4992,7 @@ msgstr "直接通知を送る"
 msgid "To"
 msgstr ""
 
-#: lib/messageform.php:161 lib/noticeform.php:185
+#: lib/messageform.php:159 lib/noticeform.php:183
 msgid "Available characters"
 msgstr "利用可能な文字"
 
@@ -5018,11 +5005,11 @@ msgstr "通知を送る"
 msgid "What's up, %s?"
 msgstr "最近どう %s?"
 
-#: lib/noticeform.php:192
+#: lib/noticeform.php:190
 msgid "Attach"
 msgstr ""
 
-#: lib/noticeform.php:196
+#: lib/noticeform.php:194
 msgid "Attach a file"
 msgstr ""
 
@@ -5093,11 +5080,11 @@ msgstr "リモートプロファイル追加エラー"
 msgid "Duplicate notice"
 msgstr "新しい通知"
 
-#: lib/oauthstore.php:467 lib/subs.php:48
+#: lib/oauthstore.php:466 lib/subs.php:48
 msgid "You have been banned from subscribing."
 msgstr ""
 
-#: lib/oauthstore.php:492
+#: lib/oauthstore.php:491
 msgid "Couldn't insert new subscription."
 msgstr "サブスクリプションを追加できません"
 
@@ -5264,20 +5251,6 @@ msgstr "リモートサブスクライブ"
 msgid "Groups %s is a member of"
 msgstr ""
 
-#: lib/subscriberspeopleselftagcloudsection.php:48
-#: lib/subscriptionspeopleselftagcloudsection.php:48
-msgid "People Tagcloud as self-tagged"
-msgstr ""
-
-#: lib/subscriberspeopletagcloudsection.php:48
-#: lib/subscriptionspeopletagcloudsection.php:48
-msgid "People Tagcloud as tagged"
-msgstr ""
-
-#: lib/subscriptionlist.php:126
-msgid "(none)"
-msgstr "(なし)"
-
 #: lib/subs.php:52
 msgid "Already subscribed!"
 msgstr ""
@@ -5309,6 +5282,20 @@ msgstr "サブスクリプションを削除できません"
 msgid "Couldn't delete subscription."
 msgstr "サブスクリプションを削除できません"
 
+#: lib/subscriberspeopleselftagcloudsection.php:48
+#: lib/subscriptionspeopleselftagcloudsection.php:48
+msgid "People Tagcloud as self-tagged"
+msgstr ""
+
+#: lib/subscriberspeopletagcloudsection.php:48
+#: lib/subscriptionspeopletagcloudsection.php:48
+msgid "People Tagcloud as tagged"
+msgstr ""
+
+#: lib/subscriptionlist.php:126
+msgid "(none)"
+msgstr "(なし)"
+
 #: lib/tagcloudsection.php:56
 msgid "None"
 msgstr ""
diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po
index 05b20ed918..8bc4175fac 100644
--- a/locale/ko/LC_MESSAGES/statusnet.po
+++ b/locale/ko/LC_MESSAGES/statusnet.po
@@ -7,12 +7,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 21:25+0000\n"
-"PO-Revision-Date: 2009-12-07 21:26:51+0000\n"
+"POT-Creation-Date: 2009-12-12 17:09+0000\n"
+"PO-Revision-Date: 2009-12-12 17:10:00+0000\n"
 "Language-Team: Korean\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n"
+"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ko\n"
 "X-Message-Group: out-statusnet\n"
@@ -26,11 +26,11 @@ msgstr "그러한 태그가 없습니다."
 
 #: actions/all.php:74 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofile.php:105
 #: actions/apiaccountupdateprofilebackgroundimage.php:116
-#: actions/apiaccountupdateprofileimage.php:105
-#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
-#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
-#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
+#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90
 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
@@ -43,7 +43,7 @@ msgstr "그러한 태그가 없습니다."
 #: actions/repliesrss.php:38 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38
 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
-#: lib/command.php:364 lib/command.php:411 lib/command.php:466
+#: lib/command.php:364 lib/command.php:411 lib/command.php:467
 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
 #: lib/subs.php:34 lib/subs.php:116
 msgid "No such user."
@@ -55,7 +55,7 @@ msgid "%s and friends, page %d"
 msgstr "%s 와 친구들, %d 페이지"
 
 #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
-#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100
+#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s 및 친구들"
@@ -107,25 +107,25 @@ msgstr ""
 msgid "You and friends"
 msgstr "%s 및 친구들"
 
-#: actions/allrss.php:119 actions/apitimelinefriends.php:121
+#: actions/allrss.php:119 actions/apitimelinefriends.php:122
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "%1$s 및 %2$s에 있는 친구들의 업데이트!"
 
 #: actions/apiaccountratelimitstatus.php:70
 #: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofile.php:97
 #: actions/apiaccountupdateprofilebackgroundimage.php:94
 #: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apiaccountupdateprofile.php:97
 #, fuzzy
 msgid "API method not found."
 msgstr "API 메서드를 찾을 수 없습니다."
 
 #: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofile.php:89
 #: actions/apiaccountupdateprofilebackgroundimage.php:86
 #: actions/apiaccountupdateprofilecolors.php:110
-#: actions/apiaccountupdateprofileimage.php:84
-#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
+#: actions/apiaccountupdateprofileimage.php:84 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
@@ -145,9 +145,23 @@ msgstr ""
 msgid "Could not update user."
 msgstr "사용자를 업데이트 할 수 없습니다."
 
+#: actions/apiaccountupdateprofile.php:112
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+msgid "User has no profile."
+msgstr "이용자가 프로필을 가지고 있지 않습니다."
+
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "프로필을 저장 할 수 없습니다."
+
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257
 #: actions/designadminpanel.php:122 actions/newnotice.php:94
 #: lib/designsettings.php:283
 #, php-format
@@ -170,20 +184,6 @@ msgstr "트위터 환경설정을 저장할 수 없습니다."
 msgid "Could not update your design."
 msgstr "사용자를 업데이트 할 수 없습니다."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
-#: actions/apiaccountupdateprofileimage.php:130
-#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
-#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
-msgid "User has no profile."
-msgstr "이용자가 프로필을 가지고 있지 않습니다."
-
-#: actions/apiaccountupdateprofile.php:147
-#, fuzzy
-msgid "Could not save profile."
-msgstr "프로필을 저장 할 수 없습니다."
-
 #: actions/apiblockcreate.php:105
 #, fuzzy
 msgid "You cannot block yourself!"
@@ -197,23 +197,6 @@ msgstr "사용자 차단에 실패했습니다."
 msgid "Unblock user failed."
 msgstr "사용자 차단 해제에 실패했습니다."
 
-#: actions/apidirectmessagenew.php:126
-msgid "No message text!"
-msgstr "메시지 내용이 없습니다!"
-
-#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
-#, fuzzy, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr "메시지가 너무 길어요. 최대로 140자까지 입력하실 수 있습니다."
-
-#: actions/apidirectmessagenew.php:146
-msgid "Recipient user not found."
-msgstr "받는 사용자가 없습니다."
-
-#: actions/apidirectmessagenew.php:150
-msgid "Can't send direct messages to users who aren't your friend."
-msgstr "당신의 친구가 아닌 사용자에게 직접 메시지를 보낼 수 없습니다."
-
 #: actions/apidirectmessage.php:89
 #, fuzzy, php-format
 msgid "Direct messages from %s"
@@ -239,18 +222,35 @@ msgstr "%s에게 모든 직접 메시지"
 #: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
-#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
-#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149
-#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
-#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156
+#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151
+#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141
+#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
 msgid "API method not found!"
 msgstr "API 메서드를 찾을 수 없습니다."
 
+#: actions/apidirectmessagenew.php:126
+msgid "No message text!"
+msgstr "메시지 내용이 없습니다!"
+
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, fuzzy, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "메시지가 너무 길어요. 최대로 140자까지 입력하실 수 있습니다."
+
+#: actions/apidirectmessagenew.php:146
+msgid "Recipient user not found."
+msgstr "받는 사용자가 없습니다."
+
+#: actions/apidirectmessagenew.php:150
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr "당신의 친구가 아닌 사용자에게 직접 메시지를 보낼 수 없습니다."
+
 #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
 #: actions/apistatusesdestroy.php:113
 msgid "No status found with that ID."
@@ -403,16 +403,6 @@ msgstr "당신은 해당 그룹의 멤버가 아닙니다."
 msgid "Could not remove user %s to group %s."
 msgstr "그룹 %s에서 %s 사용자를 제거할 수 없습니다."
 
-#: actions/apigrouplistall.php:90 actions/usergroups.php:62
-#, php-format
-msgid "%s groups"
-msgstr "%s 그룹"
-
-#: actions/apigrouplistall.php:94
-#, fuzzy, php-format
-msgid "groups on %s"
-msgstr "그룹 행동"
-
 #: actions/apigrouplist.php:95
 #, fuzzy, php-format
 msgid "%s's groups"
@@ -423,6 +413,16 @@ msgstr "%s 그룹"
 msgid "Groups %s is a member of on %s."
 msgstr "%s 그룹들은  의 멤버입니다."
 
+#: actions/apigrouplistall.php:90 actions/usergroups.php:62
+#, php-format
+msgid "%s groups"
+msgstr "%s 그룹"
+
+#: actions/apigrouplistall.php:94
+#, fuzzy, php-format
+msgid "groups on %s"
+msgstr "그룹 행동"
+
 #: actions/apistatusesdestroy.php:107
 msgid "This method requires a POST or DELETE."
 msgstr "이 메서드는 등록 또는 삭제를 요구합니다."
@@ -460,54 +460,54 @@ msgstr ""
 msgid "Unsupported format."
 msgstr "지원하지 않는 그림 파일 형식입니다."
 
-#: actions/apitimelinefavorites.php:107
+#: actions/apitimelinefavorites.php:108
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr "%s / %s의 좋아하는 글들"
 
-#: actions/apitimelinefavorites.php:119
+#: actions/apitimelinefavorites.php:120
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr "%s 좋아하는 글이 업데이트 됐습니다. %S에 의해 / %s."
 
-#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117
+#: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118
 #: actions/grouprss.php:131 actions/userrss.php:90
 #, php-format
 msgid "%s timeline"
 msgstr "%s 타임라인"
 
-#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125
+#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
 #: actions/userrss.php:92
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "%2$s에 있는 %1$s의 업데이트!"
 
-#: actions/apitimelinementions.php:116
+#: actions/apitimelinementions.php:117
 #, fuzzy, php-format
 msgid "%1$s / Updates mentioning %2$s"
 msgstr "%1$s / %2$s에게 답신 업데이트"
 
-#: actions/apitimelinementions.php:126
+#: actions/apitimelinementions.php:127
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s님이 %2$s/%3$s의 업데이트에 답변했습니다."
 
-#: actions/apitimelinepublic.php:106 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s 공개 타임라인"
 
-#: actions/apitimelinepublic.php:110 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "모두로부터의 업데이트 %s개!"
 
-#: actions/apitimelinetag.php:101 actions/tag.php:66
+#: actions/apitimelinetag.php:102 actions/tag.php:66
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "%s 태그된 통지"
 
-#: actions/apitimelinetag.php:107 actions/tagrss.php:64
+#: actions/apitimelinetag.php:108 actions/tagrss.php:64
 #, fuzzy, php-format
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr "%2$s에 있는 %1$s의 업데이트!"
@@ -543,45 +543,45 @@ msgstr "아바타"
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr "당신의 개인적인 아바타를 업로드할 수 있습니다."
 
-#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:185
 #: actions/grouplogo.php:178 actions/remotesubscribe.php:191
 #: actions/userauthorization.php:72 actions/userrss.php:103
 msgid "User without matching profile"
 msgstr "프로필 매칭이 없는 사용자"
 
-#: actions/avatarsettings.php:119 actions/avatarsettings.php:194
+#: actions/avatarsettings.php:119 actions/avatarsettings.php:197
 #: actions/grouplogo.php:251
 msgid "Avatar settings"
 msgstr "아바타 설정"
 
-#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/avatarsettings.php:127 actions/avatarsettings.php:205
 #: actions/grouplogo.php:199 actions/grouplogo.php:259
 msgid "Original"
 msgstr "원래 설정"
 
-#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/avatarsettings.php:142 actions/avatarsettings.php:217
 #: actions/grouplogo.php:210 actions/grouplogo.php:271
 msgid "Preview"
 msgstr "미리보기"
 
-#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
+#: actions/avatarsettings.php:149 lib/deleteuserform.php:66
 #: lib/noticelist.php:550
 msgid "Delete"
 msgstr "삭제"
 
-#: actions/avatarsettings.php:165 actions/grouplogo.php:233
+#: actions/avatarsettings.php:166 actions/grouplogo.php:233
 msgid "Upload"
 msgstr "올리기"
 
-#: actions/avatarsettings.php:228 actions/grouplogo.php:286
+#: actions/avatarsettings.php:231 actions/grouplogo.php:286
 msgid "Crop"
 msgstr "자르기"
 
-#: actions/avatarsettings.php:265 actions/disfavor.php:74
+#: actions/avatarsettings.php:268 actions/disfavor.php:74
 #: actions/emailsettings.php:238 actions/favor.php:75
 #: actions/groupblock.php:66 actions/grouplogo.php:309
 #: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -592,34 +592,73 @@ msgstr "자르기"
 msgid "There was a problem with your session token. Try again, please."
 msgstr "세션토큰에 문제가 있습니다. 다시 시도해주세요."
 
-#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
+#: actions/avatarsettings.php:281 actions/designadminpanel.php:103
 #: actions/emailsettings.php:256 actions/grouplogo.php:319
 #: actions/imsettings.php:220 actions/recoverpassword.php:44
 #: actions/smssettings.php:248 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "잘못된 폼 제출"
 
-#: actions/avatarsettings.php:322
+#: actions/avatarsettings.php:328
 msgid "Pick a square area of the image to be your avatar"
 msgstr "당신의 아바타가 될 이미지영역을 지정하세요."
 
-#: actions/avatarsettings.php:337 actions/grouplogo.php:377
+#: actions/avatarsettings.php:343 actions/grouplogo.php:377
 msgid "Lost our file data."
 msgstr "파일 데이터를 잃어버렸습니다."
 
-#: actions/avatarsettings.php:360
+#: actions/avatarsettings.php:366
 msgid "Avatar updated."
 msgstr "아바타가 업데이트 되었습니다."
 
-#: actions/avatarsettings.php:363
+#: actions/avatarsettings.php:369
 msgid "Failed updating avatar."
 msgstr "아바타 업데이트 실패"
 
-#: actions/avatarsettings.php:387
+#: actions/avatarsettings.php:393
 #, fuzzy
 msgid "Avatar deleted."
 msgstr "아바타가 업데이트 되었습니다."
 
+#: actions/block.php:69
+#, fuzzy
+msgid "You already blocked that user."
+msgstr "당신은 이미 이 사용자를 차단하고 있습니다."
+
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
+msgid "Block user"
+msgstr "사용자를 차단합니다."
+
+#: actions/block.php:130
+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/block.php:143 actions/deletenotice.php:145
+#: actions/deleteuser.php:147 actions/groupblock.php:178
+msgid "No"
+msgstr "아니오"
+
+#: actions/block.php:143 actions/deleteuser.php:147
+#, fuzzy
+msgid "Do not block this user"
+msgstr "이 사용자를 차단해제합니다."
+
+#: actions/block.php:144 actions/deletenotice.php:146
+#: actions/deleteuser.php:148 actions/groupblock.php:179
+msgid "Yes"
+msgstr "네, 맞습니다."
+
+#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
+msgid "Block this user"
+msgstr "이 사용자 차단하기"
+
+#: actions/block.php:162
+msgid "Failed to save block information."
+msgstr "정보차단을 저장하는데 실패했습니다."
+
 #: actions/blockedfromgroup.php:73 actions/editgroup.php:84
 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
 #: actions/groupmembers.php:76 actions/grouprss.php:91
@@ -662,45 +701,6 @@ msgstr "차단해제"
 msgid "Unblock this user"
 msgstr "이 사용자를 차단해제합니다."
 
-#: actions/block.php:69
-#, fuzzy
-msgid "You already blocked that user."
-msgstr "당신은 이미 이 사용자를 차단하고 있습니다."
-
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
-msgid "Block user"
-msgstr "사용자를 차단합니다."
-
-#: actions/block.php:130
-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/block.php:143 actions/deletenotice.php:145
-#: actions/deleteuser.php:147 actions/groupblock.php:178
-msgid "No"
-msgstr "아니오"
-
-#: actions/block.php:143 actions/deleteuser.php:147
-#, fuzzy
-msgid "Do not block this user"
-msgstr "이 사용자를 차단해제합니다."
-
-#: actions/block.php:144 actions/deletenotice.php:146
-#: actions/deleteuser.php:148 actions/groupblock.php:179
-msgid "Yes"
-msgstr "네, 맞습니다."
-
-#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
-msgid "Block this user"
-msgstr "이 사용자 차단하기"
-
-#: actions/block.php:162
-msgid "Failed to save block information."
-msgstr "정보차단을 저장하는데 실패했습니다."
-
 #: actions/bookmarklet.php:50
 #, fuzzy
 msgid "Post to "
@@ -1184,6 +1184,14 @@ msgstr "받은 이메일 계정 삭제"
 msgid "New incoming email address added."
 msgstr "새로운 이메일 주소가 추가 되었습니다."
 
+#: actions/favor.php:79
+msgid "This notice is already a favorite!"
+msgstr "이 게시글은 이미 좋아하는 게시글입니다."
+
+#: actions/favor.php:92 lib/disfavorform.php:140
+msgid "Disfavor favorite"
+msgstr "좋아하는글 취소"
+
 #: actions/favorited.php:65 lib/popularnoticesection.php:88
 #: lib/publicgroupnav.php:93
 msgid "Popular notices"
@@ -1226,14 +1234,6 @@ msgstr "%s 님의 좋아하는 글들"
 msgid "Updates favored by %1$s on %2$s!"
 msgstr "%2$s에 있는 %1$s의 업데이트!"
 
-#: actions/favor.php:79
-msgid "This notice is already a favorite!"
-msgstr "이 게시글은 이미 좋아하는 게시글입니다."
-
-#: actions/favor.php:92 lib/disfavorform.php:140
-msgid "Disfavor favorite"
-msgstr "좋아하는글 취소"
-
 #: actions/featured.php:69 lib/featureduserssection.php:87
 #: lib/publicgroupnav.php:89
 msgid "Featured users"
@@ -1480,6 +1480,30 @@ msgstr ""
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "%2$s에 있는 %1$s의 업데이트!"
 
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+msgid "Groups"
+msgstr "그룹"
+
+#: actions/groups.php:64
+#, php-format
+msgid "Groups, page %d"
+msgstr "그룹, %d 페이지"
+
+#: actions/groups.php:90
+#, php-format
+msgid ""
+"%%%%site.name%%%% groups let you find and talk with people of similar "
+"interests. After you join a group you can send messages to all other members "
+"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
+"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
+"%%%%)"
+msgstr ""
+
+#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
+msgid "Create a new group"
+msgstr "새 그룹을 만듭니다."
+
 #: actions/groupsearch.php:52
 #, fuzzy, php-format
 msgid ""
@@ -1513,30 +1537,6 @@ msgid ""
 "action.newgroup%%) yourself!"
 msgstr ""
 
-#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
-msgid "Groups"
-msgstr "그룹"
-
-#: actions/groups.php:64
-#, php-format
-msgid "Groups, page %d"
-msgstr "그룹, %d 페이지"
-
-#: actions/groups.php:90
-#, php-format
-msgid ""
-"%%%%site.name%%%% groups let you find and talk with people of similar "
-"interests. After you join a group you can send messages to all other members "
-"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
-"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
-"%%%%)"
-msgstr ""
-
-#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
-msgid "Create a new group"
-msgstr "새 그룹을 만듭니다."
-
 #: actions/groupunblock.php:91
 msgid "Only an admin can unblock group members."
 msgstr ""
@@ -1727,7 +1727,7 @@ msgstr "개인적인 메시지"
 msgid "Optionally add a personal message to the invitation."
 msgstr "초대장에 메시지 첨부하기."
 
-#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:222
 msgid "Send"
 msgstr "보내기"
 
@@ -1828,64 +1828,64 @@ msgstr "그룹 %s에서 %s 사용자를 제거할 수 없습니다."
 msgid "%s left group %s"
 msgstr "%s가 그룹%s를 떠났습니다."
 
-#: actions/login.php:82 actions/register.php:137
+#: actions/login.php:83 actions/register.php:137
 msgid "Already logged in."
 msgstr "이미 로그인 하셨습니다."
 
-#: actions/login.php:113 actions/login.php:123
+#: actions/login.php:114 actions/login.php:124
 #, fuzzy
 msgid "Invalid or expired token."
 msgstr "옳지 않은 통지 내용"
 
-#: actions/login.php:146
+#: actions/login.php:147
 msgid "Incorrect username or password."
 msgstr "틀린 계정 또는 비밀 번호"
 
-#: actions/login.php:152
+#: actions/login.php:153
 #, fuzzy
 msgid "Error setting user. You are probably not authorized."
 msgstr "인증이 되지 않았습니다."
 
-#: actions/login.php:207 actions/login.php:260 lib/action.php:458
+#: actions/login.php:208 actions/login.php:261 lib/action.php:458
 #: lib/logingroupnav.php:79
 msgid "Login"
 msgstr "로그인"
 
-#: actions/login.php:246
+#: actions/login.php:247
 msgid "Login to site"
 msgstr "사이트에 로그인하세요."
 
-#: actions/login.php:249 actions/profilesettings.php:106
+#: actions/login.php:250 actions/profilesettings.php:106
 #: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
 #: lib/groupeditform.php:152 lib/userprofile.php:131
 msgid "Nickname"
 msgstr "별명"
 
-#: actions/login.php:252 actions/register.php:428
+#: actions/login.php:253 actions/register.php:428
 #: lib/accountsettingsaction.php:116
 msgid "Password"
 msgstr "비밀 번호"
 
-#: actions/login.php:255 actions/register.php:477
+#: actions/login.php:256 actions/register.php:477
 msgid "Remember me"
 msgstr "자동 로그인"
 
-#: actions/login.php:256 actions/register.php:479
+#: actions/login.php:257 actions/register.php:479
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "앞으로는 자동으로 로그인합니다. 공용 컴퓨터에서는 이용하지 마십시오!"
 
-#: actions/login.php:266
+#: actions/login.php:267
 msgid "Lost or forgotten password?"
 msgstr "비밀 번호를 잊으셨나요?"
 
-#: actions/login.php:285
+#: actions/login.php:286
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 msgstr ""
 "보안을 위해 세팅을 저장하기 전에 계정과 비밀 번호를 다시 입력 해 주십시오."
 
-#: actions/login.php:289
+#: actions/login.php:290
 #, fuzzy, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -1959,7 +1959,7 @@ msgstr "메시지"
 msgid "Direct message to %s sent"
 msgstr "%s에게 보낸 직접 메시지"
 
-#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:242 lib/channel.php:170
 msgid "Ajax Error"
 msgstr "Ajax 에러입니다."
 
@@ -1967,7 +1967,7 @@ msgstr "Ajax 에러입니다."
 msgid "New notice"
 msgstr "새로운 통지"
 
-#: actions/newnotice.php:206
+#: actions/newnotice.php:208
 msgid "Notice posted"
 msgstr "게시글이 등록되었습니다."
 
@@ -2045,8 +2045,8 @@ msgstr "연결"
 msgid "Only "
 msgstr ""
 
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996
-#: lib/api.php:1024 lib/api.php:1134
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011
+#: lib/api.php:1039 lib/api.php:1149
 msgid "Not a supported data format."
 msgstr "지원하는 형식의 데이터가 아닙니다."
 
@@ -3596,6 +3596,26 @@ msgstr "Jabber"
 msgid "SMS"
 msgstr "SMS"
 
+#: actions/tag.php:68
+#, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr "%s 으로 태그된 게시글, %d 페이지"
+
+#: actions/tag.php:86
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "%s의 통지 피드"
+
+#: actions/tag.php:92
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "%s의 통지 피드"
+
+#: actions/tag.php:98
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "%s의 통지 피드"
+
 #: actions/tagother.php:33
 msgid "Not logged in"
 msgstr "로그인되지 않았습니다."
@@ -3643,26 +3663,6 @@ msgstr "태그를 저장할 수 없습니다."
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr "당신의 구독자나 구독하는 사람에 태깅을 위해 이 양식을 사용하세요."
 
-#: actions/tag.php:68
-#, php-format
-msgid "Notices tagged with %s, page %d"
-msgstr "%s 으로 태그된 게시글, %d 페이지"
-
-#: actions/tag.php:86
-#, fuzzy, php-format
-msgid "Notice feed for tag %s (RSS 1.0)"
-msgstr "%s의 통지 피드"
-
-#: actions/tag.php:92
-#, fuzzy, php-format
-msgid "Notice feed for tag %s (RSS 2.0)"
-msgstr "%s의 통지 피드"
-
-#: actions/tag.php:98
-#, fuzzy, php-format
-msgid "Notice feed for tag %s (Atom)"
-msgstr "%s의 통지 피드"
-
 #: actions/tagrss.php:35
 msgid "No such tag."
 msgstr "그러한 태그가 없습니다."
@@ -3973,23 +3973,23 @@ msgstr "새 URI와 함께 메시지를 업데이트할 수 없습니다."
 msgid "DB error inserting hashtag: %s"
 msgstr "해쉬테그를 추가 할 때에 데이타베이스 에러 : %s"
 
-#: classes/Notice.php:179
+#: classes/Notice.php:188
 #, fuzzy
 msgid "Problem saving notice. Too long."
 msgstr "통지를 저장하는데 문제가 발생했습니다."
 
-#: classes/Notice.php:183
+#: classes/Notice.php:192
 msgid "Problem saving notice. Unknown user."
 msgstr "게시글 저장문제. 알려지지않은 회원"
 
-#: classes/Notice.php:188
+#: classes/Notice.php:197
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 "너무 많은 게시글이 너무 빠르게 올라옵니다. 한숨고르고 몇분후에 다시 포스트를 "
 "해보세요."
 
-#: classes/Notice.php:194
+#: classes/Notice.php:203
 #, fuzzy
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
@@ -3998,19 +3998,24 @@ msgstr ""
 "너무 많은 게시글이 너무 빠르게 올라옵니다. 한숨고르고 몇분후에 다시 포스트를 "
 "해보세요."
 
-#: classes/Notice.php:200
+#: classes/Notice.php:209
 msgid "You are banned from posting notices on this site."
 msgstr "이 사이트에 게시글 포스팅으로부터 당신은 금지되었습니다."
 
-#: classes/Notice.php:265 classes/Notice.php:290
+#: classes/Notice.php:274 classes/Notice.php:299
 msgid "Problem saving notice."
 msgstr "통지를 저장하는데 문제가 발생했습니다."
 
-#: classes/Notice.php:1124
+#: classes/Notice.php:1115
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "답신을 추가 할 때에 데이타베이스 에러 : %s"
 
+#: classes/User.php:347
+#, fuzzy, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr "%2$s에서 %1$s까지 메시지"
+
 #: classes/User_group.php:380
 msgid "Could not create group."
 msgstr "새 그룹을 만들 수 없습니다."
@@ -4019,11 +4024,6 @@ msgstr "새 그룹을 만들 수 없습니다."
 msgid "Could not set group membership."
 msgstr "그룹 맴버십을 세팅할 수 없습니다."
 
-#: classes/User.php:347
-#, fuzzy, php-format
-msgid "Welcome to %1$s, @%2$s!"
-msgstr "%2$s에서 %1$s까지 메시지"
-
 #: lib/accountsettingsaction.php:108
 msgid "Change your profile settings"
 msgstr "프로필 세팅 바꾸기"
@@ -4338,7 +4338,7 @@ msgstr ""
 msgid "Notice with that id does not exist"
 msgstr ""
 
-#: lib/command.php:168 lib/command.php:416 lib/command.php:471
+#: lib/command.php:168 lib/command.php:416 lib/command.php:472
 msgid "User has no last notice"
 msgstr "이용자의 지속적인 게시글이 없습니다."
 
@@ -4385,99 +4385,99 @@ msgstr "직접 메시지 보내기 오류."
 msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr "당신이 보낸 메시지가 너무 길어요. 최대 140글자까지입니다."
 
-#: lib/command.php:439
+#: lib/command.php:440
 #, fuzzy, php-format
 msgid "Reply to %s sent"
 msgstr "이 게시글에 대해 답장하기"
 
-#: lib/command.php:441
+#: lib/command.php:442
 #, fuzzy
 msgid "Error saving notice."
 msgstr "통지를 저장하는데 문제가 발생했습니다."
 
-#: lib/command.php:495
+#: lib/command.php:496
 msgid "Specify the name of the user to subscribe to"
 msgstr "구독하려는 사용자의 이름을 지정하십시오."
 
-#: lib/command.php:502
+#: lib/command.php:503
 #, php-format
 msgid "Subscribed to %s"
 msgstr "%s에게 구독되었습니다."
 
-#: lib/command.php:523
+#: lib/command.php:524
 msgid "Specify the name of the user to unsubscribe from"
 msgstr "구독을 해제하려는 사용자의 이름을 지정하십시오."
 
-#: lib/command.php:530
+#: lib/command.php:531
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr "%s에서 구독을 해제했습니다."
 
-#: lib/command.php:548 lib/command.php:571
+#: lib/command.php:549 lib/command.php:572
 msgid "Command not yet implemented."
 msgstr "명령이 아직 실행되지 않았습니다."
 
-#: lib/command.php:551
+#: lib/command.php:552
 msgid "Notification off."
 msgstr "알림끄기."
 
-#: lib/command.php:553
+#: lib/command.php:554
 msgid "Can't turn off notification."
 msgstr "알림을 끌 수 없습니다."
 
-#: lib/command.php:574
+#: lib/command.php:575
 msgid "Notification on."
 msgstr "알림이 켜졌습니다."
 
-#: lib/command.php:576
+#: lib/command.php:577
 msgid "Can't turn on notification."
 msgstr "알림을 켤 수 없습니다."
 
-#: lib/command.php:588
+#: lib/command.php:590
 msgid "Login command is disabled"
 msgstr ""
 
-#: lib/command.php:602
+#: lib/command.php:604
 #, fuzzy, php-format
 msgid "Could not create login token for %s"
-msgstr "좋아하는 게시글을 생성할 수 없습니다."
+msgstr "OpenID를 작성 할 수 없습니다 : %s"
 
-#: lib/command.php:607
+#: lib/command.php:609
 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:623
+#: lib/command.php:625
 #, fuzzy
 msgid "You are not subscribed to anyone."
 msgstr "당신은 이 프로필에 구독되지 않고있습니다."
 
-#: lib/command.php:625
+#: lib/command.php:627
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "당신은 다음 사용자를 이미 구독하고 있습니다."
 
-#: lib/command.php:645
+#: lib/command.php:647
 #, fuzzy
 msgid "No one is subscribed to you."
 msgstr "다른 사람을 구독 하실 수 없습니다."
 
-#: lib/command.php:647
+#: lib/command.php:649
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "다른 사람을 구독 하실 수 없습니다."
 
-#: lib/command.php:667
+#: lib/command.php:669
 #, fuzzy
 msgid "You are not a member of any groups."
 msgstr "당신은 해당 그룹의 멤버가 아닙니다."
 
-#: lib/command.php:669
+#: lib/command.php:671
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "당신은 해당 그룹의 멤버가 아닙니다."
 
-#: lib/command.php:683
+#: lib/command.php:685
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -4577,10 +4577,6 @@ msgstr "이 게시글을 좋아합니다."
 msgid "Favor"
 msgstr "좋아합니다"
 
-#: lib/feedlist.php:64
-msgid "Export data"
-msgstr "데이터 내보내기"
-
 #: lib/feed.php:85
 msgid "RSS 1.0"
 msgstr ""
@@ -4597,6 +4593,10 @@ msgstr ""
 msgid "FOAF"
 msgstr ""
 
+#: lib/feedlist.php:64
+msgid "Export data"
+msgstr "데이터 내보내기"
+
 #: lib/galleryaction.php:121
 msgid "Filter tags"
 msgstr "태그 필터링하기"
@@ -4758,21 +4758,6 @@ msgstr "사용자 이름과 비밀번호로 로그인"
 msgid "Sign up for a new account"
 msgstr "새 계정을 위한 회원가입"
 
-#: lib/mailbox.php:89
-msgid "Only the user can read their own mailboxes."
-msgstr "오직 해당 사용자만 자신의 메일박스를 열람할 수 있습니다."
-
-#: lib/mailbox.php:139
-msgid ""
-"You have no private messages. You can send private message to engage other "
-"users in conversation. People can send you messages for your eyes only."
-msgstr ""
-
-#: lib/mailbox.php:227 lib/noticelist.php:452
-#, fuzzy
-msgid "from"
-msgstr "다음에서:"
-
 #: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "이메일 주소 확인서"
@@ -4957,6 +4942,21 @@ msgid ""
 "\n"
 msgstr ""
 
+#: lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
+msgstr "오직 해당 사용자만 자신의 메일박스를 열람할 수 있습니다."
+
+#: lib/mailbox.php:139
+msgid ""
+"You have no private messages. You can send private message to engage other "
+"users in conversation. People can send you messages for your eyes only."
+msgstr ""
+
+#: lib/mailbox.php:227 lib/noticelist.php:452
+#, fuzzy
+msgid "from"
+msgstr "다음에서:"
+
 #: lib/mediafile.php:98 lib/mediafile.php:123
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
@@ -5017,7 +5017,7 @@ msgstr "직접 메시지 보내기"
 msgid "To"
 msgstr "에게"
 
-#: lib/messageform.php:161 lib/noticeform.php:185
+#: lib/messageform.php:159 lib/noticeform.php:183
 msgid "Available characters"
 msgstr "사용 가능한 글자"
 
@@ -5030,11 +5030,11 @@ msgstr "게시글 보내기"
 msgid "What's up, %s?"
 msgstr "뭐하세요? %?"
 
-#: lib/noticeform.php:192
+#: lib/noticeform.php:190
 msgid "Attach"
 msgstr ""
 
-#: lib/noticeform.php:196
+#: lib/noticeform.php:194
 msgid "Attach a file"
 msgstr ""
 
@@ -5106,12 +5106,12 @@ msgstr "리모트 프로필 추가 오류"
 msgid "Duplicate notice"
 msgstr "통지 삭제"
 
-#: lib/oauthstore.php:467 lib/subs.php:48
+#: lib/oauthstore.php:466 lib/subs.php:48
 #, fuzzy
 msgid "You have been banned from subscribing."
 msgstr "이 회원은 구독으로부터 당신을 차단해왔다."
 
-#: lib/oauthstore.php:492
+#: lib/oauthstore.php:491
 msgid "Couldn't insert new subscription."
 msgstr "예약 구독을 추가 할 수 없습니다."
 
@@ -5279,20 +5279,6 @@ msgstr "%s에 의해 구독되는 사람들"
 msgid "Groups %s is a member of"
 msgstr "%s 그룹들은  의 멤버입니다."
 
-#: lib/subscriberspeopleselftagcloudsection.php:48
-#: lib/subscriptionspeopleselftagcloudsection.php:48
-msgid "People Tagcloud as self-tagged"
-msgstr ""
-
-#: lib/subscriberspeopletagcloudsection.php:48
-#: lib/subscriptionspeopletagcloudsection.php:48
-msgid "People Tagcloud as tagged"
-msgstr ""
-
-#: lib/subscriptionlist.php:126
-msgid "(none)"
-msgstr "(없습니다)"
-
 #: lib/subs.php:52
 msgid "Already subscribed!"
 msgstr ""
@@ -5323,6 +5309,20 @@ msgstr "예약 구독을 삭제 할 수 없습니다."
 msgid "Couldn't delete subscription."
 msgstr "예약 구독을 삭제 할 수 없습니다."
 
+#: lib/subscriberspeopleselftagcloudsection.php:48
+#: lib/subscriptionspeopleselftagcloudsection.php:48
+msgid "People Tagcloud as self-tagged"
+msgstr ""
+
+#: lib/subscriberspeopletagcloudsection.php:48
+#: lib/subscriptionspeopletagcloudsection.php:48
+msgid "People Tagcloud as tagged"
+msgstr ""
+
+#: lib/subscriptionlist.php:126
+msgid "(none)"
+msgstr "(없습니다)"
+
 #: lib/tagcloudsection.php:56
 msgid "None"
 msgstr "없음"
diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po
index dff5c0b431..cd03f9c995 100644
--- a/locale/mk/LC_MESSAGES/statusnet.po
+++ b/locale/mk/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 21:25+0000\n"
-"PO-Revision-Date: 2009-12-07 21:26:55+0000\n"
+"POT-Creation-Date: 2009-12-12 17:09+0000\n"
+"PO-Revision-Date: 2009-12-12 17:10:04+0000\n"
 "Language-Team: Macedonian\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n"
+"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: out-statusnet\n"
@@ -27,11 +27,11 @@ msgstr "Нема такво известување."
 
 #: actions/all.php:74 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofile.php:105
 #: actions/apiaccountupdateprofilebackgroundimage.php:116
-#: actions/apiaccountupdateprofileimage.php:105
-#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
-#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
-#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
+#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90
 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
@@ -44,7 +44,7 @@ msgstr "Нема такво известување."
 #: actions/repliesrss.php:38 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38
 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
-#: lib/command.php:364 lib/command.php:411 lib/command.php:466
+#: lib/command.php:364 lib/command.php:411 lib/command.php:467
 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
 #: lib/subs.php:34 lib/subs.php:116
 msgid "No such user."
@@ -56,7 +56,7 @@ msgid "%s and friends, page %d"
 msgstr "%s и пријателите"
 
 #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
-#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100
+#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s и пријателите"
@@ -108,25 +108,25 @@ msgstr ""
 msgid "You and friends"
 msgstr "%s и пријателите"
 
-#: actions/allrss.php:119 actions/apitimelinefriends.php:121
+#: actions/allrss.php:119 actions/apitimelinefriends.php:122
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr ""
 
 #: actions/apiaccountratelimitstatus.php:70
 #: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofile.php:97
 #: actions/apiaccountupdateprofilebackgroundimage.php:94
 #: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apiaccountupdateprofile.php:97
 #, fuzzy
 msgid "API method not found."
 msgstr "Кодот за потврда не е пронајден."
 
 #: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofile.php:89
 #: actions/apiaccountupdateprofilebackgroundimage.php:86
 #: actions/apiaccountupdateprofilecolors.php:110
-#: actions/apiaccountupdateprofileimage.php:84
-#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
+#: actions/apiaccountupdateprofileimage.php:84 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
@@ -146,9 +146,23 @@ msgstr ""
 msgid "Could not update user."
 msgstr "Корисникот не може да се освежи/"
 
+#: actions/apiaccountupdateprofile.php:112
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+msgid "User has no profile."
+msgstr "Корисникот нема профил."
+
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "Профилот не може да се сними."
+
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257
 #: actions/designadminpanel.php:122 actions/newnotice.php:94
 #: lib/designsettings.php:283
 #, php-format
@@ -170,20 +184,6 @@ msgstr ""
 msgid "Could not update your design."
 msgstr "Корисникот не може да се освежи/"
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
-#: actions/apiaccountupdateprofileimage.php:130
-#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
-#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
-msgid "User has no profile."
-msgstr "Корисникот нема профил."
-
-#: actions/apiaccountupdateprofile.php:147
-#, fuzzy
-msgid "Could not save profile."
-msgstr "Профилот не може да се сними."
-
 #: actions/apiblockcreate.php:105
 #, fuzzy
 msgid "You cannot block yourself!"
@@ -197,23 +197,6 @@ msgstr ""
 msgid "Unblock user failed."
 msgstr ""
 
-#: actions/apidirectmessagenew.php:126
-msgid "No message text!"
-msgstr ""
-
-#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
-#, fuzzy, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr "Ова е предолго. Максималната должина е 140 знаци."
-
-#: actions/apidirectmessagenew.php:146
-msgid "Recipient user not found."
-msgstr ""
-
-#: actions/apidirectmessagenew.php:150
-msgid "Can't send direct messages to users who aren't your friend."
-msgstr ""
-
 #: actions/apidirectmessage.php:89
 #, php-format
 msgid "Direct messages from %s"
@@ -239,18 +222,35 @@ msgstr ""
 #: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
-#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
-#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149
-#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
-#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156
+#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151
+#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141
+#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
 msgid "API method not found!"
 msgstr ""
 
+#: actions/apidirectmessagenew.php:126
+msgid "No message text!"
+msgstr ""
+
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, fuzzy, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "Ова е предолго. Максималната должина е 140 знаци."
+
+#: actions/apidirectmessagenew.php:146
+msgid "Recipient user not found."
+msgstr ""
+
+#: actions/apidirectmessagenew.php:150
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr ""
+
 #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
 #: actions/apistatusesdestroy.php:113
 msgid "No status found with that ID."
@@ -399,16 +399,6 @@ msgstr "Не ни го испративте тој профил."
 msgid "Could not remove user %s to group %s."
 msgstr "OpenID формуларот не може да се креира:%s"
 
-#: actions/apigrouplistall.php:90 actions/usergroups.php:62
-#, php-format
-msgid "%s groups"
-msgstr ""
-
-#: actions/apigrouplistall.php:94
-#, php-format
-msgid "groups on %s"
-msgstr ""
-
 #: actions/apigrouplist.php:95
 #, fuzzy, php-format
 msgid "%s's groups"
@@ -419,6 +409,16 @@ msgstr "Профил"
 msgid "Groups %s is a member of on %s."
 msgstr "Не ни го испративте тој профил."
 
+#: actions/apigrouplistall.php:90 actions/usergroups.php:62
+#, php-format
+msgid "%s groups"
+msgstr ""
+
+#: actions/apigrouplistall.php:94
+#, php-format
+msgid "groups on %s"
+msgstr ""
+
 #: actions/apistatusesdestroy.php:107
 msgid "This method requires a POST or DELETE."
 msgstr ""
@@ -456,54 +456,54 @@ msgstr ""
 msgid "Unsupported format."
 msgstr "Неподдржан фомрат на слики."
 
-#: actions/apitimelinefavorites.php:107
+#: actions/apitimelinefavorites.php:108
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr ""
 
-#: actions/apitimelinefavorites.php:119
+#: actions/apitimelinefavorites.php:120
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr ""
 
-#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117
+#: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118
 #: actions/grouprss.php:131 actions/userrss.php:90
 #, php-format
 msgid "%s timeline"
 msgstr ""
 
-#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125
+#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
 #: actions/userrss.php:92
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr ""
 
-#: actions/apitimelinementions.php:116
+#: actions/apitimelinementions.php:117
 #, fuzzy, php-format
 msgid "%1$s / Updates mentioning %2$s"
 msgstr "%1$s статус на %2$s"
 
-#: actions/apitimelinementions.php:126
+#: actions/apitimelinementions.php:127
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr ""
 
-#: actions/apitimelinepublic.php:106 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr ""
 
-#: actions/apitimelinepublic.php:110 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr ""
 
-#: actions/apitimelinetag.php:101 actions/tag.php:66
+#: actions/apitimelinetag.php:102 actions/tag.php:66
 #, php-format
 msgid "Notices tagged with %s"
 msgstr ""
 
-#: actions/apitimelinetag.php:107 actions/tagrss.php:64
+#: actions/apitimelinetag.php:108 actions/tagrss.php:64
 #, fuzzy, php-format
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Микроблог на %s"
@@ -540,46 +540,46 @@ msgstr "Аватар"
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr ""
 
-#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:185
 #: actions/grouplogo.php:178 actions/remotesubscribe.php:191
 #: actions/userauthorization.php:72 actions/userrss.php:103
 msgid "User without matching profile"
 msgstr ""
 
-#: actions/avatarsettings.php:119 actions/avatarsettings.php:194
+#: actions/avatarsettings.php:119 actions/avatarsettings.php:197
 #: actions/grouplogo.php:251
 #, fuzzy
 msgid "Avatar settings"
 msgstr "Поставки"
 
-#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/avatarsettings.php:127 actions/avatarsettings.php:205
 #: actions/grouplogo.php:199 actions/grouplogo.php:259
 msgid "Original"
 msgstr ""
 
-#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/avatarsettings.php:142 actions/avatarsettings.php:217
 #: actions/grouplogo.php:210 actions/grouplogo.php:271
 msgid "Preview"
 msgstr ""
 
-#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
+#: actions/avatarsettings.php:149 lib/deleteuserform.php:66
 #: lib/noticelist.php:550
 msgid "Delete"
 msgstr ""
 
-#: actions/avatarsettings.php:165 actions/grouplogo.php:233
+#: actions/avatarsettings.php:166 actions/grouplogo.php:233
 msgid "Upload"
 msgstr "Товари"
 
-#: actions/avatarsettings.php:228 actions/grouplogo.php:286
+#: actions/avatarsettings.php:231 actions/grouplogo.php:286
 msgid "Crop"
 msgstr ""
 
-#: actions/avatarsettings.php:265 actions/disfavor.php:74
+#: actions/avatarsettings.php:268 actions/disfavor.php:74
 #: actions/emailsettings.php:238 actions/favor.php:75
 #: actions/groupblock.php:66 actions/grouplogo.php:309
 #: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -590,34 +590,75 @@ msgstr ""
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
-#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
+#: actions/avatarsettings.php:281 actions/designadminpanel.php:103
 #: actions/emailsettings.php:256 actions/grouplogo.php:319
 #: actions/imsettings.php:220 actions/recoverpassword.php:44
 #: actions/smssettings.php:248 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "Неочекувано испраќање на формулар."
 
-#: actions/avatarsettings.php:322
+#: actions/avatarsettings.php:328
 msgid "Pick a square area of the image to be your avatar"
 msgstr ""
 
-#: actions/avatarsettings.php:337 actions/grouplogo.php:377
+#: actions/avatarsettings.php:343 actions/grouplogo.php:377
 msgid "Lost our file data."
 msgstr ""
 
-#: actions/avatarsettings.php:360
+#: actions/avatarsettings.php:366
 msgid "Avatar updated."
 msgstr "Аватарот е ажуриран."
 
-#: actions/avatarsettings.php:363
+#: actions/avatarsettings.php:369
 msgid "Failed updating avatar."
 msgstr "Товарањето на аватарот не успеа."
 
-#: actions/avatarsettings.php:387
+#: actions/avatarsettings.php:393
 #, fuzzy
 msgid "Avatar deleted."
 msgstr "Аватарот е ажуриран."
 
+#: actions/block.php:69
+#, fuzzy
+msgid "You already blocked that user."
+msgstr "Веќе сте пријавени!"
+
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
+#, fuzzy
+msgid "Block user"
+msgstr "Нема таков корисник."
+
+#: actions/block.php:130
+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/block.php:143 actions/deletenotice.php:145
+#: actions/deleteuser.php:147 actions/groupblock.php:178
+msgid "No"
+msgstr "Не"
+
+#: actions/block.php:143 actions/deleteuser.php:147
+#, fuzzy
+msgid "Do not block this user"
+msgstr "Нема таков корисник."
+
+#: actions/block.php:144 actions/deletenotice.php:146
+#: actions/deleteuser.php:148 actions/groupblock.php:179
+msgid "Yes"
+msgstr ""
+
+#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
+#, fuzzy
+msgid "Block this user"
+msgstr "Нема таков корисник."
+
+#: actions/block.php:162
+msgid "Failed to save block information."
+msgstr ""
+
 #: actions/blockedfromgroup.php:73 actions/editgroup.php:84
 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
 #: actions/groupmembers.php:76 actions/grouprss.php:91
@@ -661,47 +702,6 @@ msgstr ""
 msgid "Unblock this user"
 msgstr "Нема таков корисник."
 
-#: actions/block.php:69
-#, fuzzy
-msgid "You already blocked that user."
-msgstr "Веќе сте пријавени!"
-
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
-#, fuzzy
-msgid "Block user"
-msgstr "Нема таков корисник."
-
-#: actions/block.php:130
-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/block.php:143 actions/deletenotice.php:145
-#: actions/deleteuser.php:147 actions/groupblock.php:178
-msgid "No"
-msgstr "Не"
-
-#: actions/block.php:143 actions/deleteuser.php:147
-#, fuzzy
-msgid "Do not block this user"
-msgstr "Нема таков корисник."
-
-#: actions/block.php:144 actions/deletenotice.php:146
-#: actions/deleteuser.php:148 actions/groupblock.php:179
-msgid "Yes"
-msgstr ""
-
-#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
-#, fuzzy
-msgid "Block this user"
-msgstr "Нема таков корисник."
-
-#: actions/block.php:162
-msgid "Failed to save block information."
-msgstr ""
-
 #: actions/bookmarklet.php:50
 msgid "Post to "
 msgstr ""
@@ -1176,6 +1176,14 @@ msgstr ""
 msgid "New incoming email address added."
 msgstr ""
 
+#: actions/favor.php:79
+msgid "This notice is already a favorite!"
+msgstr ""
+
+#: actions/favor.php:92 lib/disfavorform.php:140
+msgid "Disfavor favorite"
+msgstr ""
+
 #: actions/favorited.php:65 lib/popularnoticesection.php:88
 #: lib/publicgroupnav.php:93
 #, fuzzy
@@ -1219,14 +1227,6 @@ msgstr ""
 msgid "Updates favored by %1$s on %2$s!"
 msgstr "Микроблог на %s"
 
-#: actions/favor.php:79
-msgid "This notice is already a favorite!"
-msgstr ""
-
-#: actions/favor.php:92 lib/disfavorform.php:140
-msgid "Disfavor favorite"
-msgstr ""
-
 #: actions/featured.php:69 lib/featureduserssection.php:87
 #: lib/publicgroupnav.php:89
 msgid "Featured users"
@@ -1469,6 +1469,31 @@ msgstr ""
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "Микроблог на %s"
 
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 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 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/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
+#, fuzzy
+msgid "Create a new group"
+msgstr "Креирај нова сметка"
+
 #: actions/groupsearch.php:52
 #, fuzzy, php-format
 msgid ""
@@ -1503,31 +1528,6 @@ msgid ""
 "action.newgroup%%) yourself!"
 msgstr ""
 
-#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 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 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/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
-#, fuzzy
-msgid "Create a new group"
-msgstr "Креирај нова сметка"
-
 #: actions/groupunblock.php:91
 msgid "Only an admin can unblock group members."
 msgstr ""
@@ -1717,7 +1717,7 @@ msgstr ""
 msgid "Optionally add a personal message to the invitation."
 msgstr ""
 
-#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:222
 msgid "Send"
 msgstr "Испрати"
 
@@ -1799,58 +1799,58 @@ msgstr "OpenID формуларот не може да се креира:%s"
 msgid "%s left group %s"
 msgstr ""
 
-#: actions/login.php:82 actions/register.php:137
+#: actions/login.php:83 actions/register.php:137
 msgid "Already logged in."
 msgstr "Веќе сте најавени."
 
-#: actions/login.php:113 actions/login.php:123
+#: actions/login.php:114 actions/login.php:124
 #, fuzzy
 msgid "Invalid or expired token."
 msgstr "Неправилна содржина за известување"
 
-#: actions/login.php:146
+#: actions/login.php:147
 msgid "Incorrect username or password."
 msgstr "Неточно корисничко име или лозинка"
 
-#: actions/login.php:152
+#: actions/login.php:153
 #, fuzzy
 msgid "Error setting user. You are probably not authorized."
 msgstr "Не е одобрено."
 
-#: actions/login.php:207 actions/login.php:260 lib/action.php:458
+#: actions/login.php:208 actions/login.php:261 lib/action.php:458
 #: lib/logingroupnav.php:79
 msgid "Login"
 msgstr "Пријави се"
 
-#: actions/login.php:246
+#: actions/login.php:247
 msgid "Login to site"
 msgstr ""
 
-#: actions/login.php:249 actions/profilesettings.php:106
+#: actions/login.php:250 actions/profilesettings.php:106
 #: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
 #: lib/groupeditform.php:152 lib/userprofile.php:131
 msgid "Nickname"
 msgstr "Прекар"
 
-#: actions/login.php:252 actions/register.php:428
+#: actions/login.php:253 actions/register.php:428
 #: lib/accountsettingsaction.php:116
 msgid "Password"
 msgstr "Лозинка"
 
-#: actions/login.php:255 actions/register.php:477
+#: actions/login.php:256 actions/register.php:477
 msgid "Remember me"
 msgstr "Запамети ме"
 
-#: actions/login.php:256 actions/register.php:479
+#: actions/login.php:257 actions/register.php:479
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Следниот пат најавете се автоматски; не за компјутери кои ги делите со други!"
 
-#: actions/login.php:266
+#: actions/login.php:267
 msgid "Lost or forgotten password?"
 msgstr "Загубена или заборавена лозинка?"
 
-#: actions/login.php:285
+#: actions/login.php:286
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -1858,7 +1858,7 @@ msgstr ""
 "Поради безбедносни причини треба повторно да го внесете Вашето корисничко "
 "име и лозинка пред да ги смените Вашите поставки."
 
-#: actions/login.php:289
+#: actions/login.php:290
 #, fuzzy, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -1929,7 +1929,7 @@ msgstr ""
 msgid "Direct message to %s sent"
 msgstr ""
 
-#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:242 lib/channel.php:170
 msgid "Ajax Error"
 msgstr ""
 
@@ -1937,7 +1937,7 @@ msgstr ""
 msgid "New notice"
 msgstr "Ново известување"
 
-#: actions/newnotice.php:206
+#: actions/newnotice.php:208
 #, fuzzy
 msgid "Notice posted"
 msgstr "Известувања"
@@ -2015,8 +2015,8 @@ msgstr "Поврзи се"
 msgid "Only "
 msgstr ""
 
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996
-#: lib/api.php:1024 lib/api.php:1134
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011
+#: lib/api.php:1039 lib/api.php:1149
 msgid "Not a supported data format."
 msgstr ""
 
@@ -2698,7 +2698,7 @@ msgstr ""
 
 #: actions/register.php:493
 msgid "My text and files are available under "
-msgstr "Мојот текст и датотеки се достапни под"
+msgstr "Мојот текст и податотеки се достапни под "
 
 #: actions/register.php:495
 msgid "Creative Commons Attribution 3.0"
@@ -3550,6 +3550,26 @@ msgstr "Нема JabberID."
 msgid "SMS"
 msgstr ""
 
+#: actions/tag.php:68
+#, fuzzy, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr "Микроблог на %s"
+
+#: actions/tag.php:86
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "Канал со известувања на %s"
+
+#: actions/tag.php:92
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "Канал со известувања на %s"
+
+#: actions/tag.php:98
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "Канал со известувања на %s"
+
 #: actions/tagother.php:33
 #, fuzzy
 msgid "Not logged in"
@@ -3598,26 +3618,6 @@ msgstr "Информациите за аватарот не може да се 
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 
-#: actions/tag.php:68
-#, fuzzy, php-format
-msgid "Notices tagged with %s, page %d"
-msgstr "Микроблог на %s"
-
-#: actions/tag.php:86
-#, fuzzy, php-format
-msgid "Notice feed for tag %s (RSS 1.0)"
-msgstr "Канал со известувања на %s"
-
-#: actions/tag.php:92
-#, fuzzy, php-format
-msgid "Notice feed for tag %s (RSS 2.0)"
-msgstr "Канал со известувања на %s"
-
-#: actions/tag.php:98
-#, fuzzy, php-format
-msgid "Notice feed for tag %s (Atom)"
-msgstr "Канал со известувања на %s"
-
 #: actions/tagrss.php:35
 #, fuzzy
 msgid "No such tag."
@@ -3929,40 +3929,45 @@ msgstr ""
 msgid "DB error inserting hashtag: %s"
 msgstr ""
 
-#: classes/Notice.php:179
+#: classes/Notice.php:188
 #, fuzzy
 msgid "Problem saving notice. Too long."
 msgstr "Проблем во снимањето на известувањето."
 
-#: classes/Notice.php:183
+#: classes/Notice.php:192
 #, fuzzy
 msgid "Problem saving notice. Unknown user."
 msgstr "Проблем во снимањето на известувањето."
 
-#: classes/Notice.php:188
+#: classes/Notice.php:197
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
-#: classes/Notice.php:194
+#: classes/Notice.php:203
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
 msgstr ""
 
-#: classes/Notice.php:200
+#: classes/Notice.php:209
 msgid "You are banned from posting notices on this site."
 msgstr ""
 
-#: classes/Notice.php:265 classes/Notice.php:290
+#: classes/Notice.php:274 classes/Notice.php:299
 msgid "Problem saving notice."
 msgstr "Проблем во снимањето на известувањето."
 
-#: classes/Notice.php:1124
+#: classes/Notice.php:1115
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Одговор од внесот во базата: %s"
 
+#: classes/User.php:347
+#, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr ""
+
 #: classes/User_group.php:380
 #, fuzzy
 msgid "Could not create group."
@@ -3973,11 +3978,6 @@ msgstr "Информациите за аватарот не може да се 
 msgid "Could not set group membership."
 msgstr "Не може да се креира претплатата"
 
-#: classes/User.php:347
-#, php-format
-msgid "Welcome to %1$s, @%2$s!"
-msgstr ""
-
 #: lib/accountsettingsaction.php:108
 msgid "Change your profile settings"
 msgstr ""
@@ -4296,7 +4296,7 @@ msgstr ""
 msgid "Notice with that id does not exist"
 msgstr ""
 
-#: lib/command.php:168 lib/command.php:416 lib/command.php:471
+#: lib/command.php:168 lib/command.php:416 lib/command.php:472
 msgid "User has no last notice"
 msgstr ""
 
@@ -4343,102 +4343,102 @@ msgstr ""
 msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr ""
 
-#: lib/command.php:439
+#: lib/command.php:440
 #, fuzzy, php-format
 msgid "Reply to %s sent"
 msgstr "Одговори испратени до %s"
 
-#: lib/command.php:441
+#: lib/command.php:442
 #, fuzzy
 msgid "Error saving notice."
 msgstr "Проблем во снимањето на известувањето."
 
-#: lib/command.php:495
+#: lib/command.php:496
 msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: lib/command.php:502
+#: lib/command.php:503
 #, php-format
 msgid "Subscribed to %s"
 msgstr ""
 
-#: lib/command.php:523
+#: lib/command.php:524
 msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: lib/command.php:530
+#: lib/command.php:531
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr ""
 
-#: lib/command.php:548 lib/command.php:571
+#: lib/command.php:549 lib/command.php:572
 msgid "Command not yet implemented."
 msgstr ""
 
-#: lib/command.php:551
+#: lib/command.php:552
 msgid "Notification off."
 msgstr ""
 
-#: lib/command.php:553
+#: lib/command.php:554
 msgid "Can't turn off notification."
 msgstr ""
 
-#: lib/command.php:574
+#: lib/command.php:575
 msgid "Notification on."
 msgstr ""
 
-#: lib/command.php:576
+#: lib/command.php:577
 msgid "Can't turn on notification."
 msgstr ""
 
-#: lib/command.php:588
+#: lib/command.php:590
 msgid "Login command is disabled"
 msgstr ""
 
-#: lib/command.php:602
+#: lib/command.php:604
 #, fuzzy, php-format
 msgid "Could not create login token for %s"
-msgstr "Информациите за аватарот не може да се снимат"
+msgstr "OpenID формуларот не може да се креира:%s"
 
-#: lib/command.php:607
+#: lib/command.php:609
 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:623
+#: lib/command.php:625
 #, fuzzy
 msgid "You are not subscribed to anyone."
 msgstr "Не ни го испративте тој профил."
 
-#: lib/command.php:625
+#: lib/command.php:627
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Не ни го испративте тој профил."
 msgstr[1] "Не ни го испративте тој профил."
 
-#: lib/command.php:645
+#: lib/command.php:647
 #, fuzzy
 msgid "No one is subscribed to you."
 msgstr "Оддалечена претплата"
 
-#: lib/command.php:647
+#: lib/command.php:649
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Оддалечена претплата"
 msgstr[1] "Оддалечена претплата"
 
-#: lib/command.php:667
+#: lib/command.php:669
 #, fuzzy
 msgid "You are not a member of any groups."
 msgstr "Не ни го испративте тој профил."
 
-#: lib/command.php:669
+#: lib/command.php:671
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Не ни го испративте тој профил."
 msgstr[1] "Не ни го испративте тој профил."
 
-#: lib/command.php:683
+#: lib/command.php:685
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -4538,10 +4538,6 @@ msgstr "Нема такво известување."
 msgid "Favor"
 msgstr ""
 
-#: lib/feedlist.php:64
-msgid "Export data"
-msgstr ""
-
 #: lib/feed.php:85
 msgid "RSS 1.0"
 msgstr ""
@@ -4558,6 +4554,10 @@ msgstr ""
 msgid "FOAF"
 msgstr ""
 
+#: lib/feedlist.php:64
+msgid "Export data"
+msgstr ""
+
 #: lib/galleryaction.php:121
 msgid "Filter tags"
 msgstr ""
@@ -4727,20 +4727,6 @@ msgstr "Погрешно име или лозинка."
 msgid "Sign up for a new account"
 msgstr "Креирај нова сметка"
 
-#: lib/mailbox.php:89
-msgid "Only the user can read their own mailboxes."
-msgstr ""
-
-#: lib/mailbox.php:139
-msgid ""
-"You have no private messages. You can send private message to engage other "
-"users in conversation. People can send you messages for your eyes only."
-msgstr ""
-
-#: lib/mailbox.php:227 lib/noticelist.php:452
-msgid "from"
-msgstr ""
-
 #: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Потврдување на адресата"
@@ -4923,6 +4909,20 @@ msgid ""
 "\n"
 msgstr ""
 
+#: lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
+msgstr ""
+
+#: lib/mailbox.php:139
+msgid ""
+"You have no private messages. You can send private message to engage other "
+"users in conversation. People can send you messages for your eyes only."
+msgstr ""
+
+#: lib/mailbox.php:227 lib/noticelist.php:452
+msgid "from"
+msgstr ""
+
 #: lib/mediafile.php:98 lib/mediafile.php:123
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
@@ -4984,7 +4984,7 @@ msgstr ""
 msgid "To"
 msgstr ""
 
-#: lib/messageform.php:161 lib/noticeform.php:185
+#: lib/messageform.php:159 lib/noticeform.php:183
 #, fuzzy
 msgid "Available characters"
 msgstr "6 или повеќе знаци"
@@ -4999,11 +4999,11 @@ msgstr "Ново известување"
 msgid "What's up, %s?"
 msgstr "Што има %s?"
 
-#: lib/noticeform.php:192
+#: lib/noticeform.php:190
 msgid "Attach"
 msgstr ""
 
-#: lib/noticeform.php:196
+#: lib/noticeform.php:194
 msgid "Attach a file"
 msgstr ""
 
@@ -5074,11 +5074,11 @@ msgstr "Грешка во внесувањето на оддалечениот 
 msgid "Duplicate notice"
 msgstr "Дуплирано известување"
 
-#: lib/oauthstore.php:467 lib/subs.php:48
+#: lib/oauthstore.php:466 lib/subs.php:48
 msgid "You have been banned from subscribing."
 msgstr ""
 
-#: lib/oauthstore.php:492
+#: lib/oauthstore.php:491
 msgid "Couldn't insert new subscription."
 msgstr "Не може да се внесе нова претплата."
 
@@ -5246,20 +5246,6 @@ msgstr "Оддалечена претплата"
 msgid "Groups %s is a member of"
 msgstr ""
 
-#: lib/subscriberspeopleselftagcloudsection.php:48
-#: lib/subscriptionspeopleselftagcloudsection.php:48
-msgid "People Tagcloud as self-tagged"
-msgstr ""
-
-#: lib/subscriberspeopletagcloudsection.php:48
-#: lib/subscriptionspeopletagcloudsection.php:48
-msgid "People Tagcloud as tagged"
-msgstr ""
-
-#: lib/subscriptionlist.php:126
-msgid "(none)"
-msgstr ""
-
 #: lib/subs.php:52
 msgid "Already subscribed!"
 msgstr ""
@@ -5291,6 +5277,20 @@ msgstr "Претплата не може да се избрише."
 msgid "Couldn't delete subscription."
 msgstr "Претплата не може да се избрише."
 
+#: lib/subscriberspeopleselftagcloudsection.php:48
+#: lib/subscriptionspeopleselftagcloudsection.php:48
+msgid "People Tagcloud as self-tagged"
+msgstr ""
+
+#: lib/subscriberspeopletagcloudsection.php:48
+#: lib/subscriptionspeopletagcloudsection.php:48
+msgid "People Tagcloud as tagged"
+msgstr ""
+
+#: lib/subscriptionlist.php:126
+msgid "(none)"
+msgstr ""
+
 #: lib/tagcloudsection.php:56
 msgid "None"
 msgstr ""
diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po
index 12b20f3ddb..cd4d46b5dc 100644
--- a/locale/nb/LC_MESSAGES/statusnet.po
+++ b/locale/nb/LC_MESSAGES/statusnet.po
@@ -7,12 +7,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 21:25+0000\n"
-"PO-Revision-Date: 2009-12-07 21:26:58+0000\n"
+"POT-Creation-Date: 2009-12-12 17:09+0000\n"
+"PO-Revision-Date: 2009-12-12 17:10:06+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(r59800); Translate extension (2009-12-06)\n"
+"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: out-statusnet\n"
@@ -26,11 +26,11 @@ msgstr "Klarte ikke å lagre profil."
 
 #: actions/all.php:74 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofile.php:105
 #: actions/apiaccountupdateprofilebackgroundimage.php:116
-#: actions/apiaccountupdateprofileimage.php:105
-#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
-#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
-#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
+#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90
 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
@@ -43,7 +43,7 @@ msgstr "Klarte ikke å lagre profil."
 #: actions/repliesrss.php:38 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38
 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
-#: lib/command.php:364 lib/command.php:411 lib/command.php:466
+#: lib/command.php:364 lib/command.php:411 lib/command.php:467
 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
 #: lib/subs.php:34 lib/subs.php:116
 msgid "No such user."
@@ -55,7 +55,7 @@ msgid "%s and friends, page %d"
 msgstr "%s og venner"
 
 #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
-#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100
+#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s og venner"
@@ -107,25 +107,25 @@ msgstr ""
 msgid "You and friends"
 msgstr "%s og venner"
 
-#: actions/allrss.php:119 actions/apitimelinefriends.php:121
+#: actions/allrss.php:119 actions/apitimelinefriends.php:122
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr ""
 
 #: actions/apiaccountratelimitstatus.php:70
 #: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofile.php:97
 #: actions/apiaccountupdateprofilebackgroundimage.php:94
 #: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apiaccountupdateprofile.php:97
 #, fuzzy
 msgid "API method not found."
 msgstr "API-metode ikke funnet!"
 
 #: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofile.php:89
 #: actions/apiaccountupdateprofilebackgroundimage.php:86
 #: actions/apiaccountupdateprofilecolors.php:110
-#: actions/apiaccountupdateprofileimage.php:84
-#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
+#: actions/apiaccountupdateprofileimage.php:84 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
@@ -145,9 +145,23 @@ msgstr ""
 msgid "Could not update user."
 msgstr "Klarte ikke å oppdatere bruker."
 
+#: actions/apiaccountupdateprofile.php:112
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+msgid "User has no profile."
+msgstr ""
+
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "Klarte ikke å lagre profil."
+
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257
 #: actions/designadminpanel.php:122 actions/newnotice.php:94
 #: lib/designsettings.php:283
 #, php-format
@@ -169,20 +183,6 @@ msgstr ""
 msgid "Could not update your design."
 msgstr "Klarte ikke å oppdatere bruker."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
-#: actions/apiaccountupdateprofileimage.php:130
-#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
-#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
-msgid "User has no profile."
-msgstr ""
-
-#: actions/apiaccountupdateprofile.php:147
-#, fuzzy
-msgid "Could not save profile."
-msgstr "Klarte ikke å lagre profil."
-
 #: actions/apiblockcreate.php:105
 #, fuzzy
 msgid "You cannot block yourself!"
@@ -196,23 +196,6 @@ msgstr ""
 msgid "Unblock user failed."
 msgstr ""
 
-#: actions/apidirectmessagenew.php:126
-msgid "No message text!"
-msgstr ""
-
-#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
-#, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr ""
-
-#: actions/apidirectmessagenew.php:146
-msgid "Recipient user not found."
-msgstr ""
-
-#: actions/apidirectmessagenew.php:150
-msgid "Can't send direct messages to users who aren't your friend."
-msgstr ""
-
 #: actions/apidirectmessage.php:89
 #, php-format
 msgid "Direct messages from %s"
@@ -238,18 +221,35 @@ msgstr ""
 #: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
-#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
-#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149
-#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
-#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156
+#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151
+#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141
+#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
 msgid "API method not found!"
 msgstr "API-metode ikke funnet!"
 
+#: actions/apidirectmessagenew.php:126
+msgid "No message text!"
+msgstr ""
+
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr ""
+
+#: actions/apidirectmessagenew.php:146
+msgid "Recipient user not found."
+msgstr ""
+
+#: actions/apidirectmessagenew.php:150
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr ""
+
 #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
 #: actions/apistatusesdestroy.php:113
 msgid "No status found with that ID."
@@ -399,16 +399,6 @@ msgstr "Du er allerede logget inn!"
 msgid "Could not remove user %s to group %s."
 msgstr "Klarte ikke å oppdatere bruker."
 
-#: actions/apigrouplistall.php:90 actions/usergroups.php:62
-#, php-format
-msgid "%s groups"
-msgstr ""
-
-#: actions/apigrouplistall.php:94
-#, php-format
-msgid "groups on %s"
-msgstr ""
-
 #: actions/apigrouplist.php:95
 #, php-format
 msgid "%s's groups"
@@ -419,6 +409,16 @@ msgstr ""
 msgid "Groups %s is a member of on %s."
 msgstr ""
 
+#: actions/apigrouplistall.php:90 actions/usergroups.php:62
+#, php-format
+msgid "%s groups"
+msgstr ""
+
+#: actions/apigrouplistall.php:94
+#, php-format
+msgid "groups on %s"
+msgstr ""
+
 #: actions/apistatusesdestroy.php:107
 msgid "This method requires a POST or DELETE."
 msgstr ""
@@ -454,54 +454,54 @@ msgstr ""
 msgid "Unsupported format."
 msgstr ""
 
-#: actions/apitimelinefavorites.php:107
+#: actions/apitimelinefavorites.php:108
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr ""
 
-#: actions/apitimelinefavorites.php:119
+#: actions/apitimelinefavorites.php:120
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr ""
 
-#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117
+#: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118
 #: actions/grouprss.php:131 actions/userrss.php:90
 #, php-format
 msgid "%s timeline"
 msgstr "%s tidslinje"
 
-#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125
+#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
 #: actions/userrss.php:92
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr ""
 
-#: actions/apitimelinementions.php:116
+#: actions/apitimelinementions.php:117
 #, fuzzy, php-format
 msgid "%1$s / Updates mentioning %2$s"
 msgstr "%1$s / Oppdateringer som svarer til %2$s"
 
-#: actions/apitimelinementions.php:126
+#: actions/apitimelinementions.php:127
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s oppdateringer som svarer på oppdateringer fra %2$s / %3$s."
 
-#: actions/apitimelinepublic.php:106 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s offentlig tidslinje"
 
-#: actions/apitimelinepublic.php:110 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s oppdateringer fra alle sammen!"
 
-#: actions/apitimelinetag.php:101 actions/tag.php:66
+#: actions/apitimelinetag.php:102 actions/tag.php:66
 #, php-format
 msgid "Notices tagged with %s"
 msgstr ""
 
-#: actions/apitimelinetag.php:107 actions/tagrss.php:64
+#: actions/apitimelinetag.php:108 actions/tagrss.php:64
 #, fuzzy, php-format
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Mikroblogg av %s"
@@ -537,47 +537,47 @@ msgstr "Brukerbilde"
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr ""
 
-#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:185
 #: actions/grouplogo.php:178 actions/remotesubscribe.php:191
 #: actions/userauthorization.php:72 actions/userrss.php:103
 msgid "User without matching profile"
 msgstr ""
 
-#: actions/avatarsettings.php:119 actions/avatarsettings.php:194
+#: actions/avatarsettings.php:119 actions/avatarsettings.php:197
 #: actions/grouplogo.php:251
 #, fuzzy
 msgid "Avatar settings"
 msgstr "Innstillinger for IM"
 
-#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/avatarsettings.php:127 actions/avatarsettings.php:205
 #: actions/grouplogo.php:199 actions/grouplogo.php:259
 msgid "Original"
 msgstr ""
 
-#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/avatarsettings.php:142 actions/avatarsettings.php:217
 #: actions/grouplogo.php:210 actions/grouplogo.php:271
 msgid "Preview"
 msgstr ""
 
-#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
+#: actions/avatarsettings.php:149 lib/deleteuserform.php:66
 #: lib/noticelist.php:550
 #, fuzzy
 msgid "Delete"
 msgstr "slett"
 
-#: actions/avatarsettings.php:165 actions/grouplogo.php:233
+#: actions/avatarsettings.php:166 actions/grouplogo.php:233
 msgid "Upload"
 msgstr "Last opp"
 
-#: actions/avatarsettings.php:228 actions/grouplogo.php:286
+#: actions/avatarsettings.php:231 actions/grouplogo.php:286
 msgid "Crop"
 msgstr ""
 
-#: actions/avatarsettings.php:265 actions/disfavor.php:74
+#: actions/avatarsettings.php:268 actions/disfavor.php:74
 #: actions/emailsettings.php:238 actions/favor.php:75
 #: actions/groupblock.php:66 actions/grouplogo.php:309
 #: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -588,34 +588,73 @@ msgstr ""
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
-#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
+#: actions/avatarsettings.php:281 actions/designadminpanel.php:103
 #: actions/emailsettings.php:256 actions/grouplogo.php:319
 #: actions/imsettings.php:220 actions/recoverpassword.php:44
 #: actions/smssettings.php:248 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr ""
 
-#: actions/avatarsettings.php:322
+#: actions/avatarsettings.php:328
 msgid "Pick a square area of the image to be your avatar"
 msgstr ""
 
-#: actions/avatarsettings.php:337 actions/grouplogo.php:377
+#: actions/avatarsettings.php:343 actions/grouplogo.php:377
 msgid "Lost our file data."
 msgstr ""
 
-#: actions/avatarsettings.php:360
+#: actions/avatarsettings.php:366
 msgid "Avatar updated."
 msgstr "Brukerbildet har blitt oppdatert."
 
-#: actions/avatarsettings.php:363
+#: actions/avatarsettings.php:369
 msgid "Failed updating avatar."
 msgstr ""
 
-#: actions/avatarsettings.php:387
+#: actions/avatarsettings.php:393
 #, fuzzy
 msgid "Avatar deleted."
 msgstr "Brukerbildet har blitt oppdatert."
 
+#: actions/block.php:69
+#, fuzzy
+msgid "You already blocked that user."
+msgstr "Du er allerede logget inn!"
+
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
+msgid "Block user"
+msgstr ""
+
+#: actions/block.php:130
+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/block.php:143 actions/deletenotice.php:145
+#: actions/deleteuser.php:147 actions/groupblock.php:178
+msgid "No"
+msgstr ""
+
+#: actions/block.php:143 actions/deleteuser.php:147
+#, fuzzy
+msgid "Do not block this user"
+msgstr "Kan ikke slette notisen."
+
+#: actions/block.php:144 actions/deletenotice.php:146
+#: actions/deleteuser.php:148 actions/groupblock.php:179
+msgid "Yes"
+msgstr "Ja"
+
+#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
+msgid "Block this user"
+msgstr ""
+
+#: actions/block.php:162
+msgid "Failed to save block information."
+msgstr ""
+
 #: actions/blockedfromgroup.php:73 actions/editgroup.php:84
 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
 #: actions/groupmembers.php:76 actions/grouprss.php:91
@@ -658,45 +697,6 @@ msgstr ""
 msgid "Unblock this user"
 msgstr ""
 
-#: actions/block.php:69
-#, fuzzy
-msgid "You already blocked that user."
-msgstr "Du er allerede logget inn!"
-
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
-msgid "Block user"
-msgstr ""
-
-#: actions/block.php:130
-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/block.php:143 actions/deletenotice.php:145
-#: actions/deleteuser.php:147 actions/groupblock.php:178
-msgid "No"
-msgstr ""
-
-#: actions/block.php:143 actions/deleteuser.php:147
-#, fuzzy
-msgid "Do not block this user"
-msgstr "Kan ikke slette notisen."
-
-#: actions/block.php:144 actions/deletenotice.php:146
-#: actions/deleteuser.php:148 actions/groupblock.php:179
-msgid "Yes"
-msgstr "Ja"
-
-#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
-msgid "Block this user"
-msgstr ""
-
-#: actions/block.php:162
-msgid "Failed to save block information."
-msgstr ""
-
 #: actions/bookmarklet.php:50
 msgid "Post to "
 msgstr ""
@@ -1174,6 +1174,14 @@ msgstr ""
 msgid "New incoming email address added."
 msgstr ""
 
+#: actions/favor.php:79
+msgid "This notice is already a favorite!"
+msgstr ""
+
+#: actions/favor.php:92 lib/disfavorform.php:140
+msgid "Disfavor favorite"
+msgstr ""
+
 #: actions/favorited.php:65 lib/popularnoticesection.php:88
 #: lib/publicgroupnav.php:93
 msgid "Popular notices"
@@ -1216,14 +1224,6 @@ msgstr ""
 msgid "Updates favored by %1$s on %2$s!"
 msgstr ""
 
-#: actions/favor.php:79
-msgid "This notice is already a favorite!"
-msgstr ""
-
-#: actions/favor.php:92 lib/disfavorform.php:140
-msgid "Disfavor favorite"
-msgstr ""
-
 #: actions/featured.php:69 lib/featureduserssection.php:87
 #: lib/publicgroupnav.php:89
 msgid "Featured users"
@@ -1457,6 +1457,31 @@ msgstr ""
 msgid "Updates from members of %1$s on %2$s!"
 msgstr ""
 
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 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 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/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
+#, fuzzy
+msgid "Create a new group"
+msgstr "Opprett en ny konto"
+
 #: actions/groupsearch.php:52
 #, php-format
 msgid ""
@@ -1488,31 +1513,6 @@ msgid ""
 "action.newgroup%%) yourself!"
 msgstr ""
 
-#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 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 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/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
-#, fuzzy
-msgid "Create a new group"
-msgstr "Opprett en ny konto"
-
 #: actions/groupunblock.php:91
 msgid "Only an admin can unblock group members."
 msgstr ""
@@ -1694,7 +1694,7 @@ msgstr ""
 msgid "Optionally add a personal message to the invitation."
 msgstr ""
 
-#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:222
 msgid "Send"
 msgstr "Send"
 
@@ -1796,63 +1796,63 @@ msgstr "Klarte ikke å oppdatere bruker."
 msgid "%s left group %s"
 msgstr ""
 
-#: actions/login.php:82 actions/register.php:137
+#: actions/login.php:83 actions/register.php:137
 msgid "Already logged in."
 msgstr "Allerede innlogget."
 
-#: actions/login.php:113 actions/login.php:123
+#: actions/login.php:114 actions/login.php:124
 msgid "Invalid or expired token."
 msgstr ""
 
-#: actions/login.php:146
+#: actions/login.php:147
 msgid "Incorrect username or password."
 msgstr "Feil brukernavn eller passord"
 
-#: actions/login.php:152
+#: actions/login.php:153
 #, fuzzy
 msgid "Error setting user. You are probably not authorized."
 msgstr "Ikke autorisert."
 
-#: actions/login.php:207 actions/login.php:260 lib/action.php:458
+#: actions/login.php:208 actions/login.php:261 lib/action.php:458
 #: lib/logingroupnav.php:79
 msgid "Login"
 msgstr "Logg inn"
 
-#: actions/login.php:246
+#: actions/login.php:247
 msgid "Login to site"
 msgstr ""
 
-#: actions/login.php:249 actions/profilesettings.php:106
+#: actions/login.php:250 actions/profilesettings.php:106
 #: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
 #: lib/groupeditform.php:152 lib/userprofile.php:131
 msgid "Nickname"
 msgstr "Nick"
 
-#: actions/login.php:252 actions/register.php:428
+#: actions/login.php:253 actions/register.php:428
 #: lib/accountsettingsaction.php:116
 msgid "Password"
 msgstr "Passord"
 
-#: actions/login.php:255 actions/register.php:477
+#: actions/login.php:256 actions/register.php:477
 msgid "Remember me"
 msgstr "Husk meg"
 
-#: actions/login.php:256 actions/register.php:479
+#: actions/login.php:257 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!"
 
-#: actions/login.php:266
+#: actions/login.php:267
 msgid "Lost or forgotten password?"
 msgstr "Mistet eller glemt passordet?"
 
-#: actions/login.php:285
+#: actions/login.php:286
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 msgstr ""
 
-#: actions/login.php:289
+#: actions/login.php:290
 #, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -1921,7 +1921,7 @@ msgstr ""
 msgid "Direct message to %s sent"
 msgstr ""
 
-#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:242 lib/channel.php:170
 msgid "Ajax Error"
 msgstr ""
 
@@ -1929,7 +1929,7 @@ msgstr ""
 msgid "New notice"
 msgstr ""
 
-#: actions/newnotice.php:206
+#: actions/newnotice.php:208
 msgid "Notice posted"
 msgstr ""
 
@@ -2003,8 +2003,8 @@ msgstr ""
 msgid "Only "
 msgstr ""
 
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996
-#: lib/api.php:1024 lib/api.php:1134
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011
+#: lib/api.php:1039 lib/api.php:1149
 msgid "Not a supported data format."
 msgstr ""
 
@@ -3526,6 +3526,26 @@ msgstr "Ingen Jabber ID."
 msgid "SMS"
 msgstr ""
 
+#: actions/tag.php:68
+#, fuzzy, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr "Mikroblogg av %s"
+
+#: actions/tag.php:86
+#, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr ""
+
+#: actions/tag.php:92
+#, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr ""
+
+#: actions/tag.php:98
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "Feed for taggen %s"
+
 #: actions/tagother.php:33
 #, fuzzy
 msgid "Not logged in"
@@ -3574,26 +3594,6 @@ msgstr "Klarte ikke å lagre avatar-informasjonen"
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 
-#: actions/tag.php:68
-#, fuzzy, php-format
-msgid "Notices tagged with %s, page %d"
-msgstr "Mikroblogg av %s"
-
-#: actions/tag.php:86
-#, php-format
-msgid "Notice feed for tag %s (RSS 1.0)"
-msgstr ""
-
-#: actions/tag.php:92
-#, php-format
-msgid "Notice feed for tag %s (RSS 2.0)"
-msgstr ""
-
-#: actions/tag.php:98
-#, fuzzy, php-format
-msgid "Notice feed for tag %s (Atom)"
-msgstr "Feed for taggen %s"
-
 #: actions/tagrss.php:35
 msgid "No such tag."
 msgstr ""
@@ -3890,38 +3890,43 @@ msgstr ""
 msgid "DB error inserting hashtag: %s"
 msgstr ""
 
-#: classes/Notice.php:179
+#: classes/Notice.php:188
 msgid "Problem saving notice. Too long."
 msgstr ""
 
-#: classes/Notice.php:183
+#: classes/Notice.php:192
 msgid "Problem saving notice. Unknown user."
 msgstr ""
 
-#: classes/Notice.php:188
+#: classes/Notice.php:197
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
-#: classes/Notice.php:194
+#: classes/Notice.php:203
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
 msgstr ""
 
-#: classes/Notice.php:200
+#: classes/Notice.php:209
 msgid "You are banned from posting notices on this site."
 msgstr ""
 
-#: classes/Notice.php:265 classes/Notice.php:290
+#: classes/Notice.php:274 classes/Notice.php:299
 msgid "Problem saving notice."
 msgstr ""
 
-#: classes/Notice.php:1124
+#: classes/Notice.php:1115
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr ""
 
+#: classes/User.php:347
+#, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr ""
+
 #: classes/User_group.php:380
 #, fuzzy
 msgid "Could not create group."
@@ -3932,11 +3937,6 @@ msgstr "Klarte ikke å lagre avatar-informasjonen"
 msgid "Could not set group membership."
 msgstr "Klarte ikke å lagre avatar-informasjonen"
 
-#: classes/User.php:347
-#, php-format
-msgid "Welcome to %1$s, @%2$s!"
-msgstr ""
-
 #: lib/accountsettingsaction.php:108
 msgid "Change your profile settings"
 msgstr "Endre profilinnstillingene dine"
@@ -4241,7 +4241,7 @@ msgstr ""
 msgid "Notice with that id does not exist"
 msgstr ""
 
-#: lib/command.php:168 lib/command.php:416 lib/command.php:471
+#: lib/command.php:168 lib/command.php:416 lib/command.php:472
 msgid "User has no last notice"
 msgstr ""
 
@@ -4288,101 +4288,101 @@ msgstr ""
 msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr ""
 
-#: lib/command.php:439
+#: lib/command.php:440
 #, fuzzy, php-format
 msgid "Reply to %s sent"
 msgstr "Svar til %s"
 
-#: lib/command.php:441
+#: lib/command.php:442
 msgid "Error saving notice."
 msgstr ""
 
-#: lib/command.php:495
+#: lib/command.php:496
 msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: lib/command.php:502
+#: lib/command.php:503
 #, php-format
 msgid "Subscribed to %s"
 msgstr ""
 
-#: lib/command.php:523
+#: lib/command.php:524
 msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: lib/command.php:530
+#: lib/command.php:531
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr ""
 
-#: lib/command.php:548 lib/command.php:571
+#: lib/command.php:549 lib/command.php:572
 msgid "Command not yet implemented."
 msgstr ""
 
-#: lib/command.php:551
+#: lib/command.php:552
 msgid "Notification off."
 msgstr ""
 
-#: lib/command.php:553
+#: lib/command.php:554
 msgid "Can't turn off notification."
 msgstr ""
 
-#: lib/command.php:574
+#: lib/command.php:575
 msgid "Notification on."
 msgstr ""
 
-#: lib/command.php:576
+#: lib/command.php:577
 msgid "Can't turn on notification."
 msgstr ""
 
-#: lib/command.php:588
+#: lib/command.php:590
 msgid "Login command is disabled"
 msgstr ""
 
-#: lib/command.php:602
+#: lib/command.php:604
 #, fuzzy, php-format
 msgid "Could not create login token for %s"
 msgstr "Klarte ikke å lagre avatar-informasjonen"
 
-#: lib/command.php:607
+#: lib/command.php:609
 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:623
+#: lib/command.php:625
 #, fuzzy
 msgid "You are not subscribed to anyone."
 msgstr "Ikke autorisert."
 
-#: lib/command.php:625
+#: lib/command.php:627
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Ikke autorisert."
 msgstr[1] "Ikke autorisert."
 
-#: lib/command.php:645
+#: lib/command.php:647
 #, fuzzy
 msgid "No one is subscribed to you."
 msgstr "Svar til %s"
 
-#: lib/command.php:647
+#: lib/command.php:649
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Svar til %s"
 msgstr[1] "Svar til %s"
 
-#: lib/command.php:667
+#: lib/command.php:669
 #, fuzzy
 msgid "You are not a member of any groups."
 msgstr "Du er allerede logget inn!"
 
-#: lib/command.php:669
+#: lib/command.php:671
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Du er allerede logget inn!"
 msgstr[1] "Du er allerede logget inn!"
 
-#: lib/command.php:683
+#: lib/command.php:685
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -4480,10 +4480,6 @@ msgstr ""
 msgid "Favor"
 msgstr ""
 
-#: lib/feedlist.php:64
-msgid "Export data"
-msgstr ""
-
 #: lib/feed.php:85
 msgid "RSS 1.0"
 msgstr ""
@@ -4500,6 +4496,10 @@ msgstr ""
 msgid "FOAF"
 msgstr ""
 
+#: lib/feedlist.php:64
+msgid "Export data"
+msgstr ""
+
 #: lib/galleryaction.php:121
 #, fuzzy
 msgid "Filter tags"
@@ -4669,21 +4669,6 @@ msgstr "Ugyldig brukernavn eller passord"
 msgid "Sign up for a new account"
 msgstr "Opprett en ny konto"
 
-#: lib/mailbox.php:89
-msgid "Only the user can read their own mailboxes."
-msgstr ""
-
-#: lib/mailbox.php:139
-msgid ""
-"You have no private messages. You can send private message to engage other "
-"users in conversation. People can send you messages for your eyes only."
-msgstr ""
-
-#: lib/mailbox.php:227 lib/noticelist.php:452
-#, fuzzy
-msgid "from"
-msgstr "fra"
-
 #: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr ""
@@ -4866,6 +4851,21 @@ msgid ""
 "\n"
 msgstr ""
 
+#: lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
+msgstr ""
+
+#: lib/mailbox.php:139
+msgid ""
+"You have no private messages. You can send private message to engage other "
+"users in conversation. People can send you messages for your eyes only."
+msgstr ""
+
+#: lib/mailbox.php:227 lib/noticelist.php:452
+#, fuzzy
+msgid "from"
+msgstr "fra"
+
 #: lib/mediafile.php:98 lib/mediafile.php:123
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
@@ -4926,7 +4926,7 @@ msgstr ""
 msgid "To"
 msgstr ""
 
-#: lib/messageform.php:161 lib/noticeform.php:185
+#: lib/messageform.php:159 lib/noticeform.php:183
 #, fuzzy
 msgid "Available characters"
 msgstr "6 eller flere tegn"
@@ -4940,11 +4940,11 @@ msgstr ""
 msgid "What's up, %s?"
 msgstr ""
 
-#: lib/noticeform.php:192
+#: lib/noticeform.php:190
 msgid "Attach"
 msgstr ""
 
-#: lib/noticeform.php:196
+#: lib/noticeform.php:194
 msgid "Attach a file"
 msgstr ""
 
@@ -5014,11 +5014,11 @@ msgstr ""
 msgid "Duplicate notice"
 msgstr ""
 
-#: lib/oauthstore.php:467 lib/subs.php:48
+#: lib/oauthstore.php:466 lib/subs.php:48
 msgid "You have been banned from subscribing."
 msgstr ""
 
-#: lib/oauthstore.php:492
+#: lib/oauthstore.php:491
 msgid "Couldn't insert new subscription."
 msgstr ""
 
@@ -5185,20 +5185,6 @@ msgstr "Svar til %s"
 msgid "Groups %s is a member of"
 msgstr ""
 
-#: lib/subscriberspeopleselftagcloudsection.php:48
-#: lib/subscriptionspeopleselftagcloudsection.php:48
-msgid "People Tagcloud as self-tagged"
-msgstr ""
-
-#: lib/subscriberspeopletagcloudsection.php:48
-#: lib/subscriptionspeopletagcloudsection.php:48
-msgid "People Tagcloud as tagged"
-msgstr ""
-
-#: lib/subscriptionlist.php:126
-msgid "(none)"
-msgstr ""
-
 #: lib/subs.php:52
 msgid "Already subscribed!"
 msgstr ""
@@ -5229,6 +5215,20 @@ msgstr "Klarte ikke å lagre avatar-informasjonen"
 msgid "Couldn't delete subscription."
 msgstr ""
 
+#: lib/subscriberspeopleselftagcloudsection.php:48
+#: lib/subscriptionspeopleselftagcloudsection.php:48
+msgid "People Tagcloud as self-tagged"
+msgstr ""
+
+#: lib/subscriberspeopletagcloudsection.php:48
+#: lib/subscriptionspeopletagcloudsection.php:48
+msgid "People Tagcloud as tagged"
+msgstr ""
+
+#: lib/subscriptionlist.php:126
+msgid "(none)"
+msgstr ""
+
 #: lib/tagcloudsection.php:56
 msgid "None"
 msgstr ""
diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po
index cec42ca714..c17a03a539 100644
--- a/locale/nl/LC_MESSAGES/statusnet.po
+++ b/locale/nl/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 21:25+0000\n"
-"PO-Revision-Date: 2009-12-07 21:27:06+0000\n"
+"POT-Creation-Date: 2009-12-12 17:09+0000\n"
+"PO-Revision-Date: 2009-12-12 17:10:12+0000\n"
 "Language-Team: Dutch\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n"
+"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: out-statusnet\n"
@@ -27,11 +27,11 @@ msgstr "Deze pagina bestaat niet"
 
 #: actions/all.php:74 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofile.php:105
 #: actions/apiaccountupdateprofilebackgroundimage.php:116
-#: actions/apiaccountupdateprofileimage.php:105
-#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
-#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
-#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
+#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90
 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
@@ -44,7 +44,7 @@ msgstr "Deze pagina bestaat niet"
 #: actions/repliesrss.php:38 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38
 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
-#: lib/command.php:364 lib/command.php:411 lib/command.php:466
+#: lib/command.php:364 lib/command.php:411 lib/command.php:467
 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
 #: lib/subs.php:34 lib/subs.php:116
 msgid "No such user."
@@ -56,7 +56,7 @@ msgid "%s and friends, page %d"
 msgstr "%s en vrienden, pagina %d"
 
 #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
-#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100
+#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s en vrienden"
@@ -116,24 +116,24 @@ msgstr ""
 msgid "You and friends"
 msgstr "U en vrienden"
 
-#: actions/allrss.php:119 actions/apitimelinefriends.php:121
+#: actions/allrss.php:119 actions/apitimelinefriends.php:122
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Updates van %1$s en vrienden op %2$s."
 
 #: actions/apiaccountratelimitstatus.php:70
 #: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofile.php:97
 #: actions/apiaccountupdateprofilebackgroundimage.php:94
 #: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apiaccountupdateprofile.php:97
 msgid "API method not found."
 msgstr "De API-functie is niet aangetroffen."
 
 #: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofile.php:89
 #: actions/apiaccountupdateprofilebackgroundimage.php:86
 #: actions/apiaccountupdateprofilecolors.php:110
-#: actions/apiaccountupdateprofileimage.php:84
-#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
+#: actions/apiaccountupdateprofileimage.php:84 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
@@ -154,9 +154,22 @@ msgstr ""
 msgid "Could not update user."
 msgstr "Het was niet mogelijk de gebruiker te actualiseren."
 
+#: actions/apiaccountupdateprofile.php:112
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+msgid "User has no profile."
+msgstr "Deze gebruiker heeft geen profiel."
+
+#: actions/apiaccountupdateprofile.php:147
+msgid "Could not save profile."
+msgstr "Het was niet mogelijk het profiel op te slaan."
+
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257
 #: actions/designadminpanel.php:122 actions/newnotice.php:94
 #: lib/designsettings.php:283
 #, php-format
@@ -179,22 +192,9 @@ msgstr "Het was niet mogelijk om uw ontwerpinstellingen op te slaan."
 msgid "Could not update your design."
 msgstr "Het was niet mogelijk uw ontwerp bij te werken."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
-#: actions/apiaccountupdateprofileimage.php:130
-#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
-#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
-msgid "User has no profile."
-msgstr "Deze gebruiker heeft geen profiel."
-
-#: actions/apiaccountupdateprofile.php:147
-msgid "Could not save profile."
-msgstr "Het was niet mogelijk het profiel op te slaan."
-
 #: actions/apiblockcreate.php:105
 msgid "You cannot block yourself!"
-msgstr "U zichzelf niet blokkeren!"
+msgstr "U kunt zichzelf niet blokkeren!"
 
 #: actions/apiblockcreate.php:119
 msgid "Block user failed."
@@ -204,25 +204,6 @@ msgstr "Het blokkeren van de gebruiker is mislukt."
 msgid "Unblock user failed."
 msgstr "Het deblokkeren van de gebruiker is mislukt."
 
-#: actions/apidirectmessagenew.php:126
-msgid "No message text!"
-msgstr "Het bericht bevat geen inhoud!"
-
-#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
-#, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr "Dat is te lang. De maximale berichtlengte is %d tekens."
-
-#: actions/apidirectmessagenew.php:146
-msgid "Recipient user not found."
-msgstr "De ontvanger is niet aangetroffen."
-
-#: actions/apidirectmessagenew.php:150
-msgid "Can't send direct messages to users who aren't your friend."
-msgstr ""
-"U kunt geen directe berichten sturen aan gebruikers die niet op uw "
-"vriendenlijst staan."
-
 #: actions/apidirectmessage.php:89
 #, php-format
 msgid "Direct messages from %s"
@@ -248,18 +229,37 @@ msgstr "Alle directe berichten verzonden aan %s"
 #: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
-#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
-#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149
-#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
-#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156
+#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151
+#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141
+#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
 msgid "API method not found!"
 msgstr "De API-functie is niet aangetroffen!"
 
+#: actions/apidirectmessagenew.php:126
+msgid "No message text!"
+msgstr "Het bericht bevat geen inhoud!"
+
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "Dat is te lang. De maximale berichtlengte is %d tekens."
+
+#: actions/apidirectmessagenew.php:146
+msgid "Recipient user not found."
+msgstr "De ontvanger is niet aangetroffen."
+
+#: actions/apidirectmessagenew.php:150
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr ""
+"U kunt geen directe berichten sturen aan gebruikers die niet op uw "
+"vriendenlijst staan."
+
 #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
 #: actions/apistatusesdestroy.php:113
 msgid "No status found with that ID."
@@ -408,16 +408,6 @@ msgstr "U bent geen lid van deze groep."
 msgid "Could not remove user %s to group %s."
 msgstr "Het was niet mogelijk gebruiker %s uit de group %s te verwijderen."
 
-#: actions/apigrouplistall.php:90 actions/usergroups.php:62
-#, php-format
-msgid "%s groups"
-msgstr "%s groepen"
-
-#: actions/apigrouplistall.php:94
-#, php-format
-msgid "groups on %s"
-msgstr "groepen op %s"
-
 #: actions/apigrouplist.php:95
 #, php-format
 msgid "%s's groups"
@@ -428,6 +418,16 @@ msgstr "Groepen van %s"
 msgid "Groups %s is a member of on %s."
 msgstr "Groepen waarvan %s lid is op %s."
 
+#: actions/apigrouplistall.php:90 actions/usergroups.php:62
+#, php-format
+msgid "%s groups"
+msgstr "%s groepen"
+
+#: actions/apigrouplistall.php:94
+#, php-format
+msgid "groups on %s"
+msgstr "groepen op %s"
+
 #: actions/apistatusesdestroy.php:107
 msgid "This method requires a POST or DELETE."
 msgstr "Deze methode heeft een POST of DELETE nodig."
@@ -465,54 +465,54 @@ msgstr ""
 msgid "Unsupported format."
 msgstr "Niet-ondersteund bestandsformaat."
 
-#: actions/apitimelinefavorites.php:107
+#: actions/apitimelinefavorites.php:108
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr "%s / Favorieten van %s"
 
-#: actions/apitimelinefavorites.php:119
+#: actions/apitimelinefavorites.php:120
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr "%s updates op de favorietenlijst geplaatst door %s / %s"
 
-#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117
+#: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118
 #: actions/grouprss.php:131 actions/userrss.php:90
 #, php-format
 msgid "%s timeline"
 msgstr "%s tijdlijn"
 
-#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125
+#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
 #: actions/userrss.php:92
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Updates van %1$s op %2$s."
 
-#: actions/apitimelinementions.php:116
+#: actions/apitimelinementions.php:117
 #, php-format
 msgid "%1$s / Updates mentioning %2$s"
 msgstr "%1$s / Updates over %2$s"
 
-#: actions/apitimelinementions.php:126
+#: actions/apitimelinementions.php:127
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s updates die een reactie zijn op updates van %2$s / %3$s."
 
-#: actions/apitimelinepublic.php:106 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s publieke tijdlijn"
 
-#: actions/apitimelinepublic.php:110 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s updates van iedereen"
 
-#: actions/apitimelinetag.php:101 actions/tag.php:66
+#: actions/apitimelinetag.php:102 actions/tag.php:66
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Mededelingen met het label %s"
 
-#: actions/apitimelinetag.php:107 actions/tagrss.php:64
+#: actions/apitimelinetag.php:108 actions/tagrss.php:64
 #, php-format
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Updates met het label %1$s op %2$s!"
@@ -548,45 +548,45 @@ 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:106 actions/avatarsettings.php:182
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:185
 #: actions/grouplogo.php:178 actions/remotesubscribe.php:191
 #: actions/userauthorization.php:72 actions/userrss.php:103
 msgid "User without matching profile"
 msgstr "Gebruiker zonder bijbehorend profiel"
 
-#: actions/avatarsettings.php:119 actions/avatarsettings.php:194
+#: actions/avatarsettings.php:119 actions/avatarsettings.php:197
 #: actions/grouplogo.php:251
 msgid "Avatar settings"
 msgstr "Avatarinstellingen"
 
-#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/avatarsettings.php:127 actions/avatarsettings.php:205
 #: actions/grouplogo.php:199 actions/grouplogo.php:259
 msgid "Original"
 msgstr "Origineel"
 
-#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/avatarsettings.php:142 actions/avatarsettings.php:217
 #: actions/grouplogo.php:210 actions/grouplogo.php:271
 msgid "Preview"
 msgstr "Voorvertoning"
 
-#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
+#: actions/avatarsettings.php:149 lib/deleteuserform.php:66
 #: lib/noticelist.php:550
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: actions/avatarsettings.php:165 actions/grouplogo.php:233
+#: actions/avatarsettings.php:166 actions/grouplogo.php:233
 msgid "Upload"
 msgstr "Uploaden"
 
-#: actions/avatarsettings.php:228 actions/grouplogo.php:286
+#: actions/avatarsettings.php:231 actions/grouplogo.php:286
 msgid "Crop"
 msgstr "Uitsnijden"
 
-#: actions/avatarsettings.php:265 actions/disfavor.php:74
+#: actions/avatarsettings.php:268 actions/disfavor.php:74
 #: actions/emailsettings.php:238 actions/favor.php:75
 #: actions/groupblock.php:66 actions/grouplogo.php:309
 #: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -599,33 +599,74 @@ msgstr ""
 "Er is een probleem ontstaan met uw sessie. Probeer het nog een keer, "
 "alstublieft."
 
-#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
+#: actions/avatarsettings.php:281 actions/designadminpanel.php:103
 #: actions/emailsettings.php:256 actions/grouplogo.php:319
 #: actions/imsettings.php:220 actions/recoverpassword.php:44
 #: actions/smssettings.php:248 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "Het formulier is onverwacht ingezonden."
 
-#: actions/avatarsettings.php:322
+#: actions/avatarsettings.php:328
 msgid "Pick a square area of the image to be your avatar"
 msgstr "Selecteer een vierkant de afbeelding om als uw avatar in te stellen"
 
-#: actions/avatarsettings.php:337 actions/grouplogo.php:377
+#: actions/avatarsettings.php:343 actions/grouplogo.php:377
 msgid "Lost our file data."
 msgstr "Ons databestand is verloren gegaan."
 
-#: actions/avatarsettings.php:360
+#: actions/avatarsettings.php:366
 msgid "Avatar updated."
 msgstr "De avatar is bijgewerkt."
 
-#: actions/avatarsettings.php:363
+#: actions/avatarsettings.php:369
 msgid "Failed updating avatar."
 msgstr "Het bijwerken van de avatar is mislukt."
 
-#: actions/avatarsettings.php:387
+#: actions/avatarsettings.php:393
 msgid "Avatar deleted."
 msgstr "De avatar is verwijderd."
 
+#: actions/block.php:69
+msgid "You already blocked that user."
+msgstr "U hebt deze gebruiker reeds geblokkeerd."
+
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
+msgid "Block user"
+msgstr "Gebruiker blokkeren"
+
+#: actions/block.php:130
+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 ""
+"Weet u zeker dat u deze gebruiker wilt blokkeren? Na deze handeling wordt "
+"het abonnement van de gebruiker op u opgezegd en kan deze gebruiker in de "
+"toekomst niet op u abonneren. U wordt niet op de hoogte gesteld van \"@\"-"
+"antwoorden van de gebruiker."
+
+#: actions/block.php:143 actions/deletenotice.php:145
+#: actions/deleteuser.php:147 actions/groupblock.php:178
+msgid "No"
+msgstr "Nee"
+
+#: actions/block.php:143 actions/deleteuser.php:147
+msgid "Do not block this user"
+msgstr "Gebruiker niet blokkeren"
+
+#: actions/block.php:144 actions/deletenotice.php:146
+#: actions/deleteuser.php:148 actions/groupblock.php:179
+msgid "Yes"
+msgstr "Ja"
+
+#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
+msgid "Block this user"
+msgstr "Deze gebruiker blokkeren"
+
+#: actions/block.php:162
+msgid "Failed to save block information."
+msgstr "Het was niet mogelijk om de blokkadeinformatie op te slaan."
+
 #: actions/blockedfromgroup.php:73 actions/editgroup.php:84
 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
 #: actions/groupmembers.php:76 actions/grouprss.php:91
@@ -666,47 +707,6 @@ msgstr "Deblokkeer"
 msgid "Unblock this user"
 msgstr "Deblokkeer deze gebruiker."
 
-#: actions/block.php:69
-msgid "You already blocked that user."
-msgstr "U hebt deze gebruiker reeds geblokkeerd."
-
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
-msgid "Block user"
-msgstr "Gebruiker blokkeren"
-
-#: actions/block.php:130
-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 ""
-"Weet u zeker dat u deze gebruiker wilt blokkeren? Na deze handeling wordt "
-"het abonnement van de gebruiker op u opgezegd en kan deze gebruiker in de "
-"toekomst niet op u abonneren. U wordt niet op de hoogte gesteld van \"@\"-"
-"antwoorden van de gebruiker."
-
-#: actions/block.php:143 actions/deletenotice.php:145
-#: actions/deleteuser.php:147 actions/groupblock.php:178
-msgid "No"
-msgstr "Nee"
-
-#: actions/block.php:143 actions/deleteuser.php:147
-msgid "Do not block this user"
-msgstr "Gebruiker deblokkeren"
-
-#: actions/block.php:144 actions/deletenotice.php:146
-#: actions/deleteuser.php:148 actions/groupblock.php:179
-msgid "Yes"
-msgstr "Ja"
-
-#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
-msgid "Block this user"
-msgstr "Deze gebruiker blokkeren"
-
-#: actions/block.php:162
-msgid "Failed to save block information."
-msgstr "Het was niet mogelijk om de blokkadeinformatie op te slaan."
-
 #: actions/bookmarklet.php:50
 msgid "Post to "
 msgstr "Verzenden naar "
@@ -1060,8 +1060,8 @@ msgstr "Stuur een email naar dit adres om een nieuw bericht te posten"
 #: actions/emailsettings.php:145 actions/smssettings.php:162
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
-"Een nieuw e-mailadres instellen voor het ontvangen van e-mail. Hier wordt "
-"het het eerder ingestelde e-mailadres verwijderd."
+"Stelt een nieuw e-mailadres in voor het plaatsen van berichten; verwijdert "
+"het oude."
 
 #: actions/emailsettings.php:148 actions/smssettings.php:164
 msgid "New"
@@ -1179,6 +1179,14 @@ msgstr "Het e-mailadres voor inkomende mail is verwijderd."
 msgid "New incoming email address added."
 msgstr "Het nieuwe binnenkomende e-mailadres is toegevoegd."
 
+#: actions/favor.php:79
+msgid "This notice is already a favorite!"
+msgstr "Deze mededeling staat al in uw favorietenlijst."
+
+#: actions/favor.php:92 lib/disfavorform.php:140
+msgid "Disfavor favorite"
+msgstr "Van favotietenlijst verwijderen"
+
 #: actions/favorited.php:65 lib/popularnoticesection.php:88
 #: lib/publicgroupnav.php:93
 msgid "Popular notices"
@@ -1228,14 +1236,6 @@ msgstr "Favoriete mededelingen van %s"
 msgid "Updates favored by %1$s on %2$s!"
 msgstr "Updates op de favorietenlijst van %1$s op %2$s."
 
-#: actions/favor.php:79
-msgid "This notice is already a favorite!"
-msgstr "Deze mededeling staat al in uw favorietenlijst."
-
-#: actions/favor.php:92 lib/disfavorform.php:140
-msgid "Disfavor favorite"
-msgstr "Van favotietenlijst verwijderen"
-
 #: actions/featured.php:69 lib/featureduserssection.php:87
 #: lib/publicgroupnav.php:89
 msgid "Featured users"
@@ -1473,6 +1473,36 @@ msgstr "Deze gebruiker beheerder maken"
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "Updates voor leden van %1$s op %2$s."
 
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+msgid "Groups"
+msgstr "Groepen"
+
+#: actions/groups.php:64
+#, php-format
+msgid "Groups, page %d"
+msgstr "Groepen, pagina %d"
+
+#: actions/groups.php:90
+#, php-format
+msgid ""
+"%%%%site.name%%%% groups let you find and talk with people of similar "
+"interests. After you join a group you can send messages to all other members "
+"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
+"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
+"%%%%)"
+msgstr ""
+"Met groepen van %%%%site.name%%%% kunt u gebruikers vinden met gelijke "
+"interessen en daarmee in contact treden. Nadat u lid bent geworden van een "
+"groep, kunt u berichten naar alle gebruikers zenden met door het voorvoegsel "
+"\"!groepsnaam\" te gebruiken. Als u geen groep ziet die u aantreft, "
+"[doorzoek dan de groepen](%%%%action.groupsearch%%%%) of [start zelf een "
+"groep!](%%%%action.newgroup%%%%)."
+
+#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
+msgid "Create a new group"
+msgstr "Nieuwe groep aanmaken"
+
 #: actions/groupsearch.php:52
 #, php-format
 msgid ""
@@ -1510,36 +1540,6 @@ msgstr ""
 "U kunt een [gebruiker registreren](%%action.register%%) en de groep zelf "
 "[aanmaken](%%action.newgroup%%)!"
 
-#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
-msgid "Groups"
-msgstr "Groepen"
-
-#: actions/groups.php:64
-#, php-format
-msgid "Groups, page %d"
-msgstr "Groepen, pagina %d"
-
-#: actions/groups.php:90
-#, php-format
-msgid ""
-"%%%%site.name%%%% groups let you find and talk with people of similar "
-"interests. After you join a group you can send messages to all other members "
-"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
-"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
-"%%%%)"
-msgstr ""
-"Met groepen van %%%%site.name%%%% kunt u gebruikers vinden met gelijke "
-"interessen en daarmee in contact treden. Nadat u lid bent geworden van een "
-"groep, kunt u berichten naar alle gebruikers zenden met door het voorvoegsel "
-"\"!groepsnaam\" te gebruiken. Als u geen groep ziet die u aantreft, "
-"[doorzoek dan de groepen](%%%%action.groupsearch%%%%) of [start zelf een "
-"groep!](%%%%action.newgroup%%%%)."
-
-#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
-msgid "Create a new group"
-msgstr "Nieuwe groep aanmaken"
-
 #: actions/groupunblock.php:91
 msgid "Only an admin can unblock group members."
 msgstr "Alleen beheerders kunnen groepsleden deblokkeren."
@@ -1736,7 +1736,7 @@ msgstr "Persoonlijk bericht"
 msgid "Optionally add a personal message to the invitation."
 msgstr "Persoonlijk bericht bij de uitnodiging (optioneel)."
 
-#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:222
 msgid "Send"
 msgstr "Verzenden"
 
@@ -1842,57 +1842,57 @@ msgstr "De gebruiker %s kon niet uit de groet %s verwijderd worden"
 msgid "%s left group %s"
 msgstr "%s heeft de groep %s verlaten"
 
-#: actions/login.php:82 actions/register.php:137
+#: actions/login.php:83 actions/register.php:137
 msgid "Already logged in."
 msgstr "U bent al aangemeld."
 
-#: actions/login.php:113 actions/login.php:123
+#: actions/login.php:114 actions/login.php:124
 msgid "Invalid or expired token."
 msgstr "Het token is ongeldig of verlopen."
 
-#: actions/login.php:146
+#: actions/login.php:147
 msgid "Incorrect username or password."
 msgstr "De gebruikersnaam of wachtwoord is onjuist."
 
-#: actions/login.php:152
+#: actions/login.php:153
 msgid "Error setting user. You are probably not authorized."
 msgstr ""
 "Er is een fout opgetreden bij het maken van de instellingen. U hebt "
 "waarschijnlijk niet de juiste rechten."
 
-#: actions/login.php:207 actions/login.php:260 lib/action.php:458
+#: actions/login.php:208 actions/login.php:261 lib/action.php:458
 #: lib/logingroupnav.php:79
 msgid "Login"
 msgstr "Aanmelden"
 
-#: actions/login.php:246
+#: actions/login.php:247
 msgid "Login to site"
 msgstr "Aanmelden"
 
-#: actions/login.php:249 actions/profilesettings.php:106
+#: actions/login.php:250 actions/profilesettings.php:106
 #: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
 #: lib/groupeditform.php:152 lib/userprofile.php:131
 msgid "Nickname"
 msgstr "Gebruikersnaam"
 
-#: actions/login.php:252 actions/register.php:428
+#: actions/login.php:253 actions/register.php:428
 #: lib/accountsettingsaction.php:116
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: actions/login.php:255 actions/register.php:477
+#: actions/login.php:256 actions/register.php:477
 msgid "Remember me"
 msgstr "Aanmeldgegevens onthouden"
 
-#: actions/login.php:256 actions/register.php:479
+#: actions/login.php:257 actions/register.php:479
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Voortaan automatisch aanmelden. Niet gebruiken op gedeelde computers!"
 
-#: actions/login.php:266
+#: actions/login.php:267
 msgid "Lost or forgotten password?"
 msgstr "Wachtwoord kwijt of vergeten?"
 
-#: actions/login.php:285
+#: actions/login.php:286
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -1900,7 +1900,7 @@ msgstr ""
 "Om veiligheidsredenen moet u uw gebruikersnaam en wachtwoord nogmaals "
 "invoeren alvorens u uw instellingen kunt wijzigen."
 
-#: actions/login.php:289
+#: actions/login.php:290
 #, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -1971,7 +1971,7 @@ msgstr "Bericht verzonden."
 msgid "Direct message to %s sent"
 msgstr "Het directe bericht aan %s is verzonden"
 
-#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:242 lib/channel.php:170
 msgid "Ajax Error"
 msgstr "Er is een Ajax-fout opgetreden"
 
@@ -1979,7 +1979,7 @@ msgstr "Er is een Ajax-fout opgetreden"
 msgid "New notice"
 msgstr "Nieuw bericht"
 
-#: actions/newnotice.php:206
+#: actions/newnotice.php:208
 msgid "Notice posted"
 msgstr "De mededeling is verzonden"
 
@@ -2062,8 +2062,8 @@ msgstr "inhoudstype "
 msgid "Only "
 msgstr "Alleen "
 
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996
-#: lib/api.php:1024 lib/api.php:1134
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011
+#: lib/api.php:1039 lib/api.php:1149
 msgid "Not a supported data format."
 msgstr "Geen ondersteund gegevensformaat."
 
@@ -3660,6 +3660,26 @@ msgstr "Jabber"
 msgid "SMS"
 msgstr "SMS"
 
+#: actions/tag.php:68
+#, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr "Mededelingen met het label %s, pagina %d"
+
+#: actions/tag.php:86
+#, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "Mededelingenfeed voor label %s (RSS 1.0)"
+
+#: actions/tag.php:92
+#, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "Mededelingenfeed voor label %s (RSS 2.0)"
+
+#: actions/tag.php:98
+#, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "Mededelingenfeed voor label %s (Atom)"
+
 #: actions/tagother.php:33
 msgid "Not logged in"
 msgstr "Niet aangemeld."
@@ -3710,26 +3730,6 @@ msgstr ""
 "Gebruik dit formulier om labels toe te voegen aan uw abonnementen of "
 "abonnees."
 
-#: actions/tag.php:68
-#, php-format
-msgid "Notices tagged with %s, page %d"
-msgstr "Mededelingen met het label %s, pagina %d"
-
-#: actions/tag.php:86
-#, php-format
-msgid "Notice feed for tag %s (RSS 1.0)"
-msgstr "Mededelingenfeed voor label %s (RSS 1.0)"
-
-#: actions/tag.php:92
-#, php-format
-msgid "Notice feed for tag %s (RSS 2.0)"
-msgstr "Mededelingenfeed voor label %s (RSS 2.0)"
-
-#: actions/tag.php:98
-#, php-format
-msgid "Notice feed for tag %s (Atom)"
-msgstr "Mededelingenfeed voor label %s (Atom)"
-
 #: actions/tagrss.php:35
 msgid "No such tag."
 msgstr "Onbekend label."
@@ -4037,26 +4037,26 @@ msgstr "Het was niet mogelijk het bericht bij te werken met de nieuwe URI."
 msgid "DB error inserting hashtag: %s"
 msgstr "Er is een databasefout opgetreden bij de invoer van de hashtag: %s"
 
-#: classes/Notice.php:179
+#: classes/Notice.php:188
 msgid "Problem saving notice. Too long."
 msgstr ""
 "Er is een probleem opgetreden bij het opslaan van de mededeling. Deze is te "
 "lang."
 
-#: classes/Notice.php:183
+#: classes/Notice.php:192
 msgid "Problem saving notice. Unknown user."
 msgstr ""
 "Er was een probleem bij het opslaan van de mededeling. De gebruiker is "
 "onbekend."
 
-#: classes/Notice.php:188
+#: classes/Notice.php:197
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 "U hebt te snel te veel mededelingen verstuurd. Kom even op adem en probeer "
 "het over enige tijd weer."
 
-#: classes/Notice.php:194
+#: classes/Notice.php:203
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
@@ -4064,21 +4064,26 @@ msgstr ""
 "Te veel duplicaatberichten te snel achter elkaar. Neem een adempauze en "
 "plaats over een aantal minuten pas weer een bericht."
 
-#: classes/Notice.php:200
+#: classes/Notice.php:209
 msgid "You are banned from posting notices on this site."
 msgstr ""
 "U bent geblokkeerd en mag geen mededelingen meer achterlaten op deze site."
 
-#: classes/Notice.php:265 classes/Notice.php:290
+#: classes/Notice.php:274 classes/Notice.php:299
 msgid "Problem saving notice."
 msgstr "Er is een probleem opgetreden bij het opslaan van de mededeling."
 
-#: classes/Notice.php:1124
+#: classes/Notice.php:1115
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr ""
 "Er is een databasefout opgetreden bij het invoegen van het antwoord: %s"
 
+#: classes/User.php:347
+#, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr "Welkom bij %1$s, @%2$s!"
+
 #: classes/User_group.php:380
 msgid "Could not create group."
 msgstr "Het was niet mogelijk de groep aan te maken."
@@ -4087,11 +4092,6 @@ msgstr "Het was niet mogelijk de groep aan te maken."
 msgid "Could not set group membership."
 msgstr "Het was niet mogelijk het groepslidmaatschap in te stellen."
 
-#: classes/User.php:347
-#, php-format
-msgid "Welcome to %1$s, @%2$s!"
-msgstr "Welkom bij %1$s, @%2$s!"
-
 #: lib/accountsettingsaction.php:108
 msgid "Change your profile settings"
 msgstr "Uw profielgegevens wijzigen"
@@ -4396,7 +4396,7 @@ msgstr ""
 msgid "Notice with that id does not exist"
 msgstr "Er bestaat geen mededeling met dat ID"
 
-#: lib/command.php:168 lib/command.php:416 lib/command.php:471
+#: lib/command.php:168 lib/command.php:416 lib/command.php:472
 msgid "User has no last notice"
 msgstr "Deze gebruiker heeft geen laatste mededeling"
 
@@ -4447,100 +4447,101 @@ msgstr ""
 "De mededeling is te lang. De maximale lengte is %d tekens. Uw mededeling "
 "bevatte %d tekens"
 
-#: lib/command.php:439
+#: lib/command.php:440
 #, php-format
 msgid "Reply to %s sent"
 msgstr "Het antwoord aan %s is verzonden"
 
-#: lib/command.php:441
+#: lib/command.php:442
 msgid "Error saving notice."
 msgstr "Er is een fout opgetreden bij het opslaan van de mededeling."
 
-#: lib/command.php:495
+#: lib/command.php:496
 msgid "Specify the name of the user to subscribe to"
 msgstr "Geef de naam op van de gebruiker waarop u wilt abonneren"
 
-#: lib/command.php:502
+#: lib/command.php:503
 #, php-format
 msgid "Subscribed to %s"
 msgstr "Geabonneerd op %s"
 
-#: lib/command.php:523
+#: lib/command.php:524
 msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 "Geef de naam op van de gebruiker waarvoor u het abonnement wilt opzeggen"
 
-#: lib/command.php:530
+#: lib/command.php:531
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr "Uw abonnement op %s is opgezegd"
 
-#: lib/command.php:548 lib/command.php:571
+#: lib/command.php:549 lib/command.php:572
 msgid "Command not yet implemented."
 msgstr "Dit commando is nog niet geïmplementeerd."
 
-#: lib/command.php:551
+#: lib/command.php:552
 msgid "Notification off."
 msgstr "Notificaties uitgeschakeld."
 
-#: lib/command.php:553
+#: lib/command.php:554
 msgid "Can't turn off notification."
 msgstr "Het is niet mogelijk de mededelingen uit te schakelen."
 
-#: lib/command.php:574
+#: lib/command.php:575
 msgid "Notification on."
 msgstr "Notificaties ingeschakeld."
 
-#: lib/command.php:576
+#: lib/command.php:577
 msgid "Can't turn on notification."
 msgstr "Het is niet mogelijk de notificatie uit te schakelen."
 
-#: lib/command.php:588
+#: lib/command.php:590
 msgid "Login command is disabled"
-msgstr ""
+msgstr "Het aanmeldcommando is uitgeschakeld"
 
-#: lib/command.php:602
-#, fuzzy, php-format
+#: lib/command.php:604
+#, php-format
 msgid "Could not create login token for %s"
-msgstr "Het was niet mogelijk de aliassen aan te maken."
+msgstr "Het was niet mogelijk een aanmeldtoken aan te maken voor %s"
 
-#: lib/command.php:607
+#: lib/command.php:609
 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
+"Deze verwijzing kan slechts één keer gebruikt worden en is twee minuten "
+"geldig: %s"
 
-#: lib/command.php:623
+#: lib/command.php:625
 msgid "You are not subscribed to anyone."
 msgstr "U bent op geen enkele gebruiker geabonneerd."
 
-#: lib/command.php:625
+#: lib/command.php:627
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "U bent geabonneerd op deze gebruiker:"
 msgstr[1] "U bent geabonneerd op deze gebruikers:"
 
-#: lib/command.php:645
+#: lib/command.php:647
 msgid "No one is subscribed to you."
 msgstr "Niemand heeft een abonnenment op u."
 
-#: lib/command.php:647
+#: lib/command.php:649
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Deze gebruiker is op u geabonneerd:"
 msgstr[1] "Deze gebruikers zijn op u geabonneerd:"
 
-#: lib/command.php:667
+#: lib/command.php:669
 msgid "You are not a member of any groups."
 msgstr "U bent lid van geen enkele groep."
 
-#: lib/command.php:669
+#: lib/command.php:671
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "U bent lid van deze groep:"
 msgstr[1] "U bent lid van deze groepen:"
 
-#: lib/command.php:683
-#, fuzzy
+#: lib/command.php:685
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -4597,6 +4598,7 @@ msgstr ""
 "reply #<mededeling-ID> - antwoorden op de mededeling met het aangegeven ID\n"
 "reply <gebruiker> - antwoorden op de laatste mededeling van gebruiker\n"
 "join <groep> - lid worden van groep\n"
+"login - verwijzing opvragen naar de webpagina voor aanmelden\n"
 "drop <groep> - groepslidmaatschap opzeggen\n"
 "stats - uw statistieken opvragen\n"
 "stop - zelfde als 'off'\n"
@@ -4675,10 +4677,6 @@ msgstr "Op de favorietenlijst plaatsen"
 msgid "Favor"
 msgstr "Aan favorieten toevoegen"
 
-#: lib/feedlist.php:64
-msgid "Export data"
-msgstr "Feeds"
-
 #: lib/feed.php:85
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
@@ -4695,6 +4693,10 @@ msgstr "Atom"
 msgid "FOAF"
 msgstr "Vrienden van vrienden (FOAF)"
 
+#: lib/feedlist.php:64
+msgid "Export data"
+msgstr "Feeds"
+
 #: lib/galleryaction.php:121
 msgid "Filter tags"
 msgstr "Labels filteren"
@@ -4855,22 +4857,6 @@ msgstr "Aanmelden met gebruikersnaam en wachtwoord"
 msgid "Sign up for a new account"
 msgstr "Nieuwe gebruiker aanmaken"
 
-#: lib/mailbox.php:89
-msgid "Only the user can read their own mailboxes."
-msgstr "Gebruikers kunnen alleen hun eigen postvakken lezen."
-
-#: 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 ""
-"U hebt geen privéberichten. U kunt privéberichten verzenden aan andere "
-"gebruikers. Mensen kunnen u privéberichten sturen die alleen u kunt lezen."
-
-#: lib/mailbox.php:227 lib/noticelist.php:452
-msgid "from"
-msgstr "van"
-
 #: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "E-mailadresbevestiging"
@@ -5134,6 +5120,22 @@ msgstr ""
 "%4$s\n"
 "\n"
 
+#: lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
+msgstr "Gebruikers kunnen alleen hun eigen postvakken lezen."
+
+#: 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 ""
+"U hebt geen privéberichten. U kunt privéberichten verzenden aan andere "
+"gebruikers. Mensen kunnen u privéberichten sturen die alleen u kunt lezen."
+
+#: lib/mailbox.php:227 lib/noticelist.php:452
+msgid "from"
+msgstr "van"
+
 #: lib/mediafile.php:98 lib/mediafile.php:123
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
@@ -5200,7 +5202,7 @@ msgstr "Directe mededeling verzenden"
 msgid "To"
 msgstr "Aan"
 
-#: lib/messageform.php:161 lib/noticeform.php:185
+#: lib/messageform.php:159 lib/noticeform.php:183
 msgid "Available characters"
 msgstr "Beschikbare tekens"
 
@@ -5213,11 +5215,11 @@ msgstr "Mededeling verzenden"
 msgid "What's up, %s?"
 msgstr "Hallo, %s."
 
-#: lib/noticeform.php:192
+#: lib/noticeform.php:190
 msgid "Attach"
 msgstr "Toevoegen"
 
-#: lib/noticeform.php:196
+#: lib/noticeform.php:194
 msgid "Attach a file"
 msgstr "Bestand toevoegen"
 
@@ -5287,11 +5289,11 @@ msgstr ""
 msgid "Duplicate notice"
 msgstr "Duplicaatmelding"
 
-#: lib/oauthstore.php:467 lib/subs.php:48
+#: lib/oauthstore.php:466 lib/subs.php:48
 msgid "You have been banned from subscribing."
 msgstr "U mag zich niet abonneren."
 
-#: lib/oauthstore.php:492
+#: lib/oauthstore.php:491
 msgid "Couldn't insert new subscription."
 msgstr "Kon nieuw abonnement niet toevoegen."
 
@@ -5451,20 +5453,6 @@ msgstr "Gebruikers met een abonnement op %s"
 msgid "Groups %s is a member of"
 msgstr "Groepen waar %s lid van is"
 
-#: lib/subscriberspeopleselftagcloudsection.php:48
-#: lib/subscriptionspeopleselftagcloudsection.php:48
-msgid "People Tagcloud as self-tagged"
-msgstr "Gebruikerslabelwolk als zelf gelabeld"
-
-#: lib/subscriberspeopletagcloudsection.php:48
-#: lib/subscriptionspeopletagcloudsection.php:48
-msgid "People Tagcloud as tagged"
-msgstr "Gebruikerslabelwolk"
-
-#: lib/subscriptionlist.php:126
-msgid "(none)"
-msgstr "(geen)"
-
 #: lib/subs.php:52
 msgid "Already subscribed!"
 msgstr "U bent al gebonneerd!"
@@ -5493,6 +5481,20 @@ msgstr "Het was niet mogelijk het abonnement op uzelf te verwijderen."
 msgid "Couldn't delete subscription."
 msgstr "Kon abonnement niet verwijderen."
 
+#: lib/subscriberspeopleselftagcloudsection.php:48
+#: lib/subscriptionspeopleselftagcloudsection.php:48
+msgid "People Tagcloud as self-tagged"
+msgstr "Gebruikerslabelwolk als zelf gelabeld"
+
+#: lib/subscriberspeopletagcloudsection.php:48
+#: lib/subscriptionspeopletagcloudsection.php:48
+msgid "People Tagcloud as tagged"
+msgstr "Gebruikerslabelwolk"
+
+#: lib/subscriptionlist.php:126
+msgid "(none)"
+msgstr "(geen)"
+
 #: lib/tagcloudsection.php:56
 msgid "None"
 msgstr "Geen"
diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po
index 0703217dea..fe4af0f156 100644
--- a/locale/nn/LC_MESSAGES/statusnet.po
+++ b/locale/nn/LC_MESSAGES/statusnet.po
@@ -7,12 +7,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 21:25+0000\n"
-"PO-Revision-Date: 2009-12-07 21:27:01+0000\n"
+"POT-Creation-Date: 2009-12-12 17:09+0000\n"
+"PO-Revision-Date: 2009-12-12 17:10:09+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(r59800); Translate extension (2009-12-06)\n"
+"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nn\n"
 "X-Message-Group: out-statusnet\n"
@@ -26,11 +26,11 @@ msgstr "Dette emneord finst ikkje."
 
 #: actions/all.php:74 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofile.php:105
 #: actions/apiaccountupdateprofilebackgroundimage.php:116
-#: actions/apiaccountupdateprofileimage.php:105
-#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
-#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
-#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
+#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90
 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
@@ -43,7 +43,7 @@ msgstr "Dette emneord finst ikkje."
 #: actions/repliesrss.php:38 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38
 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
-#: lib/command.php:364 lib/command.php:411 lib/command.php:466
+#: lib/command.php:364 lib/command.php:411 lib/command.php:467
 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
 #: lib/subs.php:34 lib/subs.php:116
 msgid "No such user."
@@ -55,7 +55,7 @@ msgid "%s and friends, page %d"
 msgstr "%s med vener, side %d"
 
 #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
-#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100
+#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s med vener"
@@ -107,25 +107,25 @@ msgstr ""
 msgid "You and friends"
 msgstr "%s med vener"
 
-#: actions/allrss.php:119 actions/apitimelinefriends.php:121
+#: actions/allrss.php:119 actions/apitimelinefriends.php:122
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Oppdateringar frå %1$s og vener på %2$s!"
 
 #: actions/apiaccountratelimitstatus.php:70
 #: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofile.php:97
 #: actions/apiaccountupdateprofilebackgroundimage.php:94
 #: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apiaccountupdateprofile.php:97
 #, fuzzy
 msgid "API method not found."
 msgstr "Fann ikkje API-metode."
 
 #: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofile.php:89
 #: actions/apiaccountupdateprofilebackgroundimage.php:86
 #: actions/apiaccountupdateprofilecolors.php:110
-#: actions/apiaccountupdateprofileimage.php:84
-#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
+#: actions/apiaccountupdateprofileimage.php:84 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
@@ -145,9 +145,23 @@ msgstr ""
 msgid "Could not update user."
 msgstr "Kan ikkje oppdatera brukar."
 
+#: actions/apiaccountupdateprofile.php:112
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+msgid "User has no profile."
+msgstr "Brukaren har inga profil."
+
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "Kan ikkje lagra profil."
+
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257
 #: actions/designadminpanel.php:122 actions/newnotice.php:94
 #: lib/designsettings.php:283
 #, php-format
@@ -170,20 +184,6 @@ msgstr "Klarte ikkje å lagra Twitter-innstillingane dine!"
 msgid "Could not update your design."
 msgstr "Kan ikkje oppdatera brukar."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
-#: actions/apiaccountupdateprofileimage.php:130
-#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
-#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
-msgid "User has no profile."
-msgstr "Brukaren har inga profil."
-
-#: actions/apiaccountupdateprofile.php:147
-#, fuzzy
-msgid "Could not save profile."
-msgstr "Kan ikkje lagra profil."
-
 #: actions/apiblockcreate.php:105
 #, fuzzy
 msgid "You cannot block yourself!"
@@ -197,23 +197,6 @@ msgstr "Blokkering av brukar feila."
 msgid "Unblock user failed."
 msgstr "De-blokkering av brukar feila."
 
-#: actions/apidirectmessagenew.php:126
-msgid "No message text!"
-msgstr "Inga meldingstekst!"
-
-#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
-#, fuzzy, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr "Det er for langt. Ein notis kan berre være 140 teikn."
-
-#: actions/apidirectmessagenew.php:146
-msgid "Recipient user not found."
-msgstr "Kunne ikkje finne mottakar."
-
-#: actions/apidirectmessagenew.php:150
-msgid "Can't send direct messages to users who aren't your friend."
-msgstr "Kan ikkje senda direktemeldingar til brukarar som du ikkje er ven med."
-
 #: actions/apidirectmessage.php:89
 #, fuzzy, php-format
 msgid "Direct messages from %s"
@@ -239,18 +222,35 @@ msgstr "Alle direkte meldingar sendt til %s"
 #: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
-#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
-#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149
-#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
-#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156
+#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151
+#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141
+#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
 msgid "API method not found!"
 msgstr "Fann ikkje API-metode."
 
+#: actions/apidirectmessagenew.php:126
+msgid "No message text!"
+msgstr "Inga meldingstekst!"
+
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, fuzzy, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "Det er for langt. Ein notis kan berre være 140 teikn."
+
+#: actions/apidirectmessagenew.php:146
+msgid "Recipient user not found."
+msgstr "Kunne ikkje finne mottakar."
+
+#: actions/apidirectmessagenew.php:150
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr "Kan ikkje senda direktemeldingar til brukarar som du ikkje er ven med."
+
 #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
 #: actions/apistatusesdestroy.php:113
 msgid "No status found with that ID."
@@ -401,16 +401,6 @@ msgstr "Du er ikkje medlem av den gruppa."
 msgid "Could not remove user %s to group %s."
 msgstr "Kunne ikkje fjerne %s fra %s gruppa "
 
-#: actions/apigrouplistall.php:90 actions/usergroups.php:62
-#, php-format
-msgid "%s groups"
-msgstr "%s grupper"
-
-#: actions/apigrouplistall.php:94
-#, fuzzy, php-format
-msgid "groups on %s"
-msgstr "Gruppe handlingar"
-
 #: actions/apigrouplist.php:95
 #, fuzzy, php-format
 msgid "%s's groups"
@@ -421,6 +411,16 @@ msgstr "%s grupper"
 msgid "Groups %s is a member of on %s."
 msgstr "Grupper %s er medlem av"
 
+#: actions/apigrouplistall.php:90 actions/usergroups.php:62
+#, php-format
+msgid "%s groups"
+msgstr "%s grupper"
+
+#: actions/apigrouplistall.php:94
+#, fuzzy, php-format
+msgid "groups on %s"
+msgstr "Gruppe handlingar"
+
 #: actions/apistatusesdestroy.php:107
 msgid "This method requires a POST or DELETE."
 msgstr "Dette krev anten ein POST eller DELETE."
@@ -458,54 +458,54 @@ msgstr ""
 msgid "Unsupported format."
 msgstr "Støttar ikkje bileteformatet."
 
-#: actions/apitimelinefavorites.php:107
+#: actions/apitimelinefavorites.php:108
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr "%s / Favorittar frå %s"
 
-#: actions/apitimelinefavorites.php:119
+#: actions/apitimelinefavorites.php:120
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr "%s oppdateringar favorisert av %s / %s."
 
-#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117
+#: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118
 #: actions/grouprss.php:131 actions/userrss.php:90
 #, php-format
 msgid "%s timeline"
 msgstr "%s tidsline"
 
-#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125
+#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
 #: actions/userrss.php:92
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Oppdateringar frå %1$s på %2$s!"
 
-#: actions/apitimelinementions.php:116
+#: actions/apitimelinementions.php:117
 #, fuzzy, php-format
 msgid "%1$s / Updates mentioning %2$s"
 msgstr "%1$s / Oppdateringar som svarar til %2$s"
 
-#: actions/apitimelinementions.php:126
+#: actions/apitimelinementions.php:127
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s oppdateringar som svarar på oppdateringar frå %2$s / %3$s."
 
-#: actions/apitimelinepublic.php:106 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s offentleg tidsline"
 
-#: actions/apitimelinepublic.php:110 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s oppdateringar frå alle saman!"
 
-#: actions/apitimelinetag.php:101 actions/tag.php:66
+#: actions/apitimelinetag.php:102 actions/tag.php:66
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Notisar merka med %s"
 
-#: actions/apitimelinetag.php:107 actions/tagrss.php:64
+#: actions/apitimelinetag.php:108 actions/tagrss.php:64
 #, fuzzy, php-format
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Oppdateringar frå %1$s på %2$s!"
@@ -541,45 +541,45 @@ msgstr "Brukarbilete"
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr "Du kan laste opp ein personleg avatar."
 
-#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:185
 #: actions/grouplogo.php:178 actions/remotesubscribe.php:191
 #: actions/userauthorization.php:72 actions/userrss.php:103
 msgid "User without matching profile"
 msgstr "Kan ikkje finne brukar"
 
-#: actions/avatarsettings.php:119 actions/avatarsettings.php:194
+#: actions/avatarsettings.php:119 actions/avatarsettings.php:197
 #: actions/grouplogo.php:251
 msgid "Avatar settings"
 msgstr "Avatar-innstillingar"
 
-#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/avatarsettings.php:127 actions/avatarsettings.php:205
 #: actions/grouplogo.php:199 actions/grouplogo.php:259
 msgid "Original"
 msgstr "Original"
 
-#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/avatarsettings.php:142 actions/avatarsettings.php:217
 #: actions/grouplogo.php:210 actions/grouplogo.php:271
 msgid "Preview"
 msgstr "Forhandsvis"
 
-#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
+#: actions/avatarsettings.php:149 lib/deleteuserform.php:66
 #: lib/noticelist.php:550
 msgid "Delete"
 msgstr "Slett"
 
-#: actions/avatarsettings.php:165 actions/grouplogo.php:233
+#: actions/avatarsettings.php:166 actions/grouplogo.php:233
 msgid "Upload"
 msgstr "Last opp"
 
-#: actions/avatarsettings.php:228 actions/grouplogo.php:286
+#: actions/avatarsettings.php:231 actions/grouplogo.php:286
 msgid "Crop"
 msgstr "Skaler"
 
-#: actions/avatarsettings.php:265 actions/disfavor.php:74
+#: actions/avatarsettings.php:268 actions/disfavor.php:74
 #: actions/emailsettings.php:238 actions/favor.php:75
 #: actions/groupblock.php:66 actions/grouplogo.php:309
 #: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -590,34 +590,73 @@ msgstr "Skaler"
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Der var eit problem med sesjonen din. Vennlegst prøv på nytt."
 
-#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
+#: actions/avatarsettings.php:281 actions/designadminpanel.php:103
 #: actions/emailsettings.php:256 actions/grouplogo.php:319
 #: actions/imsettings.php:220 actions/recoverpassword.php:44
 #: actions/smssettings.php:248 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "Uventa skjemasending."
 
-#: actions/avatarsettings.php:322
+#: actions/avatarsettings.php:328
 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:337 actions/grouplogo.php:377
+#: actions/avatarsettings.php:343 actions/grouplogo.php:377
 msgid "Lost our file data."
 msgstr "Fant ikkje igjen fil data."
 
-#: actions/avatarsettings.php:360
+#: actions/avatarsettings.php:366
 msgid "Avatar updated."
 msgstr "Lasta opp brukarbilete."
 
-#: actions/avatarsettings.php:363
+#: actions/avatarsettings.php:369
 msgid "Failed updating avatar."
 msgstr "Feil ved oppdatering av brukarbilete."
 
-#: actions/avatarsettings.php:387
+#: actions/avatarsettings.php:393
 #, fuzzy
 msgid "Avatar deleted."
 msgstr "Lasta opp brukarbilete."
 
+#: actions/block.php:69
+#, fuzzy
+msgid "You already blocked that user."
+msgstr "Du har allereie blokkert denne brukaren."
+
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
+msgid "Block user"
+msgstr "Blokker brukaren"
+
+#: actions/block.php:130
+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/block.php:143 actions/deletenotice.php:145
+#: actions/deleteuser.php:147 actions/groupblock.php:178
+msgid "No"
+msgstr "Nei"
+
+#: actions/block.php:143 actions/deleteuser.php:147
+#, fuzzy
+msgid "Do not block this user"
+msgstr "Lås opp brukaren"
+
+#: actions/block.php:144 actions/deletenotice.php:146
+#: actions/deleteuser.php:148 actions/groupblock.php:179
+msgid "Yes"
+msgstr "Jau"
+
+#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
+msgid "Block this user"
+msgstr "Blokkér denne brukaren"
+
+#: actions/block.php:162
+msgid "Failed to save block information."
+msgstr "Lagring av informasjon feila."
+
 #: actions/blockedfromgroup.php:73 actions/editgroup.php:84
 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
 #: actions/groupmembers.php:76 actions/grouprss.php:91
@@ -660,45 +699,6 @@ msgstr "Lås opp"
 msgid "Unblock this user"
 msgstr "Lås opp brukaren"
 
-#: actions/block.php:69
-#, fuzzy
-msgid "You already blocked that user."
-msgstr "Du har allereie blokkert denne brukaren."
-
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
-msgid "Block user"
-msgstr "Blokker brukaren"
-
-#: actions/block.php:130
-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/block.php:143 actions/deletenotice.php:145
-#: actions/deleteuser.php:147 actions/groupblock.php:178
-msgid "No"
-msgstr "Nei"
-
-#: actions/block.php:143 actions/deleteuser.php:147
-#, fuzzy
-msgid "Do not block this user"
-msgstr "Lås opp brukaren"
-
-#: actions/block.php:144 actions/deletenotice.php:146
-#: actions/deleteuser.php:148 actions/groupblock.php:179
-msgid "Yes"
-msgstr "Jau"
-
-#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
-msgid "Block this user"
-msgstr "Blokkér denne brukaren"
-
-#: actions/block.php:162
-msgid "Failed to save block information."
-msgstr "Lagring av informasjon feila."
-
 #: actions/bookmarklet.php:50
 #, fuzzy
 msgid "Post to "
@@ -1184,6 +1184,14 @@ msgstr "Fjerna innkomande epostadresse."
 msgid "New incoming email address added."
 msgstr "La til ny innkomande epostadresse."
 
+#: actions/favor.php:79
+msgid "This notice is already a favorite!"
+msgstr "Denne notisen er alt ein favoritt!"
+
+#: actions/favor.php:92 lib/disfavorform.php:140
+msgid "Disfavor favorite"
+msgstr "Fjern favoritt"
+
 #: actions/favorited.php:65 lib/popularnoticesection.php:88
 #: lib/publicgroupnav.php:93
 msgid "Popular notices"
@@ -1226,14 +1234,6 @@ msgstr "%s's favoritt meldingar"
 msgid "Updates favored by %1$s on %2$s!"
 msgstr "Oppdateringar frå %1$s på %2$s!"
 
-#: actions/favor.php:79
-msgid "This notice is already a favorite!"
-msgstr "Denne notisen er alt ein favoritt!"
-
-#: actions/favor.php:92 lib/disfavorform.php:140
-msgid "Disfavor favorite"
-msgstr "Fjern favoritt"
-
 #: actions/featured.php:69 lib/featureduserssection.php:87
 #: lib/publicgroupnav.php:89
 msgid "Featured users"
@@ -1480,6 +1480,30 @@ msgstr ""
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "Oppdateringar frå %1$s på %2$s!"
 
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+msgid "Groups"
+msgstr "Grupper"
+
+#: actions/groups.php:64
+#, php-format
+msgid "Groups, page %d"
+msgstr "Grupper, side %d"
+
+#: actions/groups.php:90
+#, php-format
+msgid ""
+"%%%%site.name%%%% groups let you find and talk with people of similar "
+"interests. After you join a group you can send messages to all other members "
+"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
+"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
+"%%%%)"
+msgstr ""
+
+#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
+msgid "Create a new group"
+msgstr "Opprett ei ny gruppe"
+
 #: actions/groupsearch.php:52
 #, fuzzy, php-format
 msgid ""
@@ -1513,30 +1537,6 @@ msgid ""
 "action.newgroup%%) yourself!"
 msgstr ""
 
-#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
-msgid "Groups"
-msgstr "Grupper"
-
-#: actions/groups.php:64
-#, php-format
-msgid "Groups, page %d"
-msgstr "Grupper, side %d"
-
-#: actions/groups.php:90
-#, php-format
-msgid ""
-"%%%%site.name%%%% groups let you find and talk with people of similar "
-"interests. After you join a group you can send messages to all other members "
-"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
-"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
-"%%%%)"
-msgstr ""
-
-#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
-msgid "Create a new group"
-msgstr "Opprett ei ny gruppe"
-
 #: actions/groupunblock.php:91
 msgid "Only an admin can unblock group members."
 msgstr ""
@@ -1729,7 +1729,7 @@ msgstr "Personleg melding"
 msgid "Optionally add a personal message to the invitation."
 msgstr "Eventuelt legg til ei personleg melding til invitasjonen."
 
-#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:222
 msgid "Send"
 msgstr "Send"
 
@@ -1830,57 +1830,57 @@ msgstr "Kunne ikkje fjerne %s fra %s gruppa "
 msgid "%s left group %s"
 msgstr "%s forlot %s gruppa"
 
-#: actions/login.php:82 actions/register.php:137
+#: actions/login.php:83 actions/register.php:137
 msgid "Already logged in."
 msgstr "Allereie logga inn."
 
-#: actions/login.php:113 actions/login.php:123
+#: actions/login.php:114 actions/login.php:124
 #, fuzzy
 msgid "Invalid or expired token."
 msgstr "Ugyldig notisinnhald"
 
-#: actions/login.php:146
+#: actions/login.php:147
 msgid "Incorrect username or password."
 msgstr "Feil brukarnamn eller passord"
 
-#: actions/login.php:152
+#: actions/login.php:153
 #, fuzzy
 msgid "Error setting user. You are probably not authorized."
 msgstr "Ikkje autorisert."
 
-#: actions/login.php:207 actions/login.php:260 lib/action.php:458
+#: actions/login.php:208 actions/login.php:261 lib/action.php:458
 #: lib/logingroupnav.php:79
 msgid "Login"
 msgstr "Logg inn"
 
-#: actions/login.php:246
+#: actions/login.php:247
 msgid "Login to site"
 msgstr "Logg inn "
 
-#: actions/login.php:249 actions/profilesettings.php:106
+#: actions/login.php:250 actions/profilesettings.php:106
 #: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
 #: lib/groupeditform.php:152 lib/userprofile.php:131
 msgid "Nickname"
 msgstr "Kallenamn"
 
-#: actions/login.php:252 actions/register.php:428
+#: actions/login.php:253 actions/register.php:428
 #: lib/accountsettingsaction.php:116
 msgid "Password"
 msgstr "Passord"
 
-#: actions/login.php:255 actions/register.php:477
+#: actions/login.php:256 actions/register.php:477
 msgid "Remember me"
 msgstr "Hugs meg"
 
-#: actions/login.php:256 actions/register.php:479
+#: actions/login.php:257 actions/register.php:479
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Logg inn automatisk i framtidi (ikkje for delte maskiner)."
 
-#: actions/login.php:266
+#: actions/login.php:267
 msgid "Lost or forgotten password?"
 msgstr "Mista eller gløymd passord?"
 
-#: actions/login.php:285
+#: actions/login.php:286
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -1888,7 +1888,7 @@ msgstr ""
 "Skriv inn brukarnam og passord før du endrar innstillingar (av "
 "tryggleiksomsyn)."
 
-#: actions/login.php:289
+#: actions/login.php:290
 #, fuzzy, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -1963,7 +1963,7 @@ msgstr "Melding"
 msgid "Direct message to %s sent"
 msgstr "Direkte melding til %s sendt"
 
-#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:242 lib/channel.php:170
 msgid "Ajax Error"
 msgstr "Ajax feil"
 
@@ -1971,7 +1971,7 @@ msgstr "Ajax feil"
 msgid "New notice"
 msgstr "Ny notis"
 
-#: actions/newnotice.php:206
+#: actions/newnotice.php:208
 msgid "Notice posted"
 msgstr "Melding lagra"
 
@@ -2050,8 +2050,8 @@ msgstr "Kopla til"
 msgid "Only "
 msgstr ""
 
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996
-#: lib/api.php:1024 lib/api.php:1134
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011
+#: lib/api.php:1039 lib/api.php:1149
 msgid "Not a supported data format."
 msgstr "Ikkje eit støtta dataformat."
 
@@ -3610,6 +3610,26 @@ msgstr "Jabber"
 msgid "SMS"
 msgstr "SMS"
 
+#: actions/tag.php:68
+#, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr "Notisar merka med %s, side %d"
+
+#: actions/tag.php:86
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "Notisstraum for %s"
+
+#: actions/tag.php:92
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "Notisstraum for %s"
+
+#: actions/tag.php:98
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "Notisstraum for %s"
+
 #: actions/tagother.php:33
 msgid "Not logged in"
 msgstr "Ikkje logga inn"
@@ -3660,26 +3680,6 @@ msgstr ""
 "Bruk dette skjemaet for å leggje til emneord til dei som tingar notisar frå "
 "deg, eller som du tingar notisar frå."
 
-#: actions/tag.php:68
-#, php-format
-msgid "Notices tagged with %s, page %d"
-msgstr "Notisar merka med %s, side %d"
-
-#: actions/tag.php:86
-#, fuzzy, php-format
-msgid "Notice feed for tag %s (RSS 1.0)"
-msgstr "Notisstraum for %s"
-
-#: actions/tag.php:92
-#, fuzzy, php-format
-msgid "Notice feed for tag %s (RSS 2.0)"
-msgstr "Notisstraum for %s"
-
-#: actions/tag.php:98
-#, fuzzy, php-format
-msgid "Notice feed for tag %s (Atom)"
-msgstr "Notisstraum for %s"
-
 #: actions/tagrss.php:35
 msgid "No such tag."
 msgstr "Dette emneord finst ikkje."
@@ -3992,22 +3992,22 @@ msgstr "Kunne ikkje oppdatere melding med ny URI."
 msgid "DB error inserting hashtag: %s"
 msgstr "databasefeil ved innsetjing av skigardmerkelapp (#merkelapp): %s"
 
-#: classes/Notice.php:179
+#: classes/Notice.php:188
 #, fuzzy
 msgid "Problem saving notice. Too long."
 msgstr "Eit problem oppstod ved lagring av notis."
 
-#: classes/Notice.php:183
+#: classes/Notice.php:192
 msgid "Problem saving notice. Unknown user."
 msgstr "Feil ved lagring av notis.  Ukjend brukar."
 
-#: classes/Notice.php:188
+#: classes/Notice.php:197
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 "For mange notisar for raskt; tek ei pause, og prøv igjen om eit par minutt."
 
-#: classes/Notice.php:194
+#: classes/Notice.php:203
 #, fuzzy
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
@@ -4015,19 +4015,24 @@ msgid ""
 msgstr ""
 "For mange notisar for raskt; tek ei pause, og prøv igjen om eit par minutt."
 
-#: classes/Notice.php:200
+#: classes/Notice.php:209
 msgid "You are banned from posting notices on this site."
 msgstr "Du kan ikkje lengre legge inn notisar på denne sida."
 
-#: classes/Notice.php:265 classes/Notice.php:290
+#: classes/Notice.php:274 classes/Notice.php:299
 msgid "Problem saving notice."
 msgstr "Eit problem oppstod ved lagring av notis."
 
-#: classes/Notice.php:1124
+#: classes/Notice.php:1115
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Databasefeil, kan ikkje lagra svar: %s"
 
+#: classes/User.php:347
+#, fuzzy, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr "Melding til %1$s på %2$s"
+
 #: classes/User_group.php:380
 msgid "Could not create group."
 msgstr "Kunne ikkje laga gruppa."
@@ -4036,11 +4041,6 @@ msgstr "Kunne ikkje laga gruppa."
 msgid "Could not set group membership."
 msgstr "Kunne ikkje bli med i gruppa."
 
-#: classes/User.php:347
-#, fuzzy, php-format
-msgid "Welcome to %1$s, @%2$s!"
-msgstr "Melding til %1$s på %2$s"
-
 #: lib/accountsettingsaction.php:108
 msgid "Change your profile settings"
 msgstr "Endra profilinnstillingane dine"
@@ -4355,7 +4355,7 @@ msgstr ""
 msgid "Notice with that id does not exist"
 msgstr ""
 
-#: lib/command.php:168 lib/command.php:416 lib/command.php:471
+#: lib/command.php:168 lib/command.php:416 lib/command.php:472
 msgid "User has no last notice"
 msgstr "Brukaren har ikkje siste notis"
 
@@ -4402,102 +4402,102 @@ msgstr "Ein feil oppstod ved sending av direkte melding."
 msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr "Melding for lang - maksimum 140 teikn, du skreiv %d"
 
-#: lib/command.php:439
+#: lib/command.php:440
 #, fuzzy, php-format
 msgid "Reply to %s sent"
 msgstr "Svar på denne notisen"
 
-#: lib/command.php:441
+#: lib/command.php:442
 #, fuzzy
 msgid "Error saving notice."
 msgstr "Eit problem oppstod ved lagring av notis."
 
-#: lib/command.php:495
+#: lib/command.php:496
 msgid "Specify the name of the user to subscribe to"
 msgstr "Spesifer namnet til brukaren du vil tinge"
 
-#: lib/command.php:502
+#: lib/command.php:503
 #, php-format
 msgid "Subscribed to %s"
 msgstr "Tingar %s"
 
-#: lib/command.php:523
+#: lib/command.php:524
 msgid "Specify the name of the user to unsubscribe from"
 msgstr "Spesifer namnet til brukar du vil fjerne tinging på"
 
-#: lib/command.php:530
+#: lib/command.php:531
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr "Tingar ikkje %s lengre"
 
-#: lib/command.php:548 lib/command.php:571
+#: lib/command.php:549 lib/command.php:572
 msgid "Command not yet implemented."
 msgstr "Kommando ikkje implementert."
 
-#: lib/command.php:551
+#: lib/command.php:552
 msgid "Notification off."
 msgstr "Notifikasjon av."
 
-#: lib/command.php:553
+#: lib/command.php:554
 msgid "Can't turn off notification."
 msgstr "Kan ikkje skru av notifikasjon."
 
-#: lib/command.php:574
+#: lib/command.php:575
 msgid "Notification on."
 msgstr "Notifikasjon på."
 
-#: lib/command.php:576
+#: lib/command.php:577
 msgid "Can't turn on notification."
 msgstr "Kan ikkje slå på notifikasjon."
 
-#: lib/command.php:588
+#: lib/command.php:590
 msgid "Login command is disabled"
 msgstr ""
 
-#: lib/command.php:602
+#: lib/command.php:604
 #, fuzzy, php-format
 msgid "Could not create login token for %s"
 msgstr "Kunne ikkje lagre favoritt."
 
-#: lib/command.php:607
+#: lib/command.php:609
 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:623
+#: lib/command.php:625
 #, fuzzy
 msgid "You are not subscribed to anyone."
 msgstr "Du tingar ikkje oppdateringar til den profilen."
 
-#: lib/command.php:625
+#: lib/command.php:627
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Du tingar allereie oppdatering frå desse brukarane:"
 msgstr[1] "Du tingar allereie oppdatering frå desse brukarane:"
 
-#: lib/command.php:645
+#: lib/command.php:647
 #, fuzzy
 msgid "No one is subscribed to you."
 msgstr "Kan ikkje tinga andre til deg."
 
-#: lib/command.php:647
+#: lib/command.php:649
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Kan ikkje tinga andre til deg."
 msgstr[1] "Kan ikkje tinga andre til deg."
 
-#: lib/command.php:667
+#: lib/command.php:669
 #, fuzzy
 msgid "You are not a member of any groups."
 msgstr "Du er ikkje medlem av den gruppa."
 
-#: lib/command.php:669
+#: lib/command.php:671
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Du er ikkje medlem av den gruppa."
 msgstr[1] "Du er ikkje medlem av den gruppa."
 
-#: lib/command.php:683
+#: lib/command.php:685
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -4597,10 +4597,6 @@ msgstr "Favoriser denne notisen"
 msgid "Favor"
 msgstr "Tjeneste"
 
-#: lib/feedlist.php:64
-msgid "Export data"
-msgstr "Eksporter data"
-
 #: lib/feed.php:85
 msgid "RSS 1.0"
 msgstr ""
@@ -4617,6 +4613,10 @@ msgstr ""
 msgid "FOAF"
 msgstr ""
 
+#: lib/feedlist.php:64
+msgid "Export data"
+msgstr "Eksporter data"
+
 #: lib/galleryaction.php:121
 msgid "Filter tags"
 msgstr "Filtrer emneord"
@@ -4778,21 +4778,6 @@ msgstr "Log inn med brukarnamn og passord."
 msgid "Sign up for a new account"
 msgstr "Opprett ny konto"
 
-#: lib/mailbox.php:89
-msgid "Only the user can read their own mailboxes."
-msgstr "Kun brukaren kan lese sine eigne meldingar."
-
-#: lib/mailbox.php:139
-msgid ""
-"You have no private messages. You can send private message to engage other "
-"users in conversation. People can send you messages for your eyes only."
-msgstr ""
-
-#: lib/mailbox.php:227 lib/noticelist.php:452
-#, fuzzy
-msgid "from"
-msgstr " frå "
-
 #: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Stadfesting av epostadresse"
@@ -4984,6 +4969,21 @@ msgid ""
 "\n"
 msgstr ""
 
+#: lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
+msgstr "Kun brukaren kan lese sine eigne meldingar."
+
+#: lib/mailbox.php:139
+msgid ""
+"You have no private messages. You can send private message to engage other "
+"users in conversation. People can send you messages for your eyes only."
+msgstr ""
+
+#: lib/mailbox.php:227 lib/noticelist.php:452
+#, fuzzy
+msgid "from"
+msgstr " frå "
+
 #: lib/mediafile.php:98 lib/mediafile.php:123
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
@@ -5044,7 +5044,7 @@ msgstr "Send ei direkte melding"
 msgid "To"
 msgstr "Til"
 
-#: lib/messageform.php:161 lib/noticeform.php:185
+#: lib/messageform.php:159 lib/noticeform.php:183
 msgid "Available characters"
 msgstr "Tilgjenglege teikn"
 
@@ -5057,11 +5057,11 @@ msgstr "Send ei melding"
 msgid "What's up, %s?"
 msgstr "Kva skjer, %s?"
 
-#: lib/noticeform.php:192
+#: lib/noticeform.php:190
 msgid "Attach"
 msgstr ""
 
-#: lib/noticeform.php:196
+#: lib/noticeform.php:194
 msgid "Attach a file"
 msgstr ""
 
@@ -5133,12 +5133,12 @@ msgstr "Feil med å henta inn ekstern profil"
 msgid "Duplicate notice"
 msgstr "Slett notis"
 
-#: lib/oauthstore.php:467 lib/subs.php:48
+#: lib/oauthstore.php:466 lib/subs.php:48
 #, fuzzy
 msgid "You have been banned from subscribing."
 msgstr "Brukaren tillet deg ikkje å tinga meldingane sine."
 
-#: lib/oauthstore.php:492
+#: lib/oauthstore.php:491
 msgid "Couldn't insert new subscription."
 msgstr "Kan ikkje leggja til ny tinging."
 
@@ -5306,20 +5306,6 @@ msgstr "Mennesker som tingar %s"
 msgid "Groups %s is a member of"
 msgstr "Grupper %s er medlem av"
 
-#: 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/subscriptionlist.php:126
-msgid "(none)"
-msgstr "(ingen)"
-
 #: lib/subs.php:52
 msgid "Already subscribed!"
 msgstr ""
@@ -5350,6 +5336,20 @@ msgstr "Kan ikkje sletta tinging."
 msgid "Couldn't delete subscription."
 msgstr "Kan ikkje sletta tinging."
 
+#: 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/subscriptionlist.php:126
+msgid "(none)"
+msgstr "(ingen)"
+
 #: lib/tagcloudsection.php:56
 msgid "None"
 msgstr "Ingen"
diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po
index c8363f2a38..9fbafcb0a2 100644
--- a/locale/pl/LC_MESSAGES/statusnet.po
+++ b/locale/pl/LC_MESSAGES/statusnet.po
@@ -1,5 +1,6 @@
 # Translation of StatusNet to Polish
 #
+# Author@translatewiki.net: McDutchie
 # Author@translatewiki.net: Raven
 # --
 # Paweł Wilk <siefca@gnu.org>, 2008.
@@ -9,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 21:25+0000\n"
-"PO-Revision-Date: 2009-12-07 21:27:09+0000\n"
+"POT-Creation-Date: 2009-12-12 17:09+0000\n"
+"PO-Revision-Date: 2009-12-12 17:10:15+0000\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,7 +19,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
-"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n"
+"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pl\n"
 "X-Message-Group: out-statusnet\n"
@@ -30,11 +31,11 @@ msgstr "Nie ma takiej strony"
 
 #: actions/all.php:74 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofile.php:105
 #: actions/apiaccountupdateprofilebackgroundimage.php:116
-#: actions/apiaccountupdateprofileimage.php:105
-#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
-#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
-#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
+#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90
 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
@@ -47,7 +48,7 @@ msgstr "Nie ma takiej strony"
 #: actions/repliesrss.php:38 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38
 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
-#: lib/command.php:364 lib/command.php:411 lib/command.php:466
+#: lib/command.php:364 lib/command.php:411 lib/command.php:467
 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
 #: lib/subs.php:34 lib/subs.php:116
 msgid "No such user."
@@ -59,7 +60,7 @@ msgid "%s and friends, page %d"
 msgstr "Użytkownik %s i przyjaciele, strona %d"
 
 #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
-#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100
+#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "Użytkownik %s i przyjaciele"
@@ -119,24 +120,24 @@ msgstr ""
 msgid "You and friends"
 msgstr "Ty i przyjaciele"
 
-#: actions/allrss.php:119 actions/apitimelinefriends.php:121
+#: actions/allrss.php:119 actions/apitimelinefriends.php:122
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Aktualizacje z %1$s i przyjaciół na %2$s."
 
 #: actions/apiaccountratelimitstatus.php:70
 #: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofile.php:97
 #: actions/apiaccountupdateprofilebackgroundimage.php:94
 #: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apiaccountupdateprofile.php:97
 msgid "API method not found."
 msgstr "Nie odnaleziono metody API."
 
 #: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofile.php:89
 #: actions/apiaccountupdateprofilebackgroundimage.php:86
 #: actions/apiaccountupdateprofilecolors.php:110
-#: actions/apiaccountupdateprofileimage.php:84
-#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
+#: actions/apiaccountupdateprofileimage.php:84 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
@@ -156,9 +157,22 @@ msgstr ""
 msgid "Could not update user."
 msgstr "Nie można zaktualizować użytkownika."
 
+#: actions/apiaccountupdateprofile.php:112
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+msgid "User has no profile."
+msgstr "Użytkownik nie posiada profilu."
+
+#: actions/apiaccountupdateprofile.php:147
+msgid "Could not save profile."
+msgstr "Nie można zapisać profilu."
+
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257
 #: actions/designadminpanel.php:122 actions/newnotice.php:94
 #: lib/designsettings.php:283
 #, php-format
@@ -181,21 +195,7 @@ msgstr "Nie można zapisać ustawień wyglądu."
 msgid "Could not update your design."
 msgstr "Nie można zaktualizować wyglądu."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
-#: actions/apiaccountupdateprofileimage.php:130
-#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
-#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
-msgid "User has no profile."
-msgstr "Użytkownik nie posiada profilu."
-
-#: actions/apiaccountupdateprofile.php:147
-msgid "Could not save profile."
-msgstr "Nie można zapisać profilu."
-
 #: actions/apiblockcreate.php:105
-#, fuzzy
 msgid "You cannot block yourself!"
 msgstr "Nie można zablokować siebie."
 
@@ -207,25 +207,6 @@ msgstr "Zablokowanie użytkownika nie powiodło się."
 msgid "Unblock user failed."
 msgstr "Odblokowanie użytkownika nie powiodło się."
 
-#: actions/apidirectmessagenew.php:126
-msgid "No message text!"
-msgstr "Brak tekstu wiadomości."
-
-#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
-#, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr "Wiadomość jest za długa. Maksymalna długość wynosi %d znaków."
-
-#: actions/apidirectmessagenew.php:146
-msgid "Recipient user not found."
-msgstr "Nie odnaleziono odbiorcy."
-
-#: actions/apidirectmessagenew.php:150
-msgid "Can't send direct messages to users who aren't your friend."
-msgstr ""
-"Nie można wysłać bezpośredniej wiadomości do użytkowników, którzy nie są "
-"twoimi przyjaciółmi."
-
 #: actions/apidirectmessage.php:89
 #, php-format
 msgid "Direct messages from %s"
@@ -251,18 +232,37 @@ msgstr "Wszystkie bezpośrednie wiadomości wysłane do użytkownika %s"
 #: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
-#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
-#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149
-#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
-#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156
+#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151
+#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141
+#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
 msgid "API method not found!"
 msgstr "Nie odnaleziono metody API."
 
+#: actions/apidirectmessagenew.php:126
+msgid "No message text!"
+msgstr "Brak tekstu wiadomości."
+
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "Wiadomość jest za długa. Maksymalna długość wynosi %d znaków."
+
+#: actions/apidirectmessagenew.php:146
+msgid "Recipient user not found."
+msgstr "Nie odnaleziono odbiorcy."
+
+#: actions/apidirectmessagenew.php:150
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr ""
+"Nie można wysłać bezpośredniej wiadomości do użytkowników, którzy nie są "
+"twoimi przyjaciółmi."
+
 #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
 #: actions/apistatusesdestroy.php:113
 msgid "No status found with that ID."
@@ -406,16 +406,6 @@ msgstr "Nie jesteś członkiem tej grupy."
 msgid "Could not remove user %s to group %s."
 msgstr "Nie można usunąć użytkownika %s z grupy %s."
 
-#: actions/apigrouplistall.php:90 actions/usergroups.php:62
-#, php-format
-msgid "%s groups"
-msgstr "Grupy %s"
-
-#: actions/apigrouplistall.php:94
-#, php-format
-msgid "groups on %s"
-msgstr "grupy na %s"
-
 #: actions/apigrouplist.php:95
 #, php-format
 msgid "%s's groups"
@@ -426,6 +416,16 @@ msgstr "Grupy użytkownika %s"
 msgid "Groups %s is a member of on %s."
 msgstr "Grupy %s są członkiem na %s."
 
+#: actions/apigrouplistall.php:90 actions/usergroups.php:62
+#, php-format
+msgid "%s groups"
+msgstr "Grupy %s"
+
+#: actions/apigrouplistall.php:94
+#, php-format
+msgid "groups on %s"
+msgstr "grupy na %s"
+
 #: actions/apistatusesdestroy.php:107
 msgid "This method requires a POST or DELETE."
 msgstr "Ta metoda wymaga POST lub DELETE."
@@ -461,54 +461,54 @@ msgstr "Maksymalny rozmiar wpisu wynosi %d znaków, w tym adres URL załącznika
 msgid "Unsupported format."
 msgstr "Nieobsługiwany format."
 
-#: actions/apitimelinefavorites.php:107
+#: actions/apitimelinefavorites.php:108
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr "%s/ulubione wpisy od %s"
 
-#: actions/apitimelinefavorites.php:119
+#: actions/apitimelinefavorites.php:120
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr "Użytkownik %s aktualizuje ulubione według %s/%s."
 
-#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117
+#: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118
 #: actions/grouprss.php:131 actions/userrss.php:90
 #, php-format
 msgid "%s timeline"
 msgstr "Oś czasu użytkownika %s"
 
-#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125
+#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
 #: actions/userrss.php:92
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Aktualizacje z %1$s na %2$s."
 
-#: actions/apitimelinementions.php:116
+#: actions/apitimelinementions.php:117
 #, php-format
 msgid "%1$s / Updates mentioning %2$s"
 msgstr "%1$s/aktualizacje wspominające %2$s"
 
-#: actions/apitimelinementions.php:126
+#: actions/apitimelinementions.php:127
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s aktualizuje tę odpowiedź na aktualizacje od %2$s/%3$s."
 
-#: actions/apitimelinepublic.php:106 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "Publiczna oś czasu użytkownika %s"
 
-#: actions/apitimelinepublic.php:110 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "Użytkownik %s aktualizuje od każdego."
 
-#: actions/apitimelinetag.php:101 actions/tag.php:66
+#: actions/apitimelinetag.php:102 actions/tag.php:66
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Wpisy ze znacznikiem %s"
 
-#: actions/apitimelinetag.php:107 actions/tagrss.php:64
+#: actions/apitimelinetag.php:108 actions/tagrss.php:64
 #, php-format
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Aktualizacje ze znacznikiem %1$s na %2$s."
@@ -543,45 +543,45 @@ msgstr "Awatar"
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr "Można wysłać osobisty awatar. Maksymalny rozmiar pliku to %s."
 
-#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:185
 #: actions/grouplogo.php:178 actions/remotesubscribe.php:191
 #: actions/userauthorization.php:72 actions/userrss.php:103
 msgid "User without matching profile"
 msgstr "Użytkownik bez odpowiadającego profilu"
 
-#: actions/avatarsettings.php:119 actions/avatarsettings.php:194
+#: actions/avatarsettings.php:119 actions/avatarsettings.php:197
 #: actions/grouplogo.php:251
 msgid "Avatar settings"
 msgstr "Ustawienia awatara"
 
-#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/avatarsettings.php:127 actions/avatarsettings.php:205
 #: actions/grouplogo.php:199 actions/grouplogo.php:259
 msgid "Original"
 msgstr "Oryginał"
 
-#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/avatarsettings.php:142 actions/avatarsettings.php:217
 #: actions/grouplogo.php:210 actions/grouplogo.php:271
 msgid "Preview"
 msgstr "Podgląd"
 
-#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
+#: actions/avatarsettings.php:149 lib/deleteuserform.php:66
 #: lib/noticelist.php:550
 msgid "Delete"
 msgstr "Usuń"
 
-#: actions/avatarsettings.php:165 actions/grouplogo.php:233
+#: actions/avatarsettings.php:166 actions/grouplogo.php:233
 msgid "Upload"
 msgstr "Wyślij"
 
-#: actions/avatarsettings.php:228 actions/grouplogo.php:286
+#: actions/avatarsettings.php:231 actions/grouplogo.php:286
 msgid "Crop"
 msgstr "Przytnij"
 
-#: actions/avatarsettings.php:265 actions/disfavor.php:74
+#: actions/avatarsettings.php:268 actions/disfavor.php:74
 #: actions/emailsettings.php:238 actions/favor.php:75
 #: actions/groupblock.php:66 actions/grouplogo.php:309
 #: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -592,73 +592,33 @@ msgstr "Przytnij"
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Wystąpił problem z tokenem sesji. Spróbuj ponownie."
 
-#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
+#: actions/avatarsettings.php:281 actions/designadminpanel.php:103
 #: actions/emailsettings.php:256 actions/grouplogo.php:319
 #: actions/imsettings.php:220 actions/recoverpassword.php:44
 #: actions/smssettings.php:248 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "Nieoczekiwane wysłanie formularza."
 
-#: actions/avatarsettings.php:322
+#: actions/avatarsettings.php:328
 msgid "Pick a square area of the image to be your avatar"
 msgstr "Wybierz kwadratowy obszar obrazu do awatara"
 
-#: actions/avatarsettings.php:337 actions/grouplogo.php:377
+#: actions/avatarsettings.php:343 actions/grouplogo.php:377
 msgid "Lost our file data."
 msgstr "Utracono dane pliku."
 
-#: actions/avatarsettings.php:360
+#: actions/avatarsettings.php:366
 msgid "Avatar updated."
 msgstr "Zaktualizowano awatar."
 
-#: actions/avatarsettings.php:363
+#: actions/avatarsettings.php:369
 msgid "Failed updating avatar."
 msgstr "Zaktualizowanie awatara nie powiodło się."
 
-#: actions/avatarsettings.php:387
+#: actions/avatarsettings.php:393
 msgid "Avatar deleted."
 msgstr "Usunięto awatar."
 
-#: actions/blockedfromgroup.php:73 actions/editgroup.php:84
-#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
-#: actions/groupmembers.php:76 actions/grouprss.php:91
-#: actions/joingroup.php:76 actions/showgroup.php:121
-msgid "No nickname"
-msgstr "Brak pseudonimu"
-
-#: actions/blockedfromgroup.php:80 actions/editgroup.php:96
-#: actions/groupbyid.php:83 actions/groupdesignsettings.php:97
-#: actions/grouplogo.php:99 actions/groupmembers.php:83
-#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
-msgid "No such group"
-msgstr "Nie ma takiej grupy"
-
-#: actions/blockedfromgroup.php:90
-#, php-format
-msgid "%s blocked profiles"
-msgstr "%s zablokowane profile"
-
-#: actions/blockedfromgroup.php:93
-#, php-format
-msgid "%s blocked profiles, page %d"
-msgstr "%s zablokowane profile, strona %d"
-
-#: actions/blockedfromgroup.php:108
-msgid "A list of the users blocked from joining this group."
-msgstr "Lista użytkowników zablokowanych w tej grupie."
-
-#: actions/blockedfromgroup.php:281
-msgid "Unblock user from group"
-msgstr "Odblokuj użytkownika w tej grupie"
-
-#: actions/blockedfromgroup.php:313 lib/unblockform.php:69
-msgid "Unblock"
-msgstr "Odblokuj"
-
-#: actions/blockedfromgroup.php:313 lib/unblockform.php:80
-msgid "Unblock this user"
-msgstr "Odblokuj tego użytkownika"
-
 #: actions/block.php:69
 msgid "You already blocked that user."
 msgstr "Użytkownik jest już zablokowany."
@@ -699,6 +659,46 @@ msgstr "Zablokuj tego użytkownika"
 msgid "Failed to save block information."
 msgstr "Zapisanie informacji o blokadzie nie powiodło się."
 
+#: actions/blockedfromgroup.php:73 actions/editgroup.php:84
+#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
+#: actions/groupmembers.php:76 actions/grouprss.php:91
+#: actions/joingroup.php:76 actions/showgroup.php:121
+msgid "No nickname"
+msgstr "Brak pseudonimu"
+
+#: actions/blockedfromgroup.php:80 actions/editgroup.php:96
+#: actions/groupbyid.php:83 actions/groupdesignsettings.php:97
+#: actions/grouplogo.php:99 actions/groupmembers.php:83
+#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
+msgid "No such group"
+msgstr "Nie ma takiej grupy"
+
+#: actions/blockedfromgroup.php:90
+#, php-format
+msgid "%s blocked profiles"
+msgstr "%s zablokowane profile"
+
+#: actions/blockedfromgroup.php:93
+#, php-format
+msgid "%s blocked profiles, page %d"
+msgstr "%s zablokowane profile, strona %d"
+
+#: actions/blockedfromgroup.php:108
+msgid "A list of the users blocked from joining this group."
+msgstr "Lista użytkowników zablokowanych w tej grupie."
+
+#: actions/blockedfromgroup.php:281
+msgid "Unblock user from group"
+msgstr "Odblokuj użytkownika w tej grupie"
+
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:69
+msgid "Unblock"
+msgstr "Odblokuj"
+
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:80
+msgid "Unblock this user"
+msgstr "Odblokuj tego użytkownika"
+
 #: actions/bookmarklet.php:50
 msgid "Post to "
 msgstr "Wyślij do "
@@ -1031,7 +1031,7 @@ msgstr "Adres e-mail"
 
 #: actions/emailsettings.php:123
 msgid "Email address, like \"UserName@example.org\""
-msgstr "Adres e-mail, taki jak \"NazwaUżytkownika@przykład.org\""
+msgstr "Adres e-mail, taki jak \"NazwaUżytkownika@example.org\""
 
 #: actions/emailsettings.php:126 actions/imsettings.php:133
 #: actions/smssettings.php:145
@@ -1166,6 +1166,14 @@ msgstr "Usunięto przychodzący adres e-mail."
 msgid "New incoming email address added."
 msgstr "Dodano nowy przychodzący adres e-mail."
 
+#: actions/favor.php:79
+msgid "This notice is already a favorite!"
+msgstr "Ten wpis jest już ulubiony."
+
+#: actions/favor.php:92 lib/disfavorform.php:140
+msgid "Disfavor favorite"
+msgstr "Usuń wpis z ulubionych"
+
 #: actions/favorited.php:65 lib/popularnoticesection.php:88
 #: lib/publicgroupnav.php:93
 msgid "Popular notices"
@@ -1214,14 +1222,6 @@ msgstr "Ulubione wpisy użytkownika %s"
 msgid "Updates favored by %1$s on %2$s!"
 msgstr "Aktualizacje ulubione przez użytkownika %1$s na %2$s."
 
-#: actions/favor.php:79
-msgid "This notice is already a favorite!"
-msgstr "Ten wpis jest już ulubiony."
-
-#: actions/favor.php:92 lib/disfavorform.php:140
-msgid "Disfavor favorite"
-msgstr "Usuń wpis z ulubionych"
-
 #: actions/featured.php:69 lib/featureduserssection.php:87
 #: lib/publicgroupnav.php:89
 msgid "Featured users"
@@ -1449,6 +1449,35 @@ msgstr "Uczyń tego użytkownika administratorem"
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "Aktualizacje od członków %1$s na %2$s."
 
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+msgid "Groups"
+msgstr "Grupy"
+
+#: actions/groups.php:64
+#, php-format
+msgid "Groups, page %d"
+msgstr "Grupy, strona %d"
+
+#: actions/groups.php:90
+#, php-format
+msgid ""
+"%%%%site.name%%%% groups let you find and talk with people of similar "
+"interests. After you join a group you can send messages to all other members "
+"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
+"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
+"%%%%)"
+msgstr ""
+"Grupy %%%%site.name%%%% umożliwiają odnalezienie i rozmawianie z osobami o "
+"podobnych zainteresowaniach. Po dołączeniu do grupy można wysyłać wiadomości "
+"do wszystkich członków używając składni \"!nazwagrupy\". Nie widzisz grupy, "
+"która cię interesuje? Spróbuj ją [znaleźć](%%%%action.groupsearch%%%%) lub "
+"[założyć własną.](%%%%action.newgroup%%%%)"
+
+#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
+msgid "Create a new group"
+msgstr "Utwórz nową grupę"
+
 #: actions/groupsearch.php:52
 #, php-format
 msgid ""
@@ -1485,35 +1514,6 @@ msgstr ""
 "Dlaczego nie [zarejestrujesz konta](%%action.register%%) i sam [utworzysz "
 "grupę](%%action.newgroup%%)."
 
-#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
-msgid "Groups"
-msgstr "Grupy"
-
-#: actions/groups.php:64
-#, php-format
-msgid "Groups, page %d"
-msgstr "Grupy, strona %d"
-
-#: actions/groups.php:90
-#, php-format
-msgid ""
-"%%%%site.name%%%% groups let you find and talk with people of similar "
-"interests. After you join a group you can send messages to all other members "
-"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
-"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
-"%%%%)"
-msgstr ""
-"Grupy %%%%site.name%%%% umożliwiają odnalezienie i rozmawianie z osobami o "
-"podobnych zainteresowaniach. Po dołączeniu do grupy można wysyłać wiadomości "
-"do wszystkich członków używając składni \"!nazwagrupy\". Nie widzisz grupy, "
-"która cię interesuje? Spróbuj ją [znaleźć](%%%%action.groupsearch%%%%) lub "
-"[założyć własną.](%%%%action.newgroup%%%%)"
-
-#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
-msgid "Create a new group"
-msgstr "Utwórz nową grupę"
-
 #: actions/groupunblock.php:91
 msgid "Only an admin can unblock group members."
 msgstr "Tylko administrator może odblokowywać członków grupy."
@@ -1708,7 +1708,7 @@ msgstr "Osobista wiadomość"
 msgid "Optionally add a personal message to the invitation."
 msgstr "Opcjonalnie dodaj osobistą wiadomość do zaproszenia."
 
-#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:222
 msgid "Send"
 msgstr "Wyślij"
 
@@ -1814,57 +1814,57 @@ msgstr "Nie można usunąć użytkownika %s z grupy %s"
 msgid "%s left group %s"
 msgstr "Użytkownik %s opuścił grupę %s"
 
-#: actions/login.php:82 actions/register.php:137
+#: actions/login.php:83 actions/register.php:137
 msgid "Already logged in."
 msgstr "Jesteś już zalogowany."
 
-#: actions/login.php:113 actions/login.php:123
+#: actions/login.php:114 actions/login.php:124
 msgid "Invalid or expired token."
 msgstr "Nieprawidłowy lub wygasły token."
 
-#: actions/login.php:146
+#: actions/login.php:147
 msgid "Incorrect username or password."
 msgstr "Niepoprawna nazwa użytkownika lub hasło."
 
-#: actions/login.php:152
+#: actions/login.php:153
 msgid "Error setting user. You are probably not authorized."
 msgstr "Błąd podczas ustawiania użytkownika. Prawdopodobnie brak upoważnienia."
 
-#: actions/login.php:207 actions/login.php:260 lib/action.php:458
+#: actions/login.php:208 actions/login.php:261 lib/action.php:458
 #: lib/logingroupnav.php:79
 msgid "Login"
 msgstr "Zaloguj się"
 
-#: actions/login.php:246
+#: actions/login.php:247
 msgid "Login to site"
 msgstr "Zaloguj się na stronie"
 
-#: actions/login.php:249 actions/profilesettings.php:106
+#: actions/login.php:250 actions/profilesettings.php:106
 #: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
 #: lib/groupeditform.php:152 lib/userprofile.php:131
 msgid "Nickname"
 msgstr "Pseudonim"
 
-#: actions/login.php:252 actions/register.php:428
+#: actions/login.php:253 actions/register.php:428
 #: lib/accountsettingsaction.php:116
 msgid "Password"
 msgstr "Hasło"
 
-#: actions/login.php:255 actions/register.php:477
+#: actions/login.php:256 actions/register.php:477
 msgid "Remember me"
 msgstr "Zapamiętaj mnie"
 
-#: actions/login.php:256 actions/register.php:479
+#: actions/login.php:257 actions/register.php:479
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Automatyczne logowanie. Nie należy używać na komputerach używanych przez "
 "wiele osób."
 
-#: actions/login.php:266
+#: actions/login.php:267
 msgid "Lost or forgotten password?"
 msgstr "Zgubione lub zapomniane hasło?"
 
-#: actions/login.php:285
+#: actions/login.php:286
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -1872,7 +1872,7 @@ msgstr ""
 "Z powodów bezpieczeństwa ponownie podaj nazwę użytkownika i hasło przed "
 "zmienianiem ustawień."
 
-#: actions/login.php:289
+#: actions/login.php:290
 #, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -1943,7 +1943,7 @@ msgstr "Wysłano wiadomość"
 msgid "Direct message to %s sent"
 msgstr "Wysłano bezpośrednią wiadomość do użytkownika %s"
 
-#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:242 lib/channel.php:170
 msgid "Ajax Error"
 msgstr "Błąd AJAX"
 
@@ -1951,7 +1951,7 @@ msgstr "Błąd AJAX"
 msgid "New notice"
 msgstr "Nowy wpis"
 
-#: actions/newnotice.php:206
+#: actions/newnotice.php:208
 msgid "Notice posted"
 msgstr "Wysłano wpis"
 
@@ -2034,8 +2034,8 @@ msgstr "typ zawartości "
 msgid "Only "
 msgstr "Tylko "
 
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996
-#: lib/api.php:1024 lib/api.php:1134
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011
+#: lib/api.php:1039 lib/api.php:1149
 msgid "Not a supported data format."
 msgstr "To nie jest obsługiwany format danych."
 
@@ -2820,7 +2820,6 @@ msgid "Invalid profile URL (bad format)"
 msgstr "Nieprawidłowy adres URL profilu (błędny format)"
 
 #: actions/remotesubscribe.php:168
-#, fuzzy
 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
 msgstr ""
 "Nieprawidłowy adres URL profilu (brak dokumentu YADIS lub określono "
@@ -3618,6 +3617,26 @@ msgstr "Jabber"
 msgid "SMS"
 msgstr "SMS"
 
+#: actions/tag.php:68
+#, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr "Wpisy ze znacznikiem %s, strona %d"
+
+#: actions/tag.php:86
+#, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "Kanał wpisów dla znacznika %s (RSS 1.0)"
+
+#: actions/tag.php:92
+#, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "Kanał wpisów dla znacznika %s (RSS 2.0)"
+
+#: actions/tag.php:98
+#, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "Kanał wpisów dla znacznika %s (Atom)"
+
 #: actions/tagother.php:33
 msgid "Not logged in"
 msgstr "Niezalogowano"
@@ -3667,26 +3686,6 @@ msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 "Użyj tego formularza, aby dodać znaczniki subskrybentom lub subskrypcjom."
 
-#: actions/tag.php:68
-#, php-format
-msgid "Notices tagged with %s, page %d"
-msgstr "Wpisy ze znacznikiem %s, strona %d"
-
-#: actions/tag.php:86
-#, php-format
-msgid "Notice feed for tag %s (RSS 1.0)"
-msgstr "Kanał wpisów dla znacznika %s (RSS 1.0)"
-
-#: actions/tag.php:92
-#, php-format
-msgid "Notice feed for tag %s (RSS 2.0)"
-msgstr "Kanał wpisów dla znacznika %s (RSS 2.0)"
-
-#: actions/tag.php:98
-#, php-format
-msgid "Notice feed for tag %s (Atom)"
-msgstr "Kanał wpisów dla znacznika %s (Atom)"
-
 #: actions/tagrss.php:35
 msgid "No such tag."
 msgstr "Nie ma takiego znacznika."
@@ -3990,22 +3989,22 @@ msgstr "Nie można zaktualizować wiadomości za pomocą nowego adresu URL."
 msgid "DB error inserting hashtag: %s"
 msgstr "Błąd bazy danych podczas wprowadzania znacznika mieszania: %s"
 
-#: classes/Notice.php:179
+#: classes/Notice.php:188
 msgid "Problem saving notice. Too long."
 msgstr "Problem podczas zapisywania wpisu. Za długi."
 
-#: classes/Notice.php:183
+#: classes/Notice.php:192
 msgid "Problem saving notice. Unknown user."
 msgstr "Problem podczas zapisywania wpisu. Nieznany użytkownik."
 
-#: classes/Notice.php:188
+#: classes/Notice.php:197
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 "Za dużo wpisów w za krótkim czasie, weź głęboki oddech i wyślij ponownie za "
 "kilka minut."
 
-#: classes/Notice.php:194
+#: classes/Notice.php:203
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
@@ -4013,19 +4012,24 @@ msgstr ""
 "Za dużo takich samych wiadomości w za krótkim czasie, weź głęboki oddech i "
 "wyślij ponownie za kilka minut."
 
-#: classes/Notice.php:200
+#: classes/Notice.php:209
 msgid "You are banned from posting notices on this site."
 msgstr "Zabroniono ci wysyłania wpisów na tej stronie."
 
-#: classes/Notice.php:265 classes/Notice.php:290
+#: classes/Notice.php:274 classes/Notice.php:299
 msgid "Problem saving notice."
 msgstr "Problem podczas zapisywania wpisu."
 
-#: classes/Notice.php:1124
+#: classes/Notice.php:1115
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Błąd bazy danych podczas wprowadzania odpowiedzi: %s"
 
+#: classes/User.php:347
+#, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr "Witaj w %1$s, @%2$s."
+
 #: classes/User_group.php:380
 msgid "Could not create group."
 msgstr "Nie można utworzyć grupy."
@@ -4034,11 +4038,6 @@ msgstr "Nie można utworzyć grupy."
 msgid "Could not set group membership."
 msgstr "Nie można ustawić członkostwa w grupie."
 
-#: classes/User.php:347
-#, php-format
-msgid "Welcome to %1$s, @%2$s!"
-msgstr "Witaj w %1$s, @%2$s."
-
 #: lib/accountsettingsaction.php:108
 msgid "Change your profile settings"
 msgstr "Zmień ustawienia profilu"
@@ -4343,7 +4342,7 @@ msgstr ""
 msgid "Notice with that id does not exist"
 msgstr "Wpis z tym identyfikatorem nie istnieje"
 
-#: lib/command.php:168 lib/command.php:416 lib/command.php:471
+#: lib/command.php:168 lib/command.php:416 lib/command.php:472
 msgid "User has no last notice"
 msgstr "Użytkownik nie posiada ostatniego wpisu"
 
@@ -4390,102 +4389,103 @@ msgstr "Błąd podczas wysyłania bezpośredniej wiadomości."
 msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr "Wpis jest za długi - maksymalnie %d znaków, wysłano %d"
 
-#: lib/command.php:439
+#: lib/command.php:440
 #, php-format
 msgid "Reply to %s sent"
 msgstr "Wysłano odpowiedź do %s"
 
-#: lib/command.php:441
+#: lib/command.php:442
 msgid "Error saving notice."
 msgstr "Błąd podczas zapisywania wpisu."
 
-#: lib/command.php:495
+#: lib/command.php:496
 msgid "Specify the name of the user to subscribe to"
 msgstr "Podaj nazwę użytkownika do subskrybowania"
 
-#: lib/command.php:502
+#: lib/command.php:503
 #, php-format
 msgid "Subscribed to %s"
 msgstr "Subskrybowano użytkownika %s"
 
-#: lib/command.php:523
+#: lib/command.php:524
 msgid "Specify the name of the user to unsubscribe from"
 msgstr "Podaj nazwę użytkownika do usunięcia subskrypcji"
 
-#: lib/command.php:530
+#: lib/command.php:531
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr "Usunięto subskrypcję użytkownika %s"
 
-#: lib/command.php:548 lib/command.php:571
+#: lib/command.php:549 lib/command.php:572
 msgid "Command not yet implemented."
 msgstr "Nie zaimplementowano polecenia."
 
-#: lib/command.php:551
+#: lib/command.php:552
 msgid "Notification off."
 msgstr "Wyłączono powiadomienia."
 
-#: lib/command.php:553
+#: lib/command.php:554
 msgid "Can't turn off notification."
 msgstr "Nie można wyłączyć powiadomień."
 
-#: lib/command.php:574
+#: lib/command.php:575
 msgid "Notification on."
 msgstr "Włączono powiadomienia."
 
-#: lib/command.php:576
+#: lib/command.php:577
 msgid "Can't turn on notification."
 msgstr "Nie można włączyć powiadomień."
 
-#: lib/command.php:588
+#: lib/command.php:590
 msgid "Login command is disabled"
-msgstr ""
+msgstr "Polecenie logowania jest wyłączone"
 
-#: lib/command.php:602
-#, fuzzy, php-format
+#: lib/command.php:604
+#, php-format
 msgid "Could not create login token for %s"
-msgstr "Nie można utworzyć aliasów."
+msgstr "Nie można utworzyć tokenów loginów dla %s"
 
-#: lib/command.php:607
+#: lib/command.php:609
 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
+"Ten odnośnik można użyć tylko raz i będzie prawidłowy tylko przez dwie "
+"minuty: %s"
 
-#: lib/command.php:623
+#: lib/command.php:625
 msgid "You are not subscribed to anyone."
 msgstr "Nie subskrybujesz nikogo."
 
-#: lib/command.php:625
+#: lib/command.php:627
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Subskrybujesz tę osobę:"
 msgstr[1] "Subskrybujesz te osoby:"
 msgstr[2] "Subskrybujesz te osoby:"
 
-#: lib/command.php:645
+#: lib/command.php:647
 msgid "No one is subscribed to you."
 msgstr "Nikt cię nie subskrybuje."
 
-#: lib/command.php:647
+#: lib/command.php:649
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Ta osoba cię subskrybuje:"
 msgstr[1] "Te osoby cię subskrybują:"
 msgstr[2] "Te osoby cię subskrybują:"
 
-#: lib/command.php:667
+#: lib/command.php:669
 msgid "You are not a member of any groups."
 msgstr "Nie jesteś członkiem żadnej grupy."
 
-#: lib/command.php:669
+#: lib/command.php:671
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Jesteś członkiem tej grupy:"
 msgstr[1] "Jesteś członkiem tych grup:"
 msgstr[2] "Jesteś członkiem tych grup:"
 
-#: lib/command.php:683
-#, fuzzy
+#: lib/command.php:685
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -4541,6 +4541,7 @@ msgstr ""
 "reply #<identyfikator_wpisu> - odpowiada na wpis z podanym identyfikatorem\n"
 "reply <pseudonim> - odpowiada na ostatni wpis użytkownika\n"
 "join <grupa> - dołącza do grupy\n"
+"login - uzyskuje odnośnik do logowania do interfejsu WWW\n"
 "drop <grupa> - opuszcza grupę\n"
 "stats - uzyskuje statystyki\n"
 "stop - to samo co \"off\"\n"
@@ -4616,10 +4617,6 @@ msgstr "Dodaj ten wpis do ulubionych"
 msgid "Favor"
 msgstr "Dodaj do ulubionych"
 
-#: lib/feedlist.php:64
-msgid "Export data"
-msgstr "Wyeksportuj dane"
-
 #: lib/feed.php:85
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
@@ -4636,6 +4633,10 @@ msgstr "Atom"
 msgid "FOAF"
 msgstr "FOAF"
 
+#: lib/feedlist.php:64
+msgid "Export data"
+msgstr "Wyeksportuj dane"
+
 #: lib/galleryaction.php:121
 msgid "Filter tags"
 msgstr "Filtruj znaczniki"
@@ -4798,23 +4799,6 @@ msgstr "Zaloguj się za pomocą nazwy użytkownika i hasła"
 msgid "Sign up for a new account"
 msgstr "Załóż nowe konto"
 
-#: lib/mailbox.php:89
-msgid "Only the user can read their own mailboxes."
-msgstr "Tylko użytkownik może czytać swoje skrzynki pocztowe."
-
-#: 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 ""
-"Brak prywatnych wiadomości. Można wysłać prywatną wiadomość, aby nawiązać "
-"rozmowę z innymi użytkownikami. Inni mogą wysyłać ci wiadomości tylko dla "
-"twoich oczu."
-
-#: lib/mailbox.php:227 lib/noticelist.php:452
-msgid "from"
-msgstr "z"
-
 #: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Potwierdzenie adresu e-mail"
@@ -5077,6 +5061,23 @@ msgstr ""
 "\t%4$s\n"
 "\n"
 
+#: lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
+msgstr "Tylko użytkownik może czytać swoje skrzynki pocztowe."
+
+#: 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 ""
+"Brak prywatnych wiadomości. Można wysłać prywatną wiadomość, aby nawiązać "
+"rozmowę z innymi użytkownikami. Inni mogą wysyłać ci wiadomości tylko dla "
+"twoich oczu."
+
+#: lib/mailbox.php:227 lib/noticelist.php:452
+msgid "from"
+msgstr "z"
+
 #: lib/mediafile.php:98 lib/mediafile.php:123
 msgid "There was a database error while saving your file. Please try again."
 msgstr "Wystąpił błąd bazy danych podczas zapisywania pliku. Spróbuj ponownie."
@@ -5138,7 +5139,7 @@ msgstr "Wyślij bezpośredni wpis"
 msgid "To"
 msgstr "Do"
 
-#: lib/messageform.php:161 lib/noticeform.php:185
+#: lib/messageform.php:159 lib/noticeform.php:183
 msgid "Available characters"
 msgstr "Dostępne znaki"
 
@@ -5151,11 +5152,11 @@ msgstr "Wyślij wpis"
 msgid "What's up, %s?"
 msgstr "Co słychać, %s?"
 
-#: lib/noticeform.php:192
+#: lib/noticeform.php:190
 msgid "Attach"
 msgstr "Załącz"
 
-#: lib/noticeform.php:196
+#: lib/noticeform.php:194
 msgid "Attach a file"
 msgstr "Załącz plik"
 
@@ -5224,11 +5225,11 @@ msgstr "Błąd podczas wprowadzania zdalnego profilu"
 msgid "Duplicate notice"
 msgstr "Duplikat wpisu"
 
-#: lib/oauthstore.php:467 lib/subs.php:48
+#: lib/oauthstore.php:466 lib/subs.php:48
 msgid "You have been banned from subscribing."
 msgstr "Zablokowano subskrybowanie."
 
-#: lib/oauthstore.php:492
+#: lib/oauthstore.php:491
 msgid "Couldn't insert new subscription."
 msgstr "Nie można wprowadzić nowej subskrypcji."
 
@@ -5388,20 +5389,6 @@ msgstr "Osoby subskrybowane do %s"
 msgid "Groups %s is a member of"
 msgstr "Grupy %s są członkiem"
 
-#: lib/subscriberspeopleselftagcloudsection.php:48
-#: lib/subscriptionspeopleselftagcloudsection.php:48
-msgid "People Tagcloud as self-tagged"
-msgstr "Chmura znaczników osób, które same sobie nadały znaczniki"
-
-#: lib/subscriberspeopletagcloudsection.php:48
-#: lib/subscriptionspeopletagcloudsection.php:48
-msgid "People Tagcloud as tagged"
-msgstr "Chmura znaczników osób ze znacznikami"
-
-#: lib/subscriptionlist.php:126
-msgid "(none)"
-msgstr "(brak)"
-
 #: lib/subs.php:52
 msgid "Already subscribed!"
 msgstr "Już subskrybowane."
@@ -5423,7 +5410,6 @@ msgid "Not subscribed!"
 msgstr "Niesubskrybowane."
 
 #: lib/subs.php:133
-#, fuzzy
 msgid "Couldn't delete self-subscription."
 msgstr "Nie można usunąć autosubskrypcji."
 
@@ -5431,6 +5417,20 @@ msgstr "Nie można usunąć autosubskrypcji."
 msgid "Couldn't delete subscription."
 msgstr "Nie można usunąć subskrypcji."
 
+#: lib/subscriberspeopleselftagcloudsection.php:48
+#: lib/subscriptionspeopleselftagcloudsection.php:48
+msgid "People Tagcloud as self-tagged"
+msgstr "Chmura znaczników osób, które same sobie nadały znaczniki"
+
+#: lib/subscriberspeopletagcloudsection.php:48
+#: lib/subscriptionspeopletagcloudsection.php:48
+msgid "People Tagcloud as tagged"
+msgstr "Chmura znaczników osób ze znacznikami"
+
+#: lib/subscriptionlist.php:126
+msgid "(none)"
+msgstr "(brak)"
+
 #: lib/tagcloudsection.php:56
 msgid "None"
 msgstr "Brak"
diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po
index 54cc569f2f..96869a74a7 100644
--- a/locale/pt/LC_MESSAGES/statusnet.po
+++ b/locale/pt/LC_MESSAGES/statusnet.po
@@ -1,6 +1,7 @@
 # Translation of StatusNet to Portuguese
 #
 # Author@translatewiki.net: Hamilton Abreu
+# Author@translatewiki.net: McDutchie
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -8,12 +9,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 21:25+0000\n"
-"PO-Revision-Date: 2009-12-07 21:27:13+0000\n"
+"POT-Creation-Date: 2009-12-12 17:09+0000\n"
+"PO-Revision-Date: 2009-12-12 17:10:18+0000\n"
 "Language-Team: Portuguese\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n"
+"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: out-statusnet\n"
@@ -26,11 +27,11 @@ msgstr "Página não encontrada."
 
 #: actions/all.php:74 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofile.php:105
 #: actions/apiaccountupdateprofilebackgroundimage.php:116
-#: actions/apiaccountupdateprofileimage.php:105
-#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
-#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
-#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
+#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90
 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
@@ -43,7 +44,7 @@ msgstr "Página não encontrada."
 #: actions/repliesrss.php:38 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38
 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
-#: lib/command.php:364 lib/command.php:411 lib/command.php:466
+#: lib/command.php:364 lib/command.php:411 lib/command.php:467
 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
 #: lib/subs.php:34 lib/subs.php:116
 msgid "No such user."
@@ -55,7 +56,7 @@ msgid "%s and friends, page %d"
 msgstr "%s e amigos, página %d"
 
 #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
-#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100
+#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s e amigos"
@@ -63,23 +64,24 @@ msgstr "%s e amigos"
 #: actions/all.php:99
 #, php-format
 msgid "Feed for friends of %s (RSS 1.0)"
-msgstr "''Feed'' para amigos de %s (RSS 1.0)"
+msgstr "Feed para os amigos de %s (RSS 1.0)"
 
 #: actions/all.php:107
 #, php-format
 msgid "Feed for friends of %s (RSS 2.0)"
-msgstr "''Feed'' para amigos de %s (RSS 2.0)"
+msgstr "Feed para os amigos de %s (RSS 2.0)"
 
 #: actions/all.php:115
 #, php-format
 msgid "Feed for friends of %s (Atom)"
-msgstr "''Feed'' para amigos de %s (Atom)"
+msgstr "Feed para os amigos de %s (Atom)"
 
 #: actions/all.php:127
 #, php-format
 msgid ""
 "This is the timeline for %s and friends but no one has posted anything yet."
-msgstr "Esta é a cronolinha de %s e amigos, mas ainda não publicaram nada."
+msgstr ""
+"Estas são as notas de %s e dos amigos, mas ainda não publicaram nenhuma."
 
 #: actions/all.php:132
 #, php-format
@@ -87,7 +89,7 @@ msgid ""
 "Try subscribing to more people, [join a group](%%action.groups%%) or post "
 "something yourself."
 msgstr ""
-"Tente subscrever mais pessoas, [entrar num grupo] (%%action.groups%%) ou "
+"Tente subscrever mais pessoas, [juntar-se a um grupo] (%%action.groups%%) ou "
 "publicar qualquer coisa."
 
 #: actions/all.php:134
@@ -112,24 +114,24 @@ msgstr ""
 msgid "You and friends"
 msgstr "Você e amigos"
 
-#: actions/allrss.php:119 actions/apitimelinefriends.php:121
+#: actions/allrss.php:119 actions/apitimelinefriends.php:122
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Actualizações de %1$s e amigos no %2$s!"
 
 #: actions/apiaccountratelimitstatus.php:70
 #: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofile.php:97
 #: actions/apiaccountupdateprofilebackgroundimage.php:94
 #: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apiaccountupdateprofile.php:97
 msgid "API method not found."
 msgstr "Método da API não encontrado."
 
 #: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofile.php:89
 #: actions/apiaccountupdateprofilebackgroundimage.php:86
 #: actions/apiaccountupdateprofilecolors.php:110
-#: actions/apiaccountupdateprofileimage.php:84
-#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
+#: actions/apiaccountupdateprofileimage.php:84 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
@@ -149,9 +151,22 @@ msgstr ""
 msgid "Could not update user."
 msgstr "Não foi possível actualizar o utilizador."
 
+#: actions/apiaccountupdateprofile.php:112
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+msgid "User has no profile."
+msgstr "Utilizador não tem perfil."
+
+#: actions/apiaccountupdateprofile.php:147
+msgid "Could not save profile."
+msgstr "Não foi possível gravar o perfil."
+
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257
 #: actions/designadminpanel.php:122 actions/newnotice.php:94
 #: lib/designsettings.php:283
 #, php-format
@@ -174,19 +189,6 @@ msgstr "Não foi possível gravar as configurações do design."
 msgid "Could not update your design."
 msgstr "Não foi possível actualizar o seu design."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
-#: actions/apiaccountupdateprofileimage.php:130
-#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
-#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
-msgid "User has no profile."
-msgstr "Utilizador não tem perfil."
-
-#: actions/apiaccountupdateprofile.php:147
-msgid "Could not save profile."
-msgstr "Não foi possível gravar o perfil."
-
 #: actions/apiblockcreate.php:105
 msgid "You cannot block yourself!"
 msgstr "Os utilizadores não podem bloquear-se a si próprios!"
@@ -199,24 +201,6 @@ msgstr "Bloqueio do utilizador falhou."
 msgid "Unblock user failed."
 msgstr "Desbloqueio do utilizador falhou."
 
-#: actions/apidirectmessagenew.php:126
-msgid "No message text!"
-msgstr "Mensagem não tem texto!"
-
-#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
-#, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr "Demasiado longo. Tamanho máx. das mensagens é %d caracteres."
-
-#: actions/apidirectmessagenew.php:146
-msgid "Recipient user not found."
-msgstr "Destinatário não encontrado."
-
-#: actions/apidirectmessagenew.php:150
-msgid "Can't send direct messages to users who aren't your friend."
-msgstr ""
-"Não pode enviar mensagens directas a utilizadores que não sejam amigos."
-
 #: actions/apidirectmessage.php:89
 #, php-format
 msgid "Direct messages from %s"
@@ -242,18 +226,36 @@ msgstr "Todas as mensagens directas enviadas para %s"
 #: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
-#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
-#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149
-#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
-#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156
+#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151
+#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141
+#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
 msgid "API method not found!"
 msgstr "Método da API não encontrado!"
 
+#: actions/apidirectmessagenew.php:126
+msgid "No message text!"
+msgstr "Mensagem não tem texto!"
+
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "Demasiado longo. Tamanho máx. das mensagens é %d caracteres."
+
+#: actions/apidirectmessagenew.php:146
+msgid "Recipient user not found."
+msgstr "Destinatário não encontrado."
+
+#: actions/apidirectmessagenew.php:150
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr ""
+"Não pode enviar mensagens directas a utilizadores que não sejam amigos."
+
 #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
 #: actions/apistatusesdestroy.php:113
 msgid "No status found with that ID."
@@ -397,16 +399,6 @@ msgstr "Não é membro deste grupo."
 msgid "Could not remove user %s to group %s."
 msgstr "Não foi possível remover %s do grupo %s."
 
-#: actions/apigrouplistall.php:90 actions/usergroups.php:62
-#, php-format
-msgid "%s groups"
-msgstr "Grupos de %s"
-
-#: actions/apigrouplistall.php:94
-#, php-format
-msgid "groups on %s"
-msgstr "Grupos em %s"
-
 #: actions/apigrouplist.php:95
 #, php-format
 msgid "%s's groups"
@@ -417,6 +409,16 @@ msgstr "Grupos de %s"
 msgid "Groups %s is a member of on %s."
 msgstr "Grupos de que %s é membro em %s."
 
+#: actions/apigrouplistall.php:90 actions/usergroups.php:62
+#, php-format
+msgid "%s groups"
+msgstr "Grupos de %s"
+
+#: actions/apigrouplistall.php:94
+#, php-format
+msgid "groups on %s"
+msgstr "Grupos em %s"
+
 #: actions/apistatusesdestroy.php:107
 msgid "This method requires a POST or DELETE."
 msgstr "Este método requer um POST ou DELETE."
@@ -452,54 +454,54 @@ msgstr "Tamanho máx. das notas é %d caracteres, incluíndo a URL do anexo."
 msgid "Unsupported format."
 msgstr "Formato não suportado."
 
-#: actions/apitimelinefavorites.php:107
+#: actions/apitimelinefavorites.php:108
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr "%s / Favoritas de %s"
 
-#: actions/apitimelinefavorites.php:119
+#: actions/apitimelinefavorites.php:120
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr "%s actualizações preferidas por %s / %s"
 
-#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117
+#: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118
 #: actions/grouprss.php:131 actions/userrss.php:90
 #, php-format
 msgid "%s timeline"
-msgstr "cronolinha de %s"
+msgstr "Notas de %s"
 
-#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125
+#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
 #: actions/userrss.php:92
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Actualizações de %1#s a %2$s!"
 
-#: actions/apitimelinementions.php:116
+#: actions/apitimelinementions.php:117
 #, php-format
 msgid "%1$s / Updates mentioning %2$s"
 msgstr "%1$s / Actualizações que mencionam %2$s"
 
-#: actions/apitimelinementions.php:126
+#: actions/apitimelinementions.php:127
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s actualizações em resposta a actualizações de %2$s / %3$s."
 
-#: actions/apitimelinepublic.php:106 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
-msgstr "Cronolinha pública de %s"
+msgstr "Notas públicas de %s"
 
-#: actions/apitimelinepublic.php:110 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s actualizações de todos!"
 
-#: actions/apitimelinetag.php:101 actions/tag.php:66
+#: actions/apitimelinetag.php:102 actions/tag.php:66
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Notas categorizadas com %s"
 
-#: actions/apitimelinetag.php:107 actions/tagrss.php:64
+#: actions/apitimelinetag.php:108 actions/tagrss.php:64
 #, php-format
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Actualizações categorizadas com %1$s em %2$s!"
@@ -534,45 +536,45 @@ msgstr "Avatar"
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr "Pode carregar o seu avatar pessoal. O tamanho máximo do ficheiro é %s."
 
-#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:185
 #: actions/grouplogo.php:178 actions/remotesubscribe.php:191
 #: actions/userauthorization.php:72 actions/userrss.php:103
 msgid "User without matching profile"
 msgstr "Utilizador sem perfil correspondente"
 
-#: actions/avatarsettings.php:119 actions/avatarsettings.php:194
+#: actions/avatarsettings.php:119 actions/avatarsettings.php:197
 #: actions/grouplogo.php:251
 msgid "Avatar settings"
 msgstr "Configurações do avatar"
 
-#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/avatarsettings.php:127 actions/avatarsettings.php:205
 #: actions/grouplogo.php:199 actions/grouplogo.php:259
 msgid "Original"
 msgstr "Original"
 
-#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/avatarsettings.php:142 actions/avatarsettings.php:217
 #: actions/grouplogo.php:210 actions/grouplogo.php:271
 msgid "Preview"
 msgstr "Antevisão"
 
-#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
+#: actions/avatarsettings.php:149 lib/deleteuserform.php:66
 #: lib/noticelist.php:550
 msgid "Delete"
 msgstr "Apagar"
 
-#: actions/avatarsettings.php:165 actions/grouplogo.php:233
+#: actions/avatarsettings.php:166 actions/grouplogo.php:233
 msgid "Upload"
 msgstr "Carregar"
 
-#: actions/avatarsettings.php:228 actions/grouplogo.php:286
+#: actions/avatarsettings.php:231 actions/grouplogo.php:286
 msgid "Crop"
 msgstr "Cortar"
 
-#: actions/avatarsettings.php:265 actions/disfavor.php:74
+#: actions/avatarsettings.php:268 actions/disfavor.php:74
 #: actions/emailsettings.php:238 actions/favor.php:75
 #: actions/groupblock.php:66 actions/grouplogo.php:309
 #: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -584,73 +586,33 @@ msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 "Ocorreu um problema com a sua chave de sessão. Por favor, tente novamente."
 
-#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
+#: actions/avatarsettings.php:281 actions/designadminpanel.php:103
 #: actions/emailsettings.php:256 actions/grouplogo.php:319
 #: actions/imsettings.php:220 actions/recoverpassword.php:44
 #: actions/smssettings.php:248 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "Envio inesperado de formulário."
 
-#: actions/avatarsettings.php:322
+#: actions/avatarsettings.php:328
 msgid "Pick a square area of the image to be your avatar"
 msgstr "Escolha uma área quadrada da imagem para ser o seu avatar"
 
-#: actions/avatarsettings.php:337 actions/grouplogo.php:377
+#: actions/avatarsettings.php:343 actions/grouplogo.php:377
 msgid "Lost our file data."
 msgstr "Perdi os dados do nosso ficheiro."
 
-#: actions/avatarsettings.php:360
+#: actions/avatarsettings.php:366
 msgid "Avatar updated."
 msgstr "Avatar actualizado."
 
-#: actions/avatarsettings.php:363
+#: actions/avatarsettings.php:369
 msgid "Failed updating avatar."
 msgstr "Falha ao actualizar avatar."
 
-#: actions/avatarsettings.php:387
+#: actions/avatarsettings.php:393
 msgid "Avatar deleted."
 msgstr "Avatar apagado."
 
-#: actions/blockedfromgroup.php:73 actions/editgroup.php:84
-#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
-#: actions/groupmembers.php:76 actions/grouprss.php:91
-#: actions/joingroup.php:76 actions/showgroup.php:121
-msgid "No nickname"
-msgstr "Sem alcunha"
-
-#: actions/blockedfromgroup.php:80 actions/editgroup.php:96
-#: actions/groupbyid.php:83 actions/groupdesignsettings.php:97
-#: actions/grouplogo.php:99 actions/groupmembers.php:83
-#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
-msgid "No such group"
-msgstr "Grupo não existe"
-
-#: actions/blockedfromgroup.php:90
-#, php-format
-msgid "%s blocked profiles"
-msgstr "%s perfis bloqueados"
-
-#: actions/blockedfromgroup.php:93
-#, php-format
-msgid "%s blocked profiles, page %d"
-msgstr "%s perfis bloqueados, página %d"
-
-#: actions/blockedfromgroup.php:108
-msgid "A list of the users blocked from joining this group."
-msgstr "Uma lista dos utilizadores com entrada bloqueada neste grupo."
-
-#: actions/blockedfromgroup.php:281
-msgid "Unblock user from group"
-msgstr "Desbloquear utilizador do grupo"
-
-#: actions/blockedfromgroup.php:313 lib/unblockform.php:69
-msgid "Unblock"
-msgstr "Desbloquear"
-
-#: actions/blockedfromgroup.php:313 lib/unblockform.php:80
-msgid "Unblock this user"
-msgstr "Desbloquear este utilizador"
-
 #: actions/block.php:69
 msgid "You already blocked that user."
 msgstr "Já bloqueou esse utilizador."
@@ -691,6 +653,46 @@ msgstr "Bloquear este utilizador"
 msgid "Failed to save block information."
 msgstr "Não foi possível gravar informação do bloqueio."
 
+#: actions/blockedfromgroup.php:73 actions/editgroup.php:84
+#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
+#: actions/groupmembers.php:76 actions/grouprss.php:91
+#: actions/joingroup.php:76 actions/showgroup.php:121
+msgid "No nickname"
+msgstr "Sem alcunha"
+
+#: actions/blockedfromgroup.php:80 actions/editgroup.php:96
+#: actions/groupbyid.php:83 actions/groupdesignsettings.php:97
+#: actions/grouplogo.php:99 actions/groupmembers.php:83
+#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
+msgid "No such group"
+msgstr "Grupo não existe"
+
+#: actions/blockedfromgroup.php:90
+#, php-format
+msgid "%s blocked profiles"
+msgstr "%s perfis bloqueados"
+
+#: actions/blockedfromgroup.php:93
+#, php-format
+msgid "%s blocked profiles, page %d"
+msgstr "%s perfis bloqueados, página %d"
+
+#: actions/blockedfromgroup.php:108
+msgid "A list of the users blocked from joining this group."
+msgstr "Uma lista dos utilizadores com entrada bloqueada neste grupo."
+
+#: actions/blockedfromgroup.php:281
+msgid "Unblock user from group"
+msgstr "Desbloquear utilizador do grupo"
+
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:69
+msgid "Unblock"
+msgstr "Desbloquear"
+
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:80
+msgid "Unblock this user"
+msgstr "Desbloquear este utilizador"
+
 #: actions/bookmarklet.php:50
 msgid "Post to "
 msgstr "Publicar em "
@@ -1026,7 +1028,7 @@ msgstr "Endereço electrónico"
 #: actions/emailsettings.php:123
 msgid "Email address, like \"UserName@example.org\""
 msgstr ""
-"Endereço de correio electrónico, por ex. \"nomedeutilizador@exemplo.org\""
+"Endereço de correio electrónico, por ex. \"nomedeutilizador@example.org\""
 
 #: actions/emailsettings.php:126 actions/imsettings.php:133
 #: actions/smssettings.php:145
@@ -1165,6 +1167,14 @@ msgstr "Endereço electrónico de entrada foi removido."
 msgid "New incoming email address added."
 msgstr "Adicionado endereço electrónico de entrada novo."
 
+#: actions/favor.php:79
+msgid "This notice is already a favorite!"
+msgstr "Esta nota já é uma favorita!"
+
+#: actions/favor.php:92 lib/disfavorform.php:140
+msgid "Disfavor favorite"
+msgstr "Desfavorecer favorita"
+
 #: actions/favorited.php:65 lib/popularnoticesection.php:88
 #: lib/publicgroupnav.php:93
 msgid "Popular notices"
@@ -1212,14 +1222,6 @@ msgstr "Notas favoritas de %s"
 msgid "Updates favored by %1$s on %2$s!"
 msgstr "Actualizações favorecidas por %1$s em %2$s!"
 
-#: actions/favor.php:79
-msgid "This notice is already a favorite!"
-msgstr "Esta nota já é uma favorita!"
-
-#: actions/favor.php:92 lib/disfavorform.php:140
-msgid "Disfavor favorite"
-msgstr "Desfavorecer favorita"
-
 #: actions/featured.php:69 lib/featureduserssection.php:87
 #: lib/publicgroupnav.php:89
 msgid "Featured users"
@@ -1451,6 +1453,35 @@ msgstr "Tornar este utilizador um administrador"
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "Actualizações dos membros de %1$s em %2$s!"
 
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+msgid "Groups"
+msgstr "Grupos"
+
+#: actions/groups.php:64
+#, php-format
+msgid "Groups, page %d"
+msgstr "Grupos, página %d"
+
+#: actions/groups.php:90
+#, php-format
+msgid ""
+"%%%%site.name%%%% groups let you find and talk with people of similar "
+"interests. After you join a group you can send messages to all other members "
+"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
+"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
+"%%%%)"
+msgstr ""
+"Os grupos no site %%%%site.name%%%% permitem-lhe encontrar e falar com "
+"pessoas que têm interesses semelhantes aos seus. Após juntar-se a um grupo, "
+"pode enviar mensagens a outros membros usando a sintaxe \"!groupname\". Não "
+"encontra nenhum grupo de que gosta? Tente [pesquisar um grupo](%%%%action."
+"groupsearch%%%%) ou [crie o seu!](%%%%action.newgroup%%%%)"
+
+#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
+msgid "Create a new group"
+msgstr "Criar um grupo novo"
+
 #: actions/groupsearch.php:52
 #, php-format
 msgid ""
@@ -1487,35 +1518,6 @@ msgstr ""
 "Podia [registar uma conta](%%action.register%%) e [criar o grupo](%%action."
 "newgroup%%) você mesmo!"
 
-#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
-msgid "Groups"
-msgstr "Grupos"
-
-#: actions/groups.php:64
-#, php-format
-msgid "Groups, page %d"
-msgstr "Grupos, página %d"
-
-#: actions/groups.php:90
-#, php-format
-msgid ""
-"%%%%site.name%%%% groups let you find and talk with people of similar "
-"interests. After you join a group you can send messages to all other members "
-"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
-"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
-"%%%%)"
-msgstr ""
-"Os grupos no site %%%%site.name%%%% permitem-lhe encontrar e falar com "
-"pessoas que têm interesses semelhantes aos seus. Após juntar-se a um grupo, "
-"pode enviar mensagens a outros membros usando a sintaxe \"!groupname\". Não "
-"encontra nenhum grupo de que gosta? Tente [pesquisar um grupo](%%%%action."
-"groupsearch%%%%) ou [crie o seu!](%%%%action.newgroup%%%%)"
-
-#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
-msgid "Create a new group"
-msgstr "Criar um grupo novo"
-
 #: actions/groupunblock.php:91
 msgid "Only an admin can unblock group members."
 msgstr "Só um administrador pode desbloquear membros de um grupo."
@@ -1711,7 +1713,7 @@ msgstr "Mensagem pessoal"
 msgid "Optionally add a personal message to the invitation."
 msgstr "Pode optar por acrescentar uma mensagem pessoal ao convite"
 
-#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:222
 msgid "Send"
 msgstr "Enviar"
 
@@ -1816,57 +1818,57 @@ msgstr "Não foi possível remover o utilizador %s do grupo %s"
 msgid "%s left group %s"
 msgstr "%s deixou o grupo %s"
 
-#: actions/login.php:82 actions/register.php:137
+#: actions/login.php:83 actions/register.php:137
 msgid "Already logged in."
 msgstr "Sessão já foi iniciada."
 
-#: actions/login.php:113 actions/login.php:123
+#: actions/login.php:114 actions/login.php:124
 msgid "Invalid or expired token."
 msgstr "Chave inválida ou expirada."
 
-#: actions/login.php:146
+#: actions/login.php:147
 msgid "Incorrect username or password."
 msgstr "Nome de utilizador ou palavra-passe incorrectos."
 
-#: actions/login.php:152
+#: actions/login.php:153
 msgid "Error setting user. You are probably not authorized."
 msgstr "Erro ao preparar o utilizador. Provavelmente não está autorizado."
 
-#: actions/login.php:207 actions/login.php:260 lib/action.php:458
+#: actions/login.php:208 actions/login.php:261 lib/action.php:458
 #: lib/logingroupnav.php:79
 msgid "Login"
 msgstr "Entrar"
 
-#: actions/login.php:246
+#: actions/login.php:247
 msgid "Login to site"
 msgstr "Iniciar sessão no site"
 
-#: actions/login.php:249 actions/profilesettings.php:106
+#: actions/login.php:250 actions/profilesettings.php:106
 #: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
 #: lib/groupeditform.php:152 lib/userprofile.php:131
 msgid "Nickname"
 msgstr "Alcunha"
 
-#: actions/login.php:252 actions/register.php:428
+#: actions/login.php:253 actions/register.php:428
 #: lib/accountsettingsaction.php:116
 msgid "Password"
 msgstr "Palavra-chave"
 
-#: actions/login.php:255 actions/register.php:477
+#: actions/login.php:256 actions/register.php:477
 msgid "Remember me"
 msgstr "Lembrar-me neste computador"
 
-#: actions/login.php:256 actions/register.php:479
+#: actions/login.php:257 actions/register.php:479
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "De futuro, iniciar sessão automaticamente. Não usar em computadores "
 "partilhados!"
 
-#: actions/login.php:266
+#: actions/login.php:267
 msgid "Lost or forgotten password?"
 msgstr "Perdeu ou esqueceu-se da palavra-passe?"
 
-#: actions/login.php:285
+#: actions/login.php:286
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -1874,7 +1876,7 @@ msgstr ""
 "Por razões de segurança, por favor reintroduza o seu nome de utilizador e "
 "palavra-passe antes de alterar as suas configurações."
 
-#: actions/login.php:289
+#: actions/login.php:290
 #, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -1945,7 +1947,7 @@ msgstr "Mensagem enviada"
 msgid "Direct message to %s sent"
 msgstr "Mensagem directa para %s enviada"
 
-#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:242 lib/channel.php:170
 msgid "Ajax Error"
 msgstr "Erro do Ajax"
 
@@ -1953,7 +1955,7 @@ msgstr "Erro do Ajax"
 msgid "New notice"
 msgstr "Nota nova"
 
-#: actions/newnotice.php:206
+#: actions/newnotice.php:208
 msgid "Notice posted"
 msgstr "Nota publicada"
 
@@ -2035,8 +2037,8 @@ msgstr "tipo de conteúdo "
 msgid "Only "
 msgstr "Apenas "
 
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996
-#: lib/api.php:1024 lib/api.php:1134
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011
+#: lib/api.php:1039 lib/api.php:1149
 msgid "Not a supported data format."
 msgstr "Formato de dados não suportado."
 
@@ -2070,11 +2072,11 @@ msgstr "Serviço de compactação automática que será usado"
 
 #: actions/othersettings.php:122
 msgid "View profile designs"
-msgstr "Ver o design dos perfis"
+msgstr "Ver designs para o perfil"
 
 #: actions/othersettings.php:123
 msgid "Show or hide profile designs."
-msgstr "Mostrar ou esconder o design dos perfis"
+msgstr "Mostrar ou esconder designs para o perfil."
 
 #: actions/othersettings.php:153
 msgid "URL shortening service is too long (max 50 chars)."
@@ -2429,11 +2431,11 @@ msgstr "Não foi possível importar as notas públicas."
 #: actions/public.php:129
 #, php-format
 msgid "Public timeline, page %d"
-msgstr "Cronolinha pública, página %d"
+msgstr "Notas públicas, página %d"
 
 #: actions/public.php:131 lib/publicgroupnav.php:79
 msgid "Public timeline"
-msgstr "Cronolinha pública"
+msgstr "Notas públicas"
 
 #: actions/public.php:151
 msgid "Public Stream Feed (RSS 1.0)"
@@ -2453,8 +2455,8 @@ msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
 "yet."
 msgstr ""
-"Esta é a cronolinha pública do site %%site.name%% mas ainda ninguém publicou "
-"nada."
+"Estas são as notas públicas do site %%site.name%% mas ninguém publicou nada "
+"ainda."
 
 #: actions/public.php:182
 msgid "Be the first to post!"
@@ -2495,7 +2497,7 @@ msgstr ""
 
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
-msgstr "Catenuvem pública"
+msgstr "Nuvem de categorias pública"
 
 #: actions/publictagcloud.php:63
 #, php-format
@@ -2524,7 +2526,7 @@ msgstr ""
 
 #: actions/publictagcloud.php:135
 msgid "Tag cloud"
-msgstr "Catenuvem"
+msgstr "Nuvem de categorias"
 
 #: actions/recoverpassword.php:36
 msgid "You are already logged in!"
@@ -2855,17 +2857,17 @@ msgstr "Respostas a %s, página %d"
 #: actions/replies.php:144
 #, php-format
 msgid "Replies feed for %s (RSS 1.0)"
-msgstr "Feed de respostas de %s (RSS 1.0)"
+msgstr "Feed de respostas a %s (RSS 1.0)"
 
 #: actions/replies.php:151
 #, php-format
 msgid "Replies feed for %s (RSS 2.0)"
-msgstr "Feed de respostas de %s (RSS 2.0)"
+msgstr "Feed de respostas a %s (RSS 2.0)"
 
 #: actions/replies.php:158
 #, php-format
 msgid "Replies feed for %s (Atom)"
-msgstr "Feed de respostas de %s (Atom)"
+msgstr "Feed de respostas a %s (Atom)"
 
 #: actions/replies.php:198
 #, php-format
@@ -2873,8 +2875,8 @@ msgid ""
 "This is the timeline showing replies to %s but %s hasn't received a notice "
 "to his attention yet."
 msgstr ""
-"Esta é a cronolinha com respostas a %s, mas %s ainda não recebeu nenhuma "
-"nota à sua atenção."
+"Estas são as notas de resposta a %s, mas %s ainda não recebeu nenhuma "
+"resposta."
 
 #: actions/replies.php:203
 #, php-format
@@ -2882,7 +2884,7 @@ msgid ""
 "You can engage other users in a conversation, subscribe to more people or "
 "[join groups](%%action.groups%%)."
 msgstr ""
-"Pode encetar conversa com outros utilizadores, subscrever mais pessoas ou "
+"Pode meter conversa com outros utilizadores, subscrever mais pessoas ou "
 "[juntar-se a grupos](%%action.groups%%)."
 
 #: actions/replies.php:205
@@ -2901,11 +2903,11 @@ msgstr "Respostas a %1$s em %2$s!"
 
 #: actions/sandbox.php:65 actions/unsandbox.php:65
 msgid "You cannot sandbox users on this site."
-msgstr "Não pode descronolinhar utilizadores neste site."
+msgstr "Não pode impedir notas públicas neste site."
 
 #: actions/sandbox.php:72
 msgid "User is already sandboxed."
-msgstr "Utilizador já está descronolinhado."
+msgstr "Utilizador já está impedido de criar notas públicas."
 
 #: actions/showfavorites.php:79
 #, php-format
@@ -3131,7 +3133,7 @@ msgstr "FOAF para %s"
 #: actions/showstream.php:191
 #, php-format
 msgid "This is the timeline for %s but %s hasn't posted anything yet."
-msgstr "Esta é a cronolinha de %s, mas %s ainda não publicou nada."
+msgstr "Estas são as notas de %s, mas %s ainda não publicou nenhuma."
 
 #: actions/showstream.php:196
 msgid ""
@@ -3623,6 +3625,26 @@ msgstr "Jabber"
 msgid "SMS"
 msgstr "SMS"
 
+#: actions/tag.php:68
+#, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr "Notas categorizadas com %s, página %d"
+
+#: actions/tag.php:86
+#, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "Feed de notas para a categoria %s (RSS 1.0)"
+
+#: actions/tag.php:92
+#, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "Feed de notas para a categoria %s (RSS 2.0)"
+
+#: actions/tag.php:98
+#, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "Feed de notas para a categoria %s (Atom)"
+
 #: actions/tagother.php:33
 msgid "Not logged in"
 msgstr "Não iniciou sessão."
@@ -3671,26 +3693,6 @@ msgstr ""
 "Use este formulário para categorizar os seus subscritores ou os que "
 "subscreve."
 
-#: actions/tag.php:68
-#, php-format
-msgid "Notices tagged with %s, page %d"
-msgstr "Notas categorizadas com %s, página %d"
-
-#: actions/tag.php:86
-#, php-format
-msgid "Notice feed for tag %s (RSS 1.0)"
-msgstr "Feed de notas para a categoria %s (RSS 1.0)"
-
-#: actions/tag.php:92
-#, php-format
-msgid "Notice feed for tag %s (RSS 2.0)"
-msgstr "Feed de notas para a categoria %s (RSS 2.0)"
-
-#: actions/tag.php:98
-#, php-format
-msgid "Notice feed for tag %s (Atom)"
-msgstr "Feed de notas para a categoria %s (Atom)"
-
 #: actions/tagrss.php:35
 msgid "No such tag."
 msgstr "Categoria não existe."
@@ -3705,7 +3707,7 @@ msgstr "Não bloqueou esse utilizador."
 
 #: actions/unsandbox.php:72
 msgid "User is not sandboxed."
-msgstr "Utilizador não está descronolinhado."
+msgstr "Utilizador não está impedido de criar notas públicas."
 
 #: actions/unsilence.php:72
 msgid "User is not silenced."
@@ -3994,22 +3996,22 @@ msgstr "Não foi possível actualizar a mensagem com a nova URI."
 msgid "DB error inserting hashtag: %s"
 msgstr "Erro na base de dados ao inserir a hashtag: %s"
 
-#: classes/Notice.php:179
+#: classes/Notice.php:188
 msgid "Problem saving notice. Too long."
 msgstr "Problema na gravação da nota. Demasiado longa."
 
-#: classes/Notice.php:183
+#: classes/Notice.php:192
 msgid "Problem saving notice. Unknown user."
 msgstr "Problema na gravação da nota. Utilizador desconhecido."
 
-#: classes/Notice.php:188
+#: classes/Notice.php:197
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 "Demasiadas notas, demasiado rápido; descanse e volte a publicar daqui a "
 "alguns minutos."
 
-#: classes/Notice.php:194
+#: classes/Notice.php:203
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
@@ -4017,19 +4019,24 @@ msgstr ""
 "Demasiadas mensagens duplicadas, demasiado rápido; descanse e volte a "
 "publicar daqui a alguns minutos."
 
-#: classes/Notice.php:200
+#: classes/Notice.php:209
 msgid "You are banned from posting notices on this site."
 msgstr "Está proibido de publicar notas neste site."
 
-#: classes/Notice.php:265 classes/Notice.php:290
+#: classes/Notice.php:274 classes/Notice.php:299
 msgid "Problem saving notice."
 msgstr "Problema na gravação da nota."
 
-#: classes/Notice.php:1124
+#: classes/Notice.php:1115
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Ocorreu um erro na base de dados ao inserir a resposta: %s"
 
+#: classes/User.php:347
+#, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr "%1$s dá-lhe as boas-vindas, @%2$s!"
+
 #: classes/User_group.php:380
 msgid "Could not create group."
 msgstr "Não foi possível criar o grupo."
@@ -4038,11 +4045,6 @@ msgstr "Não foi possível criar o grupo."
 msgid "Could not set group membership."
 msgstr "Não foi possível configurar membros do grupo."
 
-#: classes/User.php:347
-#, php-format
-msgid "Welcome to %1$s, @%2$s!"
-msgstr "%1$s dá-lhe as boas-vindas, @%2$s!"
-
 #: lib/accountsettingsaction.php:108
 msgid "Change your profile settings"
 msgstr "Modificar as suas definições de perfil"
@@ -4090,7 +4092,7 @@ msgstr "Início"
 
 #: lib/action.php:431
 msgid "Personal profile and friends timeline"
-msgstr "Perfil pessoal e cronolinha dos amigos"
+msgstr "Perfil pessoal e notas dos amigos"
 
 #: lib/action.php:433
 msgid "Account"
@@ -4347,7 +4349,7 @@ msgstr ""
 msgid "Notice with that id does not exist"
 msgstr "Não existe nenhuma nota com essa identificação"
 
-#: lib/command.php:168 lib/command.php:416 lib/command.php:471
+#: lib/command.php:168 lib/command.php:416 lib/command.php:472
 msgid "User has no last notice"
 msgstr "Utilizador não tem nenhuma última nota"
 
@@ -4394,99 +4396,100 @@ msgstr "Erro no envio da mensagem directa."
 msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr "Nota demasiado extensa - máx. %d caracteres, enviou %d"
 
-#: lib/command.php:439
+#: lib/command.php:440
 #, php-format
 msgid "Reply to %s sent"
 msgstr "Resposta a %s enviada"
 
-#: lib/command.php:441
+#: lib/command.php:442
 msgid "Error saving notice."
 msgstr "Erro ao gravar nota."
 
-#: lib/command.php:495
+#: lib/command.php:496
 msgid "Specify the name of the user to subscribe to"
 msgstr "Introduza o nome do utilizador para subscrever"
 
-#: lib/command.php:502
+#: lib/command.php:503
 #, php-format
 msgid "Subscribed to %s"
 msgstr "Subscreveu %s"
 
-#: lib/command.php:523
+#: lib/command.php:524
 msgid "Specify the name of the user to unsubscribe from"
 msgstr "Introduza o nome do utilizador para deixar de subscrever"
 
-#: lib/command.php:530
+#: lib/command.php:531
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr "Deixou de subscrever %s"
 
-#: lib/command.php:548 lib/command.php:571
+#: lib/command.php:549 lib/command.php:572
 msgid "Command not yet implemented."
 msgstr "Comando ainda não implementado."
 
-#: lib/command.php:551
+#: lib/command.php:552
 msgid "Notification off."
 msgstr "Notificação desligada."
 
-#: lib/command.php:553
+#: lib/command.php:554
 msgid "Can't turn off notification."
 msgstr "Não foi possível desligar a notificação."
 
-#: lib/command.php:574
+#: lib/command.php:575
 msgid "Notification on."
 msgstr "Notificação ligada."
 
-#: lib/command.php:576
+#: lib/command.php:577
 msgid "Can't turn on notification."
 msgstr "Não foi possível ligar a notificação."
 
-#: lib/command.php:588
+#: lib/command.php:590
 msgid "Login command is disabled"
-msgstr ""
+msgstr "Comando para iniciar sessão foi desactivado"
 
-#: lib/command.php:602
-#, fuzzy, php-format
+#: lib/command.php:604
+#, php-format
 msgid "Could not create login token for %s"
-msgstr "Não foi possível criar cognomes."
+msgstr "Não foi possível criar a chave de entrada para %s"
 
-#: lib/command.php:607
+#: lib/command.php:609
 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
+"Esta ligação é utilizável uma única vez e só durante os próximos 2 minutos: %"
+"s"
 
-#: lib/command.php:623
+#: lib/command.php:625
 msgid "You are not subscribed to anyone."
 msgstr "Não subscreveu ninguém."
 
-#: lib/command.php:625
+#: lib/command.php:627
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Subscreve esta pessoa:"
 msgstr[1] "Subscreve estas pessoas:"
 
-#: lib/command.php:645
+#: lib/command.php:647
 msgid "No one is subscribed to you."
 msgstr "Ninguém subscreve as suas notas."
 
-#: lib/command.php:647
+#: lib/command.php:649
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Esta pessoa subscreve as suas notas:"
 msgstr[1] "Estas pessoas subscrevem as suas notas:"
 
-#: lib/command.php:667
+#: lib/command.php:669
 msgid "You are not a member of any groups."
 msgstr "Não está em nenhum grupo."
 
-#: lib/command.php:669
+#: lib/command.php:671
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Está no grupo:"
 msgstr[1] "Está nos grupos:"
 
-#: lib/command.php:683
-#, fuzzy
+#: lib/command.php:685
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -4541,6 +4544,7 @@ msgstr ""
 "reply #<id_da_nota> - responder à nota com esta identificação\n"
 "reply <alcunha> - responder à última nota do utilizador\n"
 "join <grupo> - juntar-se ao grupo\n"
+"login - Receber uma ligação para iniciar sessão na interface web\n"
 "drop <grupo> - afastar-se do grupo\n"
 "stats - receber as suas estatísticas\n"
 "stop - o mesmo que 'off'\n"
@@ -4618,10 +4622,6 @@ msgstr "Favorecer esta nota"
 msgid "Favor"
 msgstr "Favorecer"
 
-#: lib/feedlist.php:64
-msgid "Export data"
-msgstr "Exportar dados"
-
 #: lib/feed.php:85
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
@@ -4638,6 +4638,10 @@ msgstr "Atom"
 msgid "FOAF"
 msgstr "FOAF"
 
+#: lib/feedlist.php:64
+msgid "Export data"
+msgstr "Exportar dados"
+
 #: lib/galleryaction.php:121
 msgid "Filter tags"
 msgstr "Filtrar categorias"
@@ -4798,23 +4802,6 @@ msgstr "Iniciar sessão com um nome de utilizador e palavra-chave"
 msgid "Sign up for a new account"
 msgstr "Registar uma conta nova"
 
-#: lib/mailbox.php:89
-msgid "Only the user can read their own mailboxes."
-msgstr "Só o próprio utilizador pode ler a sua caixa de correio."
-
-#: 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 ""
-"Não tem messagens privadas. Pode enviar mensagens privadas para encetar "
-"conversas com outros utilizadores. Outros podem enviar-lhe mensagens, a que "
-"só você terá acesso."
-
-#: lib/mailbox.php:227 lib/noticelist.php:452
-msgid "from"
-msgstr "de"
-
 #: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Confirmação do endereço electrónico"
@@ -5076,6 +5063,23 @@ msgstr ""
 "%4$s\n"
 "\n"
 
+#: lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
+msgstr "Só o próprio utilizador pode ler a sua caixa de correio."
+
+#: 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 ""
+"Não tem messagens privadas. Pode enviar mensagens privadas para encetar "
+"conversas com outros utilizadores. Outros podem enviar-lhe mensagens, a que "
+"só você terá acesso."
+
+#: lib/mailbox.php:227 lib/noticelist.php:452
+msgid "from"
+msgstr "de"
+
 #: lib/mediafile.php:98 lib/mediafile.php:123
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
@@ -5140,7 +5144,7 @@ msgstr "Enviar uma nota directa"
 msgid "To"
 msgstr "Para"
 
-#: lib/messageform.php:161 lib/noticeform.php:185
+#: lib/messageform.php:159 lib/noticeform.php:183
 msgid "Available characters"
 msgstr "Caracteres disponíveis"
 
@@ -5153,11 +5157,11 @@ msgstr "Enviar uma nota"
 msgid "What's up, %s?"
 msgstr "Novidades, %s?"
 
-#: lib/noticeform.php:192
+#: lib/noticeform.php:190
 msgid "Attach"
 msgstr "Anexar"
 
-#: lib/noticeform.php:196
+#: lib/noticeform.php:194
 msgid "Attach a file"
 msgstr "Anexar um ficheiro"
 
@@ -5226,11 +5230,11 @@ msgstr "Erro ao inserir perfil remoto"
 msgid "Duplicate notice"
 msgstr "Nota duplicada"
 
-#: lib/oauthstore.php:467 lib/subs.php:48
+#: lib/oauthstore.php:466 lib/subs.php:48
 msgid "You have been banned from subscribing."
 msgstr "Foi bloqueado de fazer subscrições"
 
-#: lib/oauthstore.php:492
+#: lib/oauthstore.php:491
 msgid "Couldn't insert new subscription."
 msgstr "Não foi possível inserir nova subscrição."
 
@@ -5285,7 +5289,7 @@ msgstr "Todos os subscritores"
 
 #: lib/profileaction.php:178
 msgid "User ID"
-msgstr "ID de utilizador"
+msgstr "ID do utilizador"
 
 #: lib/profileaction.php:183
 msgid "Member since"
@@ -5325,11 +5329,11 @@ msgstr "Populares"
 
 #: lib/sandboxform.php:67
 msgid "Sandbox"
-msgstr "Descronolinhar"
+msgstr "Impedir notas públicas"
 
 #: lib/sandboxform.php:78
 msgid "Sandbox this user"
-msgstr "Impedir que notas deste utilizador apareçam na cronolinha"
+msgstr "Impedir que notas deste utilizador sejam públicas"
 
 #: lib/searchaction.php:120
 msgid "Search site"
@@ -5390,20 +5394,6 @@ msgstr "Pessoas que subscrevem %s"
 msgid "Groups %s is a member of"
 msgstr "Grupos de que %s é membro"
 
-#: lib/subscriberspeopleselftagcloudsection.php:48
-#: lib/subscriptionspeopleselftagcloudsection.php:48
-msgid "People Tagcloud as self-tagged"
-msgstr "Catenuvem de Pessoas tal como elas se categorizam"
-
-#: lib/subscriberspeopletagcloudsection.php:48
-#: lib/subscriptionspeopletagcloudsection.php:48
-msgid "People Tagcloud as tagged"
-msgstr "Catenuvem de Pessoas tal como as categoriza"
-
-#: lib/subscriptionlist.php:126
-msgid "(none)"
-msgstr "(nenhum)"
-
 #: lib/subs.php:52
 msgid "Already subscribed!"
 msgstr "Já subscrito!"
@@ -5432,6 +5422,20 @@ msgstr "Não foi possível apagar a auto-subscrição."
 msgid "Couldn't delete subscription."
 msgstr "Não foi possível apagar a subscrição."
 
+#: lib/subscriberspeopleselftagcloudsection.php:48
+#: lib/subscriptionspeopleselftagcloudsection.php:48
+msgid "People Tagcloud as self-tagged"
+msgstr "Nuvem da auto-categorização das pessoas"
+
+#: lib/subscriberspeopletagcloudsection.php:48
+#: lib/subscriptionspeopletagcloudsection.php:48
+msgid "People Tagcloud as tagged"
+msgstr "Nuvem da sua categorização das pessoas"
+
+#: lib/subscriptionlist.php:126
+msgid "(none)"
+msgstr "(nenhum)"
+
 #: lib/tagcloudsection.php:56
 msgid "None"
 msgstr "Nenhum"
@@ -5442,11 +5446,11 @@ msgstr "Quem mais publica"
 
 #: lib/unsandboxform.php:69
 msgid "Unsandbox"
-msgstr "Cronolinhar"
+msgstr "Permitir notas públicas"
 
 #: lib/unsandboxform.php:80
 msgid "Unsandbox this user"
-msgstr "Permitir que notas deste utilizador apareçam na cronolinha"
+msgstr "Permitir que notas deste utilizador sejam públicas"
 
 #: lib/unsilenceform.php:67
 msgid "Unsilence"
diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po
index 535520096b..eb81de65f6 100644
--- a/locale/pt_BR/LC_MESSAGES/statusnet.po
+++ b/locale/pt_BR/LC_MESSAGES/statusnet.po
@@ -1,6 +1,7 @@
 # Translation of StatusNet to Brazilian Portuguese
 #
 # Author@translatewiki.net: Ewout
+# Author@translatewiki.net: McDutchie
 # Author@translatewiki.net: Vuln
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,12 +10,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 21:25+0000\n"
-"PO-Revision-Date: 2009-12-07 21:27:16+0000\n"
+"POT-Creation-Date: 2009-12-12 17:09+0000\n"
+"PO-Revision-Date: 2009-12-12 17:10:21+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(r59800); Translate extension (2009-12-06)\n"
+"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: out-statusnet\n"
@@ -27,11 +28,11 @@ msgstr "Essa página não existe."
 
 #: actions/all.php:74 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofile.php:105
 #: actions/apiaccountupdateprofilebackgroundimage.php:116
-#: actions/apiaccountupdateprofileimage.php:105
-#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
-#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
-#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
+#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90
 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
@@ -44,7 +45,7 @@ msgstr "Essa página não existe."
 #: actions/repliesrss.php:38 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38
 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
-#: lib/command.php:364 lib/command.php:411 lib/command.php:466
+#: lib/command.php:364 lib/command.php:411 lib/command.php:467
 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
 #: lib/subs.php:34 lib/subs.php:116
 msgid "No such user."
@@ -56,7 +57,7 @@ msgid "%s and friends, page %d"
 msgstr "%s e amigos, página %d"
 
 #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
-#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100
+#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s e amigos"
@@ -107,25 +108,25 @@ msgstr ""
 msgid "You and friends"
 msgstr "Você e amigos"
 
-#: actions/allrss.php:119 actions/apitimelinefriends.php:121
+#: actions/allrss.php:119 actions/apitimelinefriends.php:122
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Atualizações de %1$s e amigos no %2$s!"
 
 #: actions/apiaccountratelimitstatus.php:70
 #: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofile.php:97
 #: actions/apiaccountupdateprofilebackgroundimage.php:94
 #: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apiaccountupdateprofile.php:97
 #, fuzzy
 msgid "API method not found."
 msgstr "O método da API não foi encontrado!"
 
 #: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofile.php:89
 #: actions/apiaccountupdateprofilebackgroundimage.php:86
 #: actions/apiaccountupdateprofilecolors.php:110
-#: actions/apiaccountupdateprofileimage.php:84
-#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
+#: actions/apiaccountupdateprofileimage.php:84 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
@@ -145,9 +146,23 @@ msgstr ""
 msgid "Could not update user."
 msgstr "Não foi possível atualizar o usuário."
 
+#: actions/apiaccountupdateprofile.php:112
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+msgid "User has no profile."
+msgstr "O usuário não tem perfil."
+
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "Não foi possível salvar o perfil."
+
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257
 #: actions/designadminpanel.php:122 actions/newnotice.php:94
 #: lib/designsettings.php:283
 #, php-format
@@ -170,20 +185,6 @@ msgstr "Não foi possível salvar suas configurações do Twitter!"
 msgid "Could not update your design."
 msgstr "Não foi possível atualizar o usuário."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
-#: actions/apiaccountupdateprofileimage.php:130
-#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
-#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
-msgid "User has no profile."
-msgstr "O usuário não tem perfil."
-
-#: actions/apiaccountupdateprofile.php:147
-#, fuzzy
-msgid "Could not save profile."
-msgstr "Não foi possível salvar o perfil."
-
 #: actions/apiblockcreate.php:105
 #, fuzzy
 msgid "You cannot block yourself!"
@@ -197,25 +198,6 @@ msgstr "Não foi possível bloquear o usuário."
 msgid "Unblock user failed."
 msgstr "Não foi possível desbloquear o usuário."
 
-#: actions/apidirectmessagenew.php:126
-msgid "No message text!"
-msgstr "Nenhuma mensagem de texto!"
-
-#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
-#, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr "Isso é muito extenso. O tamanho máximo das mensagens é 140 caracteres."
-
-#: actions/apidirectmessagenew.php:146
-msgid "Recipient user not found."
-msgstr "O usuário destinatário não foi encontrado."
-
-#: 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."
-
 #: actions/apidirectmessage.php:89
 #, php-format
 msgid "Direct messages from %s"
@@ -241,18 +223,37 @@ msgstr "Todas as mensagens diretas enviadas para %s"
 #: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
-#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
-#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149
-#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
-#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156
+#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151
+#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141
+#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
 msgid "API method not found!"
 msgstr "O método da API não foi encontrado!"
 
+#: actions/apidirectmessagenew.php:126
+msgid "No message text!"
+msgstr "Nenhuma mensagem de texto!"
+
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "Isso é muito extenso. O tamanho máximo das mensagens é 140 caracteres."
+
+#: actions/apidirectmessagenew.php:146
+msgid "Recipient user not found."
+msgstr "O usuário destinatário não foi encontrado."
+
+#: 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."
+
 #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
 #: actions/apistatusesdestroy.php:113
 msgid "No status found with that ID."
@@ -399,16 +400,6 @@ msgstr "Você não é membro deste grupo."
 msgid "Could not remove user %s to group %s."
 msgstr "Não foi possível remover o usuário %s do grupo %."
 
-#: actions/apigrouplistall.php:90 actions/usergroups.php:62
-#, php-format
-msgid "%s groups"
-msgstr "Grupos de %s"
-
-#: actions/apigrouplistall.php:94
-#, fuzzy, php-format
-msgid "groups on %s"
-msgstr "Outras opções"
-
 #: actions/apigrouplist.php:95
 #, fuzzy, php-format
 msgid "%s's groups"
@@ -419,6 +410,16 @@ msgstr "Grupos de %s"
 msgid "Groups %s is a member of on %s."
 msgstr "O grupo %s é membro de"
 
+#: actions/apigrouplistall.php:90 actions/usergroups.php:62
+#, php-format
+msgid "%s groups"
+msgstr "Grupos de %s"
+
+#: actions/apigrouplistall.php:94
+#, fuzzy, php-format
+msgid "groups on %s"
+msgstr "Outras opções"
+
 #: actions/apistatusesdestroy.php:107
 msgid "This method requires a POST or DELETE."
 msgstr "Este método requer POSTAGEM ou EXCLUSÃO."
@@ -455,54 +456,54 @@ msgstr ""
 msgid "Unsupported format."
 msgstr "Formato de imagem não suportado."
 
-#: actions/apitimelinefavorites.php:107
+#: actions/apitimelinefavorites.php:108
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr "%s / Favoritas de %s"
 
-#: actions/apitimelinefavorites.php:119
+#: actions/apitimelinefavorites.php:120
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr "%s atualizações de favoritas por %s / %s."
 
-#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117
+#: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118
 #: actions/grouprss.php:131 actions/userrss.php:90
 #, php-format
 msgid "%s timeline"
 msgstr "Mensagens de %s"
 
-#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125
+#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
 #: actions/userrss.php:92
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Atualizações de %1$s no %2$s!"
 
-#: actions/apitimelinementions.php:116
+#: actions/apitimelinementions.php:117
 #, fuzzy, php-format
 msgid "%1$s / Updates mentioning %2$s"
 msgstr "%1$s / Atualizações respondendo à %2$s"
 
-#: actions/apitimelinementions.php:126
+#: actions/apitimelinementions.php:127
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s atualizações que respondem a mensagens de %2$s / %3$s."
 
-#: actions/apitimelinepublic.php:106 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "Mensagens públicas de %s"
 
-#: actions/apitimelinepublic.php:110 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s atualizações de todo mundo!"
 
-#: actions/apitimelinetag.php:101 actions/tag.php:66
+#: actions/apitimelinetag.php:102 actions/tag.php:66
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Mensagens etiquetadas com %s"
 
-#: actions/apitimelinetag.php:107 actions/tagrss.php:64
+#: actions/apitimelinetag.php:108 actions/tagrss.php:64
 #, fuzzy, php-format
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Atualizações de %1$s no %2$s!"
@@ -538,45 +539,45 @@ msgstr "Avatar"
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr "Você pode enviar seu avatar pessoal. O tamanho máximo do arquivo é %s"
 
-#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:185
 #: actions/grouplogo.php:178 actions/remotesubscribe.php:191
 #: actions/userauthorization.php:72 actions/userrss.php:103
 msgid "User without matching profile"
 msgstr "Usuário sem um perfil correspondente"
 
-#: actions/avatarsettings.php:119 actions/avatarsettings.php:194
+#: actions/avatarsettings.php:119 actions/avatarsettings.php:197
 #: actions/grouplogo.php:251
 msgid "Avatar settings"
 msgstr "Configurações do avatar"
 
-#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/avatarsettings.php:127 actions/avatarsettings.php:205
 #: actions/grouplogo.php:199 actions/grouplogo.php:259
 msgid "Original"
 msgstr "Original"
 
-#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/avatarsettings.php:142 actions/avatarsettings.php:217
 #: actions/grouplogo.php:210 actions/grouplogo.php:271
 msgid "Preview"
 msgstr "Visualização"
 
-#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
+#: actions/avatarsettings.php:149 lib/deleteuserform.php:66
 #: lib/noticelist.php:550
 msgid "Delete"
 msgstr "Excluir"
 
-#: actions/avatarsettings.php:165 actions/grouplogo.php:233
+#: actions/avatarsettings.php:166 actions/grouplogo.php:233
 msgid "Upload"
 msgstr "Enviar"
 
-#: actions/avatarsettings.php:228 actions/grouplogo.php:286
+#: actions/avatarsettings.php:231 actions/grouplogo.php:286
 msgid "Crop"
 msgstr "Cortar"
 
-#: actions/avatarsettings.php:265 actions/disfavor.php:74
+#: actions/avatarsettings.php:268 actions/disfavor.php:74
 #: actions/emailsettings.php:238 actions/favor.php:75
 #: actions/groupblock.php:66 actions/grouplogo.php:309
 #: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -588,34 +589,72 @@ msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 "Ocorreu um problema com o seu token de sessão. Tente novamente, por favor."
 
-#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
+#: actions/avatarsettings.php:281 actions/designadminpanel.php:103
 #: actions/emailsettings.php:256 actions/grouplogo.php:319
 #: actions/imsettings.php:220 actions/recoverpassword.php:44
 #: actions/smssettings.php:248 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "Submissão inesperada de formulário."
 
-#: actions/avatarsettings.php:322
+#: actions/avatarsettings.php:328
 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:337 actions/grouplogo.php:377
+#: actions/avatarsettings.php:343 actions/grouplogo.php:377
 msgid "Lost our file data."
 msgstr "Nossos dados do arquivo foi perdido."
 
-#: actions/avatarsettings.php:360
+#: actions/avatarsettings.php:366
 msgid "Avatar updated."
 msgstr "O avatar foi atualizado."
 
-#: actions/avatarsettings.php:363
+#: actions/avatarsettings.php:369
 msgid "Failed updating avatar."
 msgstr "Não foi possível atualizar o avatar."
 
-#: actions/avatarsettings.php:387
+#: actions/avatarsettings.php:393
 #, fuzzy
 msgid "Avatar deleted."
 msgstr "O avatar foi atualizado."
 
+#: actions/block.php:69
+msgid "You already blocked that user."
+msgstr "Você já bloqueou esse usuário."
+
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
+msgid "Block user"
+msgstr "Bloquear usuário"
+
+#: actions/block.php:130
+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/block.php:143 actions/deletenotice.php:145
+#: actions/deleteuser.php:147 actions/groupblock.php:178
+msgid "No"
+msgstr "Não"
+
+#: actions/block.php:143 actions/deleteuser.php:147
+#, fuzzy
+msgid "Do not block this user"
+msgstr "Desbloquear este usuário"
+
+#: actions/block.php:144 actions/deletenotice.php:146
+#: actions/deleteuser.php:148 actions/groupblock.php:179
+msgid "Yes"
+msgstr "Sim"
+
+#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
+msgid "Block this user"
+msgstr "Bloquear usuário"
+
+#: actions/block.php:162
+msgid "Failed to save block information."
+msgstr "Não foi possível salvar a informação de bloqueio."
+
 #: actions/blockedfromgroup.php:73 actions/editgroup.php:84
 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
 #: actions/groupmembers.php:76 actions/grouprss.php:91
@@ -657,44 +696,6 @@ msgstr "Desbloquear"
 msgid "Unblock this user"
 msgstr "Desbloquear este usuário"
 
-#: actions/block.php:69
-msgid "You already blocked that user."
-msgstr "Você já bloqueou esse usuário."
-
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
-msgid "Block user"
-msgstr "Bloquear usuário"
-
-#: actions/block.php:130
-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/block.php:143 actions/deletenotice.php:145
-#: actions/deleteuser.php:147 actions/groupblock.php:178
-msgid "No"
-msgstr "Não"
-
-#: actions/block.php:143 actions/deleteuser.php:147
-#, fuzzy
-msgid "Do not block this user"
-msgstr "Desbloquear este usuário"
-
-#: actions/block.php:144 actions/deletenotice.php:146
-#: actions/deleteuser.php:148 actions/groupblock.php:179
-msgid "Yes"
-msgstr "Sim"
-
-#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
-msgid "Block this user"
-msgstr "Bloquear usuário"
-
-#: actions/block.php:162
-msgid "Failed to save block information."
-msgstr "Não foi possível salvar a informação de bloqueio."
-
 #: actions/bookmarklet.php:50
 msgid "Post to "
 msgstr ""
@@ -1045,7 +1046,7 @@ msgstr "Endereço de e-mail"
 
 #: actions/emailsettings.php:123
 msgid "Email address, like \"UserName@example.org\""
-msgstr "Endereço de e-mail, ex: \"usuario@exemplo.org\""
+msgstr "Endereço de e-mail, ex: \"usuario@example.org\""
 
 #: actions/emailsettings.php:126 actions/imsettings.php:133
 #: actions/smssettings.php:145
@@ -1184,6 +1185,14 @@ msgid "New incoming email address added."
 msgstr ""
 "Foi adicionado um novo endereço de e-mail para recebimento de mensagens."
 
+#: actions/favor.php:79
+msgid "This notice is already a favorite!"
+msgstr "Essa mensagem já é uma favorita!"
+
+#: actions/favor.php:92 lib/disfavorform.php:140
+msgid "Disfavor favorite"
+msgstr "Excluir a favorita"
+
 #: actions/favorited.php:65 lib/popularnoticesection.php:88
 #: lib/publicgroupnav.php:93
 msgid "Popular notices"
@@ -1226,14 +1235,6 @@ msgstr "Mensagens favoritas de %s"
 msgid "Updates favored by %1$s on %2$s!"
 msgstr "Atualizações de %1$s no %2$s!"
 
-#: actions/favor.php:79
-msgid "This notice is already a favorite!"
-msgstr "Essa mensagem já é uma favorita!"
-
-#: actions/favor.php:92 lib/disfavorform.php:140
-msgid "Disfavor favorite"
-msgstr "Excluir a favorita"
-
 #: actions/featured.php:69 lib/featureduserssection.php:87
 #: lib/publicgroupnav.php:89
 msgid "Featured users"
@@ -1480,6 +1481,31 @@ msgstr ""
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "Atualizações de %1$s no %2$s!"
 
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 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 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/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
+#, fuzzy
+msgid "Create a new group"
+msgstr "Criar uma nova conta"
+
 #: actions/groupsearch.php:52
 #, fuzzy, php-format
 msgid ""
@@ -1515,31 +1541,6 @@ msgid ""
 "action.newgroup%%) yourself!"
 msgstr ""
 
-#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 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 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/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
-#, fuzzy
-msgid "Create a new group"
-msgstr "Criar uma nova conta"
-
 #: actions/groupunblock.php:91
 msgid "Only an admin can unblock group members."
 msgstr ""
@@ -1737,7 +1738,7 @@ msgstr "Mensagem pessoal"
 msgid "Optionally add a personal message to the invitation."
 msgstr "Você pode, opcionalmente, adicionar uma mensagem pessoal ao convite."
 
-#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:222
 msgid "Send"
 msgstr "Enviar"
 
@@ -1850,59 +1851,59 @@ msgstr "Não é possível acompanhar o usuário: Usuário não encontrado."
 msgid "%s left group %s"
 msgstr ""
 
-#: actions/login.php:82 actions/register.php:137
+#: actions/login.php:83 actions/register.php:137
 msgid "Already logged in."
 msgstr "Já está logado."
 
-#: actions/login.php:113 actions/login.php:123
+#: actions/login.php:114 actions/login.php:124
 #, fuzzy
 msgid "Invalid or expired token."
 msgstr "O conteúdo da mensagem é inválido"
 
-#: actions/login.php:146
+#: actions/login.php:147
 msgid "Incorrect username or password."
 msgstr "Nome de usuário e/ou senha incorreto(s)."
 
-#: actions/login.php:152
+#: actions/login.php:153
 #, fuzzy
 msgid "Error setting user. You are probably not authorized."
 msgstr "Não autorizado."
 
-#: actions/login.php:207 actions/login.php:260 lib/action.php:458
+#: actions/login.php:208 actions/login.php:261 lib/action.php:458
 #: lib/logingroupnav.php:79
 msgid "Login"
 msgstr "Logar"
 
-#: actions/login.php:246
+#: actions/login.php:247
 msgid "Login to site"
 msgstr ""
 
-#: actions/login.php:249 actions/profilesettings.php:106
+#: actions/login.php:250 actions/profilesettings.php:106
 #: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
 #: lib/groupeditform.php:152 lib/userprofile.php:131
 msgid "Nickname"
 msgstr "Apelido"
 
-#: actions/login.php:252 actions/register.php:428
+#: actions/login.php:253 actions/register.php:428
 #: lib/accountsettingsaction.php:116
 msgid "Password"
 msgstr "Senha"
 
-#: actions/login.php:255 actions/register.php:477
+#: actions/login.php:256 actions/register.php:477
 msgid "Remember me"
 msgstr "Lembrar neste computador"
 
-#: actions/login.php:256 actions/register.php:479
+#: actions/login.php:257 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!"
 
-#: actions/login.php:266
+#: actions/login.php:267
 msgid "Lost or forgotten password?"
 msgstr "Perdeu ou esqueceu sua senha?"
 
-#: actions/login.php:285
+#: actions/login.php:286
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -1910,7 +1911,7 @@ 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:289
+#: actions/login.php:290
 #, fuzzy, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -1986,7 +1987,7 @@ msgstr "Nova mensagem"
 msgid "Direct message to %s sent"
 msgstr "A mensagem direta para %s foi enviada"
 
-#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:242 lib/channel.php:170
 msgid "Ajax Error"
 msgstr "Erro no Ajax"
 
@@ -1994,7 +1995,7 @@ msgstr "Erro no Ajax"
 msgid "New notice"
 msgstr "Nova mensagem"
 
-#: actions/newnotice.php:206
+#: actions/newnotice.php:208
 msgid "Notice posted"
 msgstr "Mensagem publicada"
 
@@ -2072,8 +2073,8 @@ msgstr ""
 msgid "Only "
 msgstr ""
 
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996
-#: lib/api.php:1024 lib/api.php:1134
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011
+#: lib/api.php:1039 lib/api.php:1149
 msgid "Not a supported data format."
 msgstr "Formato de dados não suportado."
 
@@ -3647,6 +3648,26 @@ msgstr "Jabber"
 msgid "SMS"
 msgstr "SMS"
 
+#: actions/tag.php:68
+#, fuzzy, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr "Mensagens etiquetadas com %s"
+
+#: actions/tag.php:86
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "Feed de mensagens de %s"
+
+#: actions/tag.php:92
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "Feed de mensagens de %s"
+
+#: actions/tag.php:98
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "Feed de mensagens de %s"
+
 #: actions/tagother.php:33
 msgid "Not logged in"
 msgstr "Você não está autenticado"
@@ -3697,26 +3718,6 @@ msgstr ""
 "Use esse formulário para adicionar etiquetas aos seus assinantes ou "
 "assinados."
 
-#: actions/tag.php:68
-#, fuzzy, php-format
-msgid "Notices tagged with %s, page %d"
-msgstr "Mensagens etiquetadas com %s"
-
-#: actions/tag.php:86
-#, fuzzy, php-format
-msgid "Notice feed for tag %s (RSS 1.0)"
-msgstr "Feed de mensagens de %s"
-
-#: actions/tag.php:92
-#, fuzzy, php-format
-msgid "Notice feed for tag %s (RSS 2.0)"
-msgstr "Feed de mensagens de %s"
-
-#: actions/tag.php:98
-#, fuzzy, php-format
-msgid "Notice feed for tag %s (Atom)"
-msgstr "Feed de mensagens de %s"
-
 #: actions/tagrss.php:35
 msgid "No such tag."
 msgstr "Essa etiqueta não existe."
@@ -4029,23 +4030,23 @@ msgstr "Não foi possível atualizar a mensagem com a nova URI."
 msgid "DB error inserting hashtag: %s"
 msgstr "Erro no banco de dados durante a inserção de hashtag: %s"
 
-#: classes/Notice.php:179
+#: classes/Notice.php:188
 #, fuzzy
 msgid "Problem saving notice. Too long."
 msgstr "Problema ao salvar a mensagem."
 
-#: classes/Notice.php:183
+#: classes/Notice.php:192
 msgid "Problem saving notice. Unknown user."
 msgstr "Problema no salvamento da mensagem. Usuário desconhecido."
 
-#: classes/Notice.php:188
+#: classes/Notice.php:197
 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:194
+#: classes/Notice.php:203
 #, fuzzy
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
@@ -4054,19 +4055,24 @@ msgstr ""
 "Muitas mensagens em um período curto de tempo; dê uma respirada e publique "
 "novamente daqui a alguns minutos."
 
-#: classes/Notice.php:200
+#: classes/Notice.php:209
 msgid "You are banned from posting notices on this site."
 msgstr "Você foi banido de publicar mensagens nesse site."
 
-#: classes/Notice.php:265 classes/Notice.php:290
+#: classes/Notice.php:274 classes/Notice.php:299
 msgid "Problem saving notice."
 msgstr "Problema ao salvar a mensagem."
 
-#: classes/Notice.php:1124
+#: classes/Notice.php:1115
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Erro no banco de dados na inserção da reposta: %s"
 
+#: classes/User.php:347
+#, fuzzy, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr "Mensagem para %1$s no %2$s"
+
 #: classes/User_group.php:380
 msgid "Could not create group."
 msgstr "Não foi possível criar o grupo."
@@ -4076,11 +4082,6 @@ msgstr "Não foi possível criar o grupo."
 msgid "Could not set group membership."
 msgstr "Não foi possível salvar a assinatura."
 
-#: classes/User.php:347
-#, fuzzy, php-format
-msgid "Welcome to %1$s, @%2$s!"
-msgstr "Mensagem para %1$s no %2$s"
-
 #: lib/accountsettingsaction.php:108
 msgid "Change your profile settings"
 msgstr "Alterar as suas configurações de perfil"
@@ -4401,7 +4402,7 @@ msgstr ""
 msgid "Notice with that id does not exist"
 msgstr ""
 
-#: lib/command.php:168 lib/command.php:416 lib/command.php:471
+#: lib/command.php:168 lib/command.php:416 lib/command.php:472
 msgid "User has no last notice"
 msgstr "O usuário não tem uma \"última mensagem\""
 
@@ -4450,102 +4451,102 @@ msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr ""
 "A mensagem é muito extensa - o máximo são 140 caracteres e você enviou %d"
 
-#: lib/command.php:439
+#: lib/command.php:440
 #, fuzzy, php-format
 msgid "Reply to %s sent"
 msgstr "Responder a esta mensagem"
 
-#: lib/command.php:441
+#: lib/command.php:442
 #, fuzzy
 msgid "Error saving notice."
 msgstr "Problema ao salvar a mensagem."
 
-#: lib/command.php:495
+#: lib/command.php:496
 msgid "Specify the name of the user to subscribe to"
 msgstr "Especifique o nome do usuário que será assinado"
 
-#: lib/command.php:502
+#: lib/command.php:503
 #, php-format
 msgid "Subscribed to %s"
 msgstr "Efetuada a assinatura de %s"
 
-#: lib/command.php:523
+#: lib/command.php:524
 msgid "Specify the name of the user to unsubscribe from"
 msgstr "Especifique o nome do usuário que deixará de ser assinado"
 
-#: lib/command.php:530
+#: lib/command.php:531
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr "Cancelada a assinatura de %s"
 
-#: lib/command.php:548 lib/command.php:571
+#: lib/command.php:549 lib/command.php:572
 msgid "Command not yet implemented."
 msgstr "O comando não foi implementado ainda."
 
-#: lib/command.php:551
+#: lib/command.php:552
 msgid "Notification off."
 msgstr "Notificação desligada."
 
-#: lib/command.php:553
+#: lib/command.php:554
 msgid "Can't turn off notification."
 msgstr "Não é possível desligar a notificação"
 
-#: lib/command.php:574
+#: lib/command.php:575
 msgid "Notification on."
 msgstr "Notificação ligada."
 
-#: lib/command.php:576
+#: lib/command.php:577
 msgid "Can't turn on notification."
 msgstr "Não é possível ligar a notificação."
 
-#: lib/command.php:588
+#: lib/command.php:590
 msgid "Login command is disabled"
 msgstr ""
 
-#: lib/command.php:602
+#: lib/command.php:604
 #, fuzzy, php-format
 msgid "Could not create login token for %s"
 msgstr "Não foi possível criar a favorita."
 
-#: lib/command.php:607
+#: lib/command.php:609
 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:623
+#: lib/command.php:625
 #, fuzzy
 msgid "You are not subscribed to anyone."
 msgstr "Você não está assinando esse perfil."
 
-#: lib/command.php:625
+#: lib/command.php:627
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Você já está assinando esses usuários:"
 msgstr[1] "Você já está assinando esses usuários:"
 
-#: lib/command.php:645
+#: lib/command.php:647
 #, fuzzy
 msgid "No one is subscribed to you."
 msgstr "Não foi possível fazer com que o outros o sigam."
 
-#: lib/command.php:647
+#: lib/command.php:649
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Não foi possível fazer com que o outros o sigam."
 msgstr[1] "Não foi possível fazer com que o outros o sigam."
 
-#: lib/command.php:667
+#: lib/command.php:669
 #, fuzzy
 msgid "You are not a member of any groups."
 msgstr "Você não está assinando esse perfil."
 
-#: lib/command.php:669
+#: lib/command.php:671
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Você não é membro deste grupo."
 msgstr[1] "Você não é membro deste grupo."
 
-#: lib/command.php:683
+#: lib/command.php:685
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -4645,10 +4646,6 @@ msgstr "Acrescentar às favoritas"
 msgid "Favor"
 msgstr "Tornar favorita"
 
-#: lib/feedlist.php:64
-msgid "Export data"
-msgstr "Exportar os dados"
-
 #: lib/feed.php:85
 msgid "RSS 1.0"
 msgstr ""
@@ -4665,6 +4662,10 @@ msgstr ""
 msgid "FOAF"
 msgstr ""
 
+#: lib/feedlist.php:64
+msgid "Export data"
+msgstr "Exportar os dados"
+
 #: lib/galleryaction.php:121
 msgid "Filter tags"
 msgstr "Filtrar etiquetas"
@@ -4826,21 +4827,6 @@ msgstr "Autentique-se com um nome de usuário e senha"
 msgid "Sign up for a new account"
 msgstr "Cadastre-se para uma nova conta"
 
-#: lib/mailbox.php:89
-msgid "Only the user can read their own mailboxes."
-msgstr "As caixas postais são legíveis somente pelo seu próprio usuário."
-
-#: lib/mailbox.php:139
-msgid ""
-"You have no private messages. You can send private message to engage other "
-"users in conversation. People can send you messages for your eyes only."
-msgstr ""
-
-#: lib/mailbox.php:227 lib/noticelist.php:452
-#, fuzzy
-msgid "from"
-msgstr " de "
-
 #: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Confirmação do endereço de e-mail"
@@ -5033,6 +5019,21 @@ msgid ""
 "\n"
 msgstr ""
 
+#: lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
+msgstr "As caixas postais são legíveis somente pelo seu próprio usuário."
+
+#: lib/mailbox.php:139
+msgid ""
+"You have no private messages. You can send private message to engage other "
+"users in conversation. People can send you messages for your eyes only."
+msgstr ""
+
+#: lib/mailbox.php:227 lib/noticelist.php:452
+#, fuzzy
+msgid "from"
+msgstr " de "
+
 #: lib/mediafile.php:98 lib/mediafile.php:123
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
@@ -5094,7 +5095,7 @@ msgstr "Enviar uma mensagem direta"
 msgid "To"
 msgstr "Para"
 
-#: lib/messageform.php:161 lib/noticeform.php:185
+#: lib/messageform.php:159 lib/noticeform.php:183
 msgid "Available characters"
 msgstr "Caracteres disponíveis"
 
@@ -5107,11 +5108,11 @@ msgstr "Enviar uma mensagem"
 msgid "What's up, %s?"
 msgstr "E aí, %s?"
 
-#: lib/noticeform.php:192
+#: lib/noticeform.php:190
 msgid "Attach"
 msgstr ""
 
-#: lib/noticeform.php:196
+#: lib/noticeform.php:194
 msgid "Attach a file"
 msgstr ""
 
@@ -5183,12 +5184,12 @@ msgstr "Erro na inserção do perfil remoto"
 msgid "Duplicate notice"
 msgstr "Excluir a mensagem"
 
-#: lib/oauthstore.php:467 lib/subs.php:48
+#: lib/oauthstore.php:466 lib/subs.php:48
 #, fuzzy
 msgid "You have been banned from subscribing."
 msgstr "Esse usuário bloqueou o seu pedido de assinatura."
 
-#: lib/oauthstore.php:492
+#: lib/oauthstore.php:491
 msgid "Couldn't insert new subscription."
 msgstr "Não foi possível inserir a nova assinatura."
 
@@ -5357,20 +5358,6 @@ msgstr "Assinantes de %s"
 msgid "Groups %s is a member of"
 msgstr "O grupo %s é membro de"
 
-#: 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/subscriptionlist.php:126
-msgid "(none)"
-msgstr "(nenhum)"
-
 #: lib/subs.php:52
 msgid "Already subscribed!"
 msgstr ""
@@ -5401,6 +5388,20 @@ msgstr "Não foi possível excluir a assinatura."
 msgid "Couldn't delete subscription."
 msgstr "Não foi possível excluir a assinatura."
 
+#: 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/subscriptionlist.php:126
+msgid "(none)"
+msgstr "(nenhum)"
+
 #: lib/tagcloudsection.php:56
 msgid "None"
 msgstr "Nenhuma"
diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po
index 713357714c..b8ed5d97a6 100644
--- a/locale/ru/LC_MESSAGES/statusnet.po
+++ b/locale/ru/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 21:25+0000\n"
-"PO-Revision-Date: 2009-12-07 21:27:20+0000\n"
+"POT-Creation-Date: 2009-12-12 17:09+0000\n"
+"PO-Revision-Date: 2009-12-12 17:10:25+0000\n"
 "Language-Team: Russian\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n"
+"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: out-statusnet\n"
@@ -29,11 +29,11 @@ msgstr "Нет такой страницы"
 
 #: actions/all.php:74 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofile.php:105
 #: actions/apiaccountupdateprofilebackgroundimage.php:116
-#: actions/apiaccountupdateprofileimage.php:105
-#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
-#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
-#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
+#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90
 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
@@ -46,7 +46,7 @@ msgstr "Нет такой страницы"
 #: actions/repliesrss.php:38 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38
 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
-#: lib/command.php:364 lib/command.php:411 lib/command.php:466
+#: lib/command.php:364 lib/command.php:411 lib/command.php:467
 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
 #: lib/subs.php:34 lib/subs.php:116
 msgid "No such user."
@@ -58,7 +58,7 @@ msgid "%s and friends, page %d"
 msgstr "%s и друзья, страница %d"
 
 #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
-#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100
+#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s и друзья"
@@ -116,24 +116,24 @@ msgstr ""
 msgid "You and friends"
 msgstr "Вы и друзья"
 
-#: actions/allrss.php:119 actions/apitimelinefriends.php:121
+#: actions/allrss.php:119 actions/apitimelinefriends.php:122
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Обновлено от %1$s и его друзей на %2$s!"
 
 #: actions/apiaccountratelimitstatus.php:70
 #: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofile.php:97
 #: actions/apiaccountupdateprofilebackgroundimage.php:94
 #: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apiaccountupdateprofile.php:97
 msgid "API method not found."
 msgstr "Метод API не найден."
 
 #: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofile.php:89
 #: actions/apiaccountupdateprofilebackgroundimage.php:86
 #: actions/apiaccountupdateprofilecolors.php:110
-#: actions/apiaccountupdateprofileimage.php:84
-#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
+#: actions/apiaccountupdateprofileimage.php:84 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
@@ -152,9 +152,22 @@ msgstr "Укажите параметр с именем 'device' и значен
 msgid "Could not update user."
 msgstr "Не удаётся обновить пользователя."
 
+#: actions/apiaccountupdateprofile.php:112
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+msgid "User has no profile."
+msgstr "У пользователя нет профиля."
+
+#: actions/apiaccountupdateprofile.php:147
+msgid "Could not save profile."
+msgstr "Не удаётся сохранить профиль."
+
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257
 #: actions/designadminpanel.php:122 actions/newnotice.php:94
 #: lib/designsettings.php:283
 #, php-format
@@ -177,19 +190,6 @@ msgstr "Не удаётся сохранить ваши настройки оф
 msgid "Could not update your design."
 msgstr "Не удаётся обновить ваше оформление."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
-#: actions/apiaccountupdateprofileimage.php:130
-#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
-#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
-msgid "User has no profile."
-msgstr "У пользователя нет профиля."
-
-#: actions/apiaccountupdateprofile.php:147
-msgid "Could not save profile."
-msgstr "Не удаётся сохранить профиль."
-
 #: actions/apiblockcreate.php:105
 msgid "You cannot block yourself!"
 msgstr "Вы не можете заблокировать самого себя!"
@@ -202,25 +202,6 @@ msgstr "Неудача при блокировке пользователя."
 msgid "Unblock user failed."
 msgstr "Неудача при разблокировке пользователя."
 
-#: actions/apidirectmessagenew.php:126
-msgid "No message text!"
-msgstr "Отсутствует текст сообщения!"
-
-#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
-#, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr "Слишком длинно. Максимальная длина сообщения — %d знаков."
-
-#: actions/apidirectmessagenew.php:146
-msgid "Recipient user not found."
-msgstr "Получатель не найден."
-
-#: actions/apidirectmessagenew.php:150
-msgid "Can't send direct messages to users who aren't your friend."
-msgstr ""
-"Не удаётся посылать прямые сообщения пользователям, которые не являются "
-"Вашими друзьями."
-
 #: actions/apidirectmessage.php:89
 #, php-format
 msgid "Direct messages from %s"
@@ -246,18 +227,37 @@ msgstr "Все прямые сообщения посланные для %s"
 #: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
-#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
-#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149
-#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
-#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156
+#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151
+#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141
+#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
 msgid "API method not found!"
 msgstr "Метод API не найден!"
 
+#: actions/apidirectmessagenew.php:126
+msgid "No message text!"
+msgstr "Отсутствует текст сообщения!"
+
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "Слишком длинно. Максимальная длина сообщения — %d знаков."
+
+#: actions/apidirectmessagenew.php:146
+msgid "Recipient user not found."
+msgstr "Получатель не найден."
+
+#: actions/apidirectmessagenew.php:150
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr ""
+"Не удаётся посылать прямые сообщения пользователям, которые не являются "
+"Вашими друзьями."
+
 #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
 #: actions/apistatusesdestroy.php:113
 msgid "No status found with that ID."
@@ -405,16 +405,6 @@ msgstr "Вы не являетесь членом этой группы."
 msgid "Could not remove user %s to group %s."
 msgstr "Не удаётся удалить пользователя %s из группы %s."
 
-#: actions/apigrouplistall.php:90 actions/usergroups.php:62
-#, php-format
-msgid "%s groups"
-msgstr "Группы %s"
-
-#: actions/apigrouplistall.php:94
-#, php-format
-msgid "groups on %s"
-msgstr "группы на %s"
-
 #: actions/apigrouplist.php:95
 #, php-format
 msgid "%s's groups"
@@ -425,6 +415,16 @@ msgstr "Группы %s"
 msgid "Groups %s is a member of on %s."
 msgstr "Группы, в которых состоит %s на %s."
 
+#: actions/apigrouplistall.php:90 actions/usergroups.php:62
+#, php-format
+msgid "%s groups"
+msgstr "Группы %s"
+
+#: actions/apigrouplistall.php:94
+#, php-format
+msgid "groups on %s"
+msgstr "группы на %s"
+
 #: actions/apistatusesdestroy.php:107
 msgid "This method requires a POST or DELETE."
 msgstr "Этот метод требует POST или DELETE."
@@ -460,54 +460,54 @@ msgstr "Максимальная длина записи — %d символов
 msgid "Unsupported format."
 msgstr "Неподдерживаемый формат."
 
-#: actions/apitimelinefavorites.php:107
+#: actions/apitimelinefavorites.php:108
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr "%s / Любимое от %s"
 
-#: actions/apitimelinefavorites.php:119
+#: actions/apitimelinefavorites.php:120
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr "%s обновлённые любимые записи от %s / %s."
 
-#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117
+#: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118
 #: actions/grouprss.php:131 actions/userrss.php:90
 #, php-format
 msgid "%s timeline"
 msgstr "Лента %s"
 
-#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125
+#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
 #: actions/userrss.php:92
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Обновлено от %1$s на %2$s!"
 
-#: actions/apitimelinementions.php:116
+#: actions/apitimelinementions.php:117
 #, php-format
 msgid "%1$s / Updates mentioning %2$s"
 msgstr "%1$s / Обновления, упоминающие %2$s"
 
-#: actions/apitimelinementions.php:126
+#: actions/apitimelinementions.php:127
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s обновил этот ответ на сообщение: %2$s / %3$s."
 
-#: actions/apitimelinepublic.php:106 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "Общая лента %s"
 
-#: actions/apitimelinepublic.php:110 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "Обновления %s от всех!"
 
-#: actions/apitimelinetag.php:101 actions/tag.php:66
+#: actions/apitimelinetag.php:102 actions/tag.php:66
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Записи с тегом %s"
 
-#: actions/apitimelinetag.php:107 actions/tagrss.php:64
+#: actions/apitimelinetag.php:108 actions/tagrss.php:64
 #, php-format
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Обновления с тегом %1$s на %2$s!"
@@ -543,45 +543,45 @@ msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr ""
 "Вы можете загрузить свою аватару. Максимальный размер файла составляет %s."
 
-#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:185
 #: actions/grouplogo.php:178 actions/remotesubscribe.php:191
 #: actions/userauthorization.php:72 actions/userrss.php:103
 msgid "User without matching profile"
 msgstr "Пользователь без соответствующего профиля"
 
-#: actions/avatarsettings.php:119 actions/avatarsettings.php:194
+#: actions/avatarsettings.php:119 actions/avatarsettings.php:197
 #: actions/grouplogo.php:251
 msgid "Avatar settings"
 msgstr "Настройки аватары"
 
-#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/avatarsettings.php:127 actions/avatarsettings.php:205
 #: actions/grouplogo.php:199 actions/grouplogo.php:259
 msgid "Original"
 msgstr "Оригинал"
 
-#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/avatarsettings.php:142 actions/avatarsettings.php:217
 #: actions/grouplogo.php:210 actions/grouplogo.php:271
 msgid "Preview"
 msgstr "Просмотр"
 
-#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
+#: actions/avatarsettings.php:149 lib/deleteuserform.php:66
 #: lib/noticelist.php:550
 msgid "Delete"
 msgstr "Удалить"
 
-#: actions/avatarsettings.php:165 actions/grouplogo.php:233
+#: actions/avatarsettings.php:166 actions/grouplogo.php:233
 msgid "Upload"
 msgstr "Загрузить"
 
-#: actions/avatarsettings.php:228 actions/grouplogo.php:286
+#: actions/avatarsettings.php:231 actions/grouplogo.php:286
 msgid "Crop"
 msgstr "Обрезать"
 
-#: actions/avatarsettings.php:265 actions/disfavor.php:74
+#: actions/avatarsettings.php:268 actions/disfavor.php:74
 #: actions/emailsettings.php:238 actions/favor.php:75
 #: actions/groupblock.php:66 actions/grouplogo.php:309
 #: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -592,73 +592,33 @@ msgstr "Обрезать"
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Проблема с Вашей сессией. Попробуйте ещё раз, пожалуйста."
 
-#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
+#: actions/avatarsettings.php:281 actions/designadminpanel.php:103
 #: actions/emailsettings.php:256 actions/grouplogo.php:319
 #: actions/imsettings.php:220 actions/recoverpassword.php:44
 #: actions/smssettings.php:248 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "Нетиповое подтверждение формы."
 
-#: actions/avatarsettings.php:322
+#: actions/avatarsettings.php:328
 msgid "Pick a square area of the image to be your avatar"
 msgstr "Подберите нужный квадратный участок для вашей аватары"
 
-#: actions/avatarsettings.php:337 actions/grouplogo.php:377
+#: actions/avatarsettings.php:343 actions/grouplogo.php:377
 msgid "Lost our file data."
 msgstr "Потеряна информация о файле."
 
-#: actions/avatarsettings.php:360
+#: actions/avatarsettings.php:366
 msgid "Avatar updated."
 msgstr "Аватара обновлена."
 
-#: actions/avatarsettings.php:363
+#: actions/avatarsettings.php:369
 msgid "Failed updating avatar."
 msgstr "Неудача при обновлении аватары."
 
-#: actions/avatarsettings.php:387
+#: actions/avatarsettings.php:393
 msgid "Avatar deleted."
 msgstr "Аватара удалена."
 
-#: actions/blockedfromgroup.php:73 actions/editgroup.php:84
-#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
-#: actions/groupmembers.php:76 actions/grouprss.php:91
-#: actions/joingroup.php:76 actions/showgroup.php:121
-msgid "No nickname"
-msgstr "Нет названия группы"
-
-#: actions/blockedfromgroup.php:80 actions/editgroup.php:96
-#: actions/groupbyid.php:83 actions/groupdesignsettings.php:97
-#: actions/grouplogo.php:99 actions/groupmembers.php:83
-#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
-msgid "No such group"
-msgstr "Нет такой группы"
-
-#: actions/blockedfromgroup.php:90
-#, php-format
-msgid "%s blocked profiles"
-msgstr "Заблокированные профили %s"
-
-#: actions/blockedfromgroup.php:93
-#, php-format
-msgid "%s blocked profiles, page %d"
-msgstr "Заблокированные профили %s, страница %d"
-
-#: 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/blockedfromgroup.php:313 lib/unblockform.php:69
-msgid "Unblock"
-msgstr "Разблокировать"
-
-#: actions/blockedfromgroup.php:313 lib/unblockform.php:80
-msgid "Unblock this user"
-msgstr "Разблокировать пользователя."
-
 #: actions/block.php:69
 msgid "You already blocked that user."
 msgstr "Вы уже заблокировали этого пользователя."
@@ -699,6 +659,46 @@ msgstr "Заблокировать пользователя."
 msgid "Failed to save block information."
 msgstr "Не удаётся сохранить информацию о блокировании."
 
+#: actions/blockedfromgroup.php:73 actions/editgroup.php:84
+#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
+#: actions/groupmembers.php:76 actions/grouprss.php:91
+#: actions/joingroup.php:76 actions/showgroup.php:121
+msgid "No nickname"
+msgstr "Нет названия группы"
+
+#: actions/blockedfromgroup.php:80 actions/editgroup.php:96
+#: actions/groupbyid.php:83 actions/groupdesignsettings.php:97
+#: actions/grouplogo.php:99 actions/groupmembers.php:83
+#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
+msgid "No such group"
+msgstr "Нет такой группы"
+
+#: actions/blockedfromgroup.php:90
+#, php-format
+msgid "%s blocked profiles"
+msgstr "Заблокированные профили %s"
+
+#: actions/blockedfromgroup.php:93
+#, php-format
+msgid "%s blocked profiles, page %d"
+msgstr "Заблокированные профили %s, страница %d"
+
+#: 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/blockedfromgroup.php:313 lib/unblockform.php:69
+msgid "Unblock"
+msgstr "Разблокировать"
+
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:80
+msgid "Unblock this user"
+msgstr "Разблокировать пользователя."
+
 #: actions/bookmarklet.php:50
 msgid "Post to "
 msgstr "Отправить в "
@@ -1045,7 +1045,8 @@ msgstr "Входящий электронный адрес"
 
 #: actions/emailsettings.php:138 actions/smssettings.php:157
 msgid "Send email to this address to post new notices."
-msgstr "Посылать электронные письма на этот адрес для постинга новых записей."
+msgstr ""
+"Отправляйте электронные письма на этот адрес для отсылки новых записей."
 
 #: actions/emailsettings.php:145 actions/smssettings.php:162
 msgid "Make a new email address for posting to; cancels the old one."
@@ -1176,6 +1177,14 @@ msgstr "Входящий электронный адрес удалён."
 msgid "New incoming email address added."
 msgstr "Новый входящий электронный адрес добавлен."
 
+#: actions/favor.php:79
+msgid "This notice is already a favorite!"
+msgstr "Эта запись уже входит в число любимых!"
+
+#: actions/favor.php:92 lib/disfavorform.php:140
+msgid "Disfavor favorite"
+msgstr "Разлюбить"
+
 #: actions/favorited.php:65 lib/popularnoticesection.php:88
 #: lib/publicgroupnav.php:93
 msgid "Popular notices"
@@ -1224,14 +1233,6 @@ msgstr "Любимые записи %s"
 msgid "Updates favored by %1$s on %2$s!"
 msgstr "Обновления, понравившиеся %1$s на %2$s!"
 
-#: actions/favor.php:79
-msgid "This notice is already a favorite!"
-msgstr "Эта запись уже входит в число любимых!"
-
-#: actions/favor.php:92 lib/disfavorform.php:140
-msgid "Disfavor favorite"
-msgstr "Разлюбить"
-
 #: actions/featured.php:69 lib/featureduserssection.php:87
 #: lib/publicgroupnav.php:89
 msgid "Featured users"
@@ -1463,6 +1464,35 @@ msgstr "Сделать этого пользователя администра
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "Обновления участников %1$s на %2$s!"
 
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+msgid "Groups"
+msgstr "Группы"
+
+#: actions/groups.php:64
+#, php-format
+msgid "Groups, page %d"
+msgstr "Группы, страница %d"
+
+#: actions/groups.php:90
+#, php-format
+msgid ""
+"%%%%site.name%%%% groups let you find and talk with people of similar "
+"interests. After you join a group you can send messages to all other members "
+"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
+"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
+"%%%%)"
+msgstr ""
+"Группы на сайте %%%%site.name%%%% позволяют искать и общаться с людьми с "
+"общими интересами. После присоединения к группе и вы сможете отправлять "
+"сообщения до всех её участников, используя команду «!имягруппы». Не видите "
+"группу, которая вас интересует? Попробуйте [найти её](%%%%action.groupsearch%"
+"%%%) или [создайте собственную!](%%%%action.newgroup%%%%)"
+
+#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
+msgid "Create a new group"
+msgstr "Создать новую группу"
+
 #: actions/groupsearch.php:52
 #, php-format
 msgid ""
@@ -1499,35 +1529,6 @@ msgstr ""
 "Почему бы не [зарегистрироваться](%%action.register%%), чтобы [создать "
 "группу](%%action.newgroup%%) самому?"
 
-#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
-msgid "Groups"
-msgstr "Группы"
-
-#: actions/groups.php:64
-#, php-format
-msgid "Groups, page %d"
-msgstr "Группы, страница %d"
-
-#: actions/groups.php:90
-#, php-format
-msgid ""
-"%%%%site.name%%%% groups let you find and talk with people of similar "
-"interests. After you join a group you can send messages to all other members "
-"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
-"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
-"%%%%)"
-msgstr ""
-"Группы на сайте %%%%site.name%%%% позволяют искать и общаться с людьми с "
-"общими интересами. После присоединения к группе и вы сможете отправлять "
-"сообщения до всех её участников, используя команду «!имягруппы». Не видите "
-"группу, которая вас интересует? Попробуйте [найти её](%%%%action.groupsearch%"
-"%%%) или [создайте собственную!](%%%%action.newgroup%%%%)"
-
-#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
-msgid "Create a new group"
-msgstr "Создать новую группу"
-
 #: actions/groupunblock.php:91
 msgid "Only an admin can unblock group members."
 msgstr "Только администратор может разблокировать участников группы."
@@ -1723,7 +1724,7 @@ msgstr "Личное сообщение"
 msgid "Optionally add a personal message to the invitation."
 msgstr "Можно добавить к приглашению личное сообщение."
 
-#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:222
 msgid "Send"
 msgstr "ОК"
 
@@ -1829,55 +1830,55 @@ msgstr "Не удаётся удалить пользователя %s из гр
 msgid "%s left group %s"
 msgstr "%s покинул группу %s"
 
-#: actions/login.php:82 actions/register.php:137
+#: actions/login.php:83 actions/register.php:137
 msgid "Already logged in."
 msgstr "Вы уже авторизовались."
 
-#: actions/login.php:113 actions/login.php:123
+#: actions/login.php:114 actions/login.php:124
 msgid "Invalid or expired token."
 msgstr "Неверный или устаревший ключ."
 
-#: actions/login.php:146
+#: actions/login.php:147
 msgid "Incorrect username or password."
 msgstr "Некорректное имя или пароль."
 
-#: actions/login.php:152
+#: actions/login.php:153
 msgid "Error setting user. You are probably not authorized."
 msgstr "Ошибка установки пользователя. Вы, вероятно, не авторизованы."
 
-#: actions/login.php:207 actions/login.php:260 lib/action.php:458
+#: actions/login.php:208 actions/login.php:261 lib/action.php:458
 #: lib/logingroupnav.php:79
 msgid "Login"
 msgstr "Вход"
 
-#: actions/login.php:246
+#: actions/login.php:247
 msgid "Login to site"
 msgstr "Авторизоваться"
 
-#: actions/login.php:249 actions/profilesettings.php:106
+#: actions/login.php:250 actions/profilesettings.php:106
 #: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
 #: lib/groupeditform.php:152 lib/userprofile.php:131
 msgid "Nickname"
 msgstr "Имя"
 
-#: actions/login.php:252 actions/register.php:428
+#: actions/login.php:253 actions/register.php:428
 #: lib/accountsettingsaction.php:116
 msgid "Password"
 msgstr "Пароль"
 
-#: actions/login.php:255 actions/register.php:477
+#: actions/login.php:256 actions/register.php:477
 msgid "Remember me"
 msgstr "Запомнить меня"
 
-#: actions/login.php:256 actions/register.php:479
+#: actions/login.php:257 actions/register.php:479
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Автоматическии входить в дальнейшем. Не для общедоступных компьютеров!"
 
-#: actions/login.php:266
+#: actions/login.php:267
 msgid "Lost or forgotten password?"
 msgstr "Потеряли или забыли пароль?"
 
-#: actions/login.php:285
+#: actions/login.php:286
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -1885,7 +1886,7 @@ msgstr ""
 "По причинам сохранения безопасности введите имя и пароль ещё раз, прежде чем "
 "изменять Ваши установки."
 
-#: actions/login.php:289
+#: actions/login.php:290
 #, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -1957,7 +1958,7 @@ msgstr "Сообщение отправлено"
 msgid "Direct message to %s sent"
 msgstr "Прямое сообщение для %s послано"
 
-#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:242 lib/channel.php:170
 msgid "Ajax Error"
 msgstr "Ошибка AJAX"
 
@@ -1965,7 +1966,7 @@ msgstr "Ошибка AJAX"
 msgid "New notice"
 msgstr "Новая запись"
 
-#: actions/newnotice.php:206
+#: actions/newnotice.php:208
 msgid "Notice posted"
 msgstr "Запись опубликована"
 
@@ -2047,8 +2048,8 @@ msgstr "тип содержимого "
 msgid "Only "
 msgstr "Только "
 
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996
-#: lib/api.php:1024 lib/api.php:1134
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011
+#: lib/api.php:1039 lib/api.php:1149
 msgid "Not a supported data format."
 msgstr "Неподдерживаемый формат данных."
 
@@ -3632,6 +3633,26 @@ msgstr "Jabber"
 msgid "SMS"
 msgstr "СМС"
 
+#: actions/tag.php:68
+#, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr "Записи с тегом %s, страница %d"
+
+#: actions/tag.php:86
+#, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "Лента записей для тега %s (RSS 1.0)"
+
+#: actions/tag.php:92
+#, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "Лента записей для тега %s (RSS 2.0)"
+
+#: actions/tag.php:98
+#, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "Лента записей для тега %s (Atom)"
+
 #: actions/tagother.php:33
 msgid "Not logged in"
 msgstr "Не авторизовано"
@@ -3681,26 +3702,6 @@ msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 "Используйте эту форму для добавления тегов Вашим подписчикам или подписантам."
 
-#: actions/tag.php:68
-#, php-format
-msgid "Notices tagged with %s, page %d"
-msgstr "Записи с тегом %s, страница %d"
-
-#: actions/tag.php:86
-#, php-format
-msgid "Notice feed for tag %s (RSS 1.0)"
-msgstr "Лента записей для тега %s (RSS 1.0)"
-
-#: actions/tag.php:92
-#, php-format
-msgid "Notice feed for tag %s (RSS 2.0)"
-msgstr "Лента записей для тега %s (RSS 2.0)"
-
-#: actions/tag.php:98
-#, php-format
-msgid "Notice feed for tag %s (Atom)"
-msgstr "Лента записей для тега %s (Atom)"
-
 #: actions/tagrss.php:35
 msgid "No such tag."
 msgstr "Нет такого тега."
@@ -4003,22 +4004,22 @@ msgstr "Не удаётся обновить сообщение с новым UR
 msgid "DB error inserting hashtag: %s"
 msgstr "Ошибка баз данных при вставке хеш-тегов для %s"
 
-#: classes/Notice.php:179
+#: classes/Notice.php:188
 msgid "Problem saving notice. Too long."
 msgstr "Проблемы с сохранением записи. Слишком длинно."
 
-#: classes/Notice.php:183
+#: classes/Notice.php:192
 msgid "Problem saving notice. Unknown user."
 msgstr "Проблема при сохранении записи. Неизвестный пользователь."
 
-#: classes/Notice.php:188
+#: classes/Notice.php:197
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 "Слишком много записей за столь короткий срок; передохните немного и "
 "попробуйте вновь через пару минут."
 
-#: classes/Notice.php:194
+#: classes/Notice.php:203
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
@@ -4026,19 +4027,24 @@ msgstr ""
 "Слишком много одинаковых записей за столь короткий срок; передохните немного "
 "и попробуйте вновь через пару минут."
 
-#: classes/Notice.php:200
+#: classes/Notice.php:209
 msgid "You are banned from posting notices on this site."
 msgstr "Вам запрещено поститься на этом сайте (бан)"
 
-#: classes/Notice.php:265 classes/Notice.php:290
+#: classes/Notice.php:274 classes/Notice.php:299
 msgid "Problem saving notice."
 msgstr "Проблемы с сохранением записи."
 
-#: classes/Notice.php:1124
+#: classes/Notice.php:1115
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Ошибка баз данных при вставке ответа для %s"
 
+#: classes/User.php:347
+#, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr "Добро пожаловать на %1$s, @%2$s!"
+
 #: classes/User_group.php:380
 msgid "Could not create group."
 msgstr "Не удаётся создать группу."
@@ -4047,11 +4053,6 @@ msgstr "Не удаётся создать группу."
 msgid "Could not set group membership."
 msgstr "Не удаётся назначить членство в группе."
 
-#: classes/User.php:347
-#, php-format
-msgid "Welcome to %1$s, @%2$s!"
-msgstr "Добро пожаловать на %1$s, @%2$s!"
-
 #: lib/accountsettingsaction.php:108
 msgid "Change your profile settings"
 msgstr "Изменить ваши настройки профиля"
@@ -4357,7 +4358,7 @@ msgstr ""
 msgid "Notice with that id does not exist"
 msgstr "Записи с таким id не существует"
 
-#: lib/command.php:168 lib/command.php:416 lib/command.php:471
+#: lib/command.php:168 lib/command.php:416 lib/command.php:472
 msgid "User has no last notice"
 msgstr "У пользователя нет записей"
 
@@ -4404,102 +4405,101 @@ msgstr "Ошибка при отправке прямого сообщения."
 msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr "Запись слишком длинная — не больше %d символов, вы посылаете %d"
 
-#: lib/command.php:439
+#: lib/command.php:440
 #, php-format
 msgid "Reply to %s sent"
 msgstr "Ответ %s отправлен"
 
-#: lib/command.php:441
+#: lib/command.php:442
 msgid "Error saving notice."
 msgstr "Проблемы с сохранением записи."
 
-#: lib/command.php:495
+#: lib/command.php:496
 msgid "Specify the name of the user to subscribe to"
 msgstr "Определите имя пользователя при подписке на"
 
-#: lib/command.php:502
+#: lib/command.php:503
 #, php-format
 msgid "Subscribed to %s"
 msgstr "Подписано на %s"
 
-#: lib/command.php:523
+#: lib/command.php:524
 msgid "Specify the name of the user to unsubscribe from"
 msgstr "Определите имя пользователя для отписки от"
 
-#: lib/command.php:530
+#: lib/command.php:531
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr "Отписано от %s"
 
-#: lib/command.php:548 lib/command.php:571
+#: lib/command.php:549 lib/command.php:572
 msgid "Command not yet implemented."
 msgstr "Команда ещё не выполнена."
 
-#: lib/command.php:551
+#: lib/command.php:552
 msgid "Notification off."
 msgstr "Оповещение отсутствует."
 
-#: lib/command.php:553
+#: lib/command.php:554
 msgid "Can't turn off notification."
 msgstr "Нет оповещения."
 
-#: lib/command.php:574
+#: lib/command.php:575
 msgid "Notification on."
 msgstr "Есть оповещение."
 
-#: lib/command.php:576
+#: lib/command.php:577
 msgid "Can't turn on notification."
 msgstr "Есть оповещение."
 
-#: lib/command.php:588
+#: lib/command.php:590
 msgid "Login command is disabled"
-msgstr ""
+msgstr "Команда входа отключена"
 
-#: lib/command.php:602
-#, fuzzy, php-format
+#: lib/command.php:604
+#, php-format
 msgid "Could not create login token for %s"
-msgstr "Не удаётся создать алиасы."
+msgstr "Не удаётся создать токен входа для %s"
 
-#: lib/command.php:607
+#: lib/command.php:609
 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
-msgstr ""
+msgstr "Эта ссылка действительна только один раз в течение 2 минут: %s"
 
-#: lib/command.php:623
+#: lib/command.php:625
 msgid "You are not subscribed to anyone."
 msgstr "Вы ни на кого не подписаны."
 
-#: lib/command.php:625
+#: lib/command.php:627
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Вы подписаны на этих людей:"
 msgstr[1] "Вы подписаны на этих людей:"
 msgstr[2] "Вы подписаны на этих людей:"
 
-#: lib/command.php:645
+#: lib/command.php:647
 msgid "No one is subscribed to you."
 msgstr "Никто не подписан на вас."
 
-#: lib/command.php:647
+#: lib/command.php:649
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Эти люди подписались на вас:"
 msgstr[1] "Эти люди подписались на вас:"
 msgstr[2] "Эти люди подписались на вас:"
 
-#: lib/command.php:667
+#: lib/command.php:669
 msgid "You are not a member of any groups."
 msgstr "Вы не состоите ни в одной группе."
 
-#: lib/command.php:669
+#: lib/command.php:671
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Вы являетесь участником следующих групп:"
 msgstr[1] "Вы являетесь участником следующих групп:"
 msgstr[2] "Вы являетесь участником следующих групп:"
 
-#: lib/command.php:683
-#, fuzzy
+#: lib/command.php:685
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -4554,6 +4554,7 @@ msgstr ""
 "reply #<notice_id> — ответить на запись с заданным id\n"
 "reply <nickname> — ответить на последнюю запись пользователя\n"
 "join <group> — присоединиться к группе\n"
+"login — получить ссылку на вход в веб-интрефейсе\n"
 "drop <group> — покинуть группу\n"
 "stats — получить свою статистику\n"
 "stop — то же, что и 'off'\n"
@@ -4631,10 +4632,6 @@ msgstr "Мне нравится эта запись"
 msgid "Favor"
 msgstr "Пометить"
 
-#: lib/feedlist.php:64
-msgid "Export data"
-msgstr "Экспорт потока записей"
-
 #: lib/feed.php:85
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
@@ -4651,6 +4648,10 @@ msgstr "Atom"
 msgid "FOAF"
 msgstr "FOAF"
 
+#: lib/feedlist.php:64
+msgid "Export data"
+msgstr "Экспорт потока записей"
+
 #: lib/galleryaction.php:121
 msgid "Filter tags"
 msgstr "Фильтровать теги"
@@ -4811,23 +4812,6 @@ msgstr "Войти с вашим ником и паролем."
 msgid "Sign up for a new account"
 msgstr "Создать новый аккаунт"
 
-#: lib/mailbox.php:89
-msgid "Only the user can read their own mailboxes."
-msgstr "Только сам пользователь может читать собственный почтовый ящик."
-
-#: lib/mailbox.php:139
-msgid ""
-"You have no private messages. You can send private message to engage other "
-"users in conversation. People can send you messages for your eyes only."
-msgstr ""
-"У вас нет личных сообщений. Вы можете отправить личное сообщение для "
-"вовлечения других пользователей в разговор. Сообщения, получаемые от других "
-"людей, видите только вы."
-
-#: lib/mailbox.php:227 lib/noticelist.php:452
-msgid "from"
-msgstr "от "
-
 #: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Подтверждение электронного адреса"
@@ -5089,6 +5073,23 @@ msgstr ""
 "%4$s\n"
 "\n"
 
+#: lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
+msgstr "Только сам пользователь может читать собственный почтовый ящик."
+
+#: lib/mailbox.php:139
+msgid ""
+"You have no private messages. You can send private message to engage other "
+"users in conversation. People can send you messages for your eyes only."
+msgstr ""
+"У вас нет личных сообщений. Вы можете отправить личное сообщение для "
+"вовлечения других пользователей в разговор. Сообщения, получаемые от других "
+"людей, видите только вы."
+
+#: lib/mailbox.php:227 lib/noticelist.php:452
+msgid "from"
+msgstr "от "
+
 #: lib/mediafile.php:98 lib/mediafile.php:123
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
@@ -5152,7 +5153,7 @@ msgstr "Послать прямую запись"
 msgid "To"
 msgstr "Для"
 
-#: lib/messageform.php:161 lib/noticeform.php:185
+#: lib/messageform.php:159 lib/noticeform.php:183
 msgid "Available characters"
 msgstr "6 или больше знаков"
 
@@ -5165,11 +5166,11 @@ msgstr "Послать запись"
 msgid "What's up, %s?"
 msgstr "Что нового, %s?"
 
-#: lib/noticeform.php:192
+#: lib/noticeform.php:190
 msgid "Attach"
 msgstr "Прикрепить"
 
-#: lib/noticeform.php:196
+#: lib/noticeform.php:194
 msgid "Attach a file"
 msgstr "Прикрепить файл"
 
@@ -5238,11 +5239,11 @@ msgstr "Ошибка вставки удалённого профиля"
 msgid "Duplicate notice"
 msgstr "Дублировать запись"
 
-#: lib/oauthstore.php:467 lib/subs.php:48
+#: lib/oauthstore.php:466 lib/subs.php:48
 msgid "You have been banned from subscribing."
 msgstr "Вы заблокированы от подписки."
 
-#: lib/oauthstore.php:492
+#: lib/oauthstore.php:491
 msgid "Couldn't insert new subscription."
 msgstr "Не удаётся вставить новую подписку."
 
@@ -5402,20 +5403,6 @@ msgstr "Люди подписанные на %s"
 msgid "Groups %s is a member of"
 msgstr "Группы, в которых состоит %s"
 
-#: lib/subscriberspeopleselftagcloudsection.php:48
-#: lib/subscriptionspeopleselftagcloudsection.php:48
-msgid "People Tagcloud as self-tagged"
-msgstr "Облако собственных тегов людей"
-
-#: lib/subscriberspeopletagcloudsection.php:48
-#: lib/subscriptionspeopletagcloudsection.php:48
-msgid "People Tagcloud as tagged"
-msgstr "Облако тегов людей"
-
-#: lib/subscriptionlist.php:126
-msgid "(none)"
-msgstr "(пока ничего нет)"
-
 #: lib/subs.php:52
 msgid "Already subscribed!"
 msgstr "Уже подписаны!"
@@ -5444,6 +5431,20 @@ msgstr "Невозможно удалить самоподписку."
 msgid "Couldn't delete subscription."
 msgstr "Не удаётся удалить подписку."
 
+#: lib/subscriberspeopleselftagcloudsection.php:48
+#: lib/subscriptionspeopleselftagcloudsection.php:48
+msgid "People Tagcloud as self-tagged"
+msgstr "Облако собственных тегов людей"
+
+#: lib/subscriberspeopletagcloudsection.php:48
+#: lib/subscriptionspeopletagcloudsection.php:48
+msgid "People Tagcloud as tagged"
+msgstr "Облако тегов людей"
+
+#: lib/subscriptionlist.php:126
+msgid "(none)"
+msgstr "(пока ничего нет)"
+
 #: lib/tagcloudsection.php:56
 msgid "None"
 msgstr "Нет тегов"
diff --git a/locale/statusnet.po b/locale/statusnet.po
index dce6f6551c..50510715f6 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-12-07 21:25+0000\n"
+"POT-Creation-Date: 2009-12-12 17:09+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"
@@ -24,11 +24,11 @@ msgstr ""
 
 #: actions/all.php:74 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofile.php:105
 #: actions/apiaccountupdateprofilebackgroundimage.php:116
-#: actions/apiaccountupdateprofileimage.php:105
-#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
-#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
-#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
+#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90
 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
@@ -41,7 +41,7 @@ msgstr ""
 #: actions/repliesrss.php:38 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38
 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
-#: lib/command.php:364 lib/command.php:411 lib/command.php:466
+#: lib/command.php:364 lib/command.php:411 lib/command.php:467
 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
 #: lib/subs.php:34 lib/subs.php:116
 msgid "No such user."
@@ -53,7 +53,7 @@ msgid "%s and friends, page %d"
 msgstr ""
 
 #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
-#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100
+#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr ""
@@ -104,24 +104,24 @@ msgstr ""
 msgid "You and friends"
 msgstr ""
 
-#: actions/allrss.php:119 actions/apitimelinefriends.php:121
+#: actions/allrss.php:119 actions/apitimelinefriends.php:122
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr ""
 
 #: actions/apiaccountratelimitstatus.php:70
 #: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofile.php:97
 #: actions/apiaccountupdateprofilebackgroundimage.php:94
 #: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apiaccountupdateprofile.php:97
 msgid "API method not found."
 msgstr ""
 
 #: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofile.php:89
 #: actions/apiaccountupdateprofilebackgroundimage.php:86
 #: actions/apiaccountupdateprofilecolors.php:110
-#: actions/apiaccountupdateprofileimage.php:84
-#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
+#: actions/apiaccountupdateprofileimage.php:84 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
@@ -140,9 +140,22 @@ msgstr ""
 msgid "Could not update user."
 msgstr ""
 
+#: actions/apiaccountupdateprofile.php:112
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+msgid "User has no profile."
+msgstr ""
+
+#: actions/apiaccountupdateprofile.php:147
+msgid "Could not save profile."
+msgstr ""
+
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257
 #: actions/designadminpanel.php:122 actions/newnotice.php:94
 #: lib/designsettings.php:283
 #, php-format
@@ -163,19 +176,6 @@ msgstr ""
 msgid "Could not update your design."
 msgstr ""
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
-#: actions/apiaccountupdateprofileimage.php:130
-#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
-#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
-msgid "User has no profile."
-msgstr ""
-
-#: actions/apiaccountupdateprofile.php:147
-msgid "Could not save profile."
-msgstr ""
-
 #: actions/apiblockcreate.php:105
 msgid "You cannot block yourself!"
 msgstr ""
@@ -188,23 +188,6 @@ msgstr ""
 msgid "Unblock user failed."
 msgstr ""
 
-#: actions/apidirectmessagenew.php:126
-msgid "No message text!"
-msgstr ""
-
-#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
-#, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr ""
-
-#: actions/apidirectmessagenew.php:146
-msgid "Recipient user not found."
-msgstr ""
-
-#: actions/apidirectmessagenew.php:150
-msgid "Can't send direct messages to users who aren't your friend."
-msgstr ""
-
 #: actions/apidirectmessage.php:89
 #, php-format
 msgid "Direct messages from %s"
@@ -230,18 +213,35 @@ msgstr ""
 #: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
-#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
-#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149
-#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
-#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156
+#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151
+#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141
+#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
 msgid "API method not found!"
 msgstr ""
 
+#: actions/apidirectmessagenew.php:126
+msgid "No message text!"
+msgstr ""
+
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr ""
+
+#: actions/apidirectmessagenew.php:146
+msgid "Recipient user not found."
+msgstr ""
+
+#: actions/apidirectmessagenew.php:150
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr ""
+
 #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
 #: actions/apistatusesdestroy.php:113
 msgid "No status found with that ID."
@@ -384,16 +384,6 @@ msgstr ""
 msgid "Could not remove user %s to group %s."
 msgstr ""
 
-#: actions/apigrouplistall.php:90 actions/usergroups.php:62
-#, php-format
-msgid "%s groups"
-msgstr ""
-
-#: actions/apigrouplistall.php:94
-#, php-format
-msgid "groups on %s"
-msgstr ""
-
 #: actions/apigrouplist.php:95
 #, php-format
 msgid "%s's groups"
@@ -404,6 +394,16 @@ msgstr ""
 msgid "Groups %s is a member of on %s."
 msgstr ""
 
+#: actions/apigrouplistall.php:90 actions/usergroups.php:62
+#, php-format
+msgid "%s groups"
+msgstr ""
+
+#: actions/apigrouplistall.php:94
+#, php-format
+msgid "groups on %s"
+msgstr ""
+
 #: actions/apistatusesdestroy.php:107
 msgid "This method requires a POST or DELETE."
 msgstr ""
@@ -439,54 +439,54 @@ msgstr ""
 msgid "Unsupported format."
 msgstr ""
 
-#: actions/apitimelinefavorites.php:107
+#: actions/apitimelinefavorites.php:108
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr ""
 
-#: actions/apitimelinefavorites.php:119
+#: actions/apitimelinefavorites.php:120
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr ""
 
-#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117
+#: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118
 #: actions/grouprss.php:131 actions/userrss.php:90
 #, php-format
 msgid "%s timeline"
 msgstr ""
 
-#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125
+#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
 #: actions/userrss.php:92
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr ""
 
-#: actions/apitimelinementions.php:116
+#: actions/apitimelinementions.php:117
 #, php-format
 msgid "%1$s / Updates mentioning %2$s"
 msgstr ""
 
-#: actions/apitimelinementions.php:126
+#: actions/apitimelinementions.php:127
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr ""
 
-#: actions/apitimelinepublic.php:106 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr ""
 
-#: actions/apitimelinepublic.php:110 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr ""
 
-#: actions/apitimelinetag.php:101 actions/tag.php:66
+#: actions/apitimelinetag.php:102 actions/tag.php:66
 #, php-format
 msgid "Notices tagged with %s"
 msgstr ""
 
-#: actions/apitimelinetag.php:107 actions/tagrss.php:64
+#: actions/apitimelinetag.php:108 actions/tagrss.php:64
 #, php-format
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr ""
@@ -521,45 +521,45 @@ msgstr ""
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr ""
 
-#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:185
 #: actions/grouplogo.php:178 actions/remotesubscribe.php:191
 #: actions/userauthorization.php:72 actions/userrss.php:103
 msgid "User without matching profile"
 msgstr ""
 
-#: actions/avatarsettings.php:119 actions/avatarsettings.php:194
+#: actions/avatarsettings.php:119 actions/avatarsettings.php:197
 #: actions/grouplogo.php:251
 msgid "Avatar settings"
 msgstr ""
 
-#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/avatarsettings.php:127 actions/avatarsettings.php:205
 #: actions/grouplogo.php:199 actions/grouplogo.php:259
 msgid "Original"
 msgstr ""
 
-#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/avatarsettings.php:142 actions/avatarsettings.php:217
 #: actions/grouplogo.php:210 actions/grouplogo.php:271
 msgid "Preview"
 msgstr ""
 
-#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
+#: actions/avatarsettings.php:149 lib/deleteuserform.php:66
 #: lib/noticelist.php:550
 msgid "Delete"
 msgstr ""
 
-#: actions/avatarsettings.php:165 actions/grouplogo.php:233
+#: actions/avatarsettings.php:166 actions/grouplogo.php:233
 msgid "Upload"
 msgstr ""
 
-#: actions/avatarsettings.php:228 actions/grouplogo.php:286
+#: actions/avatarsettings.php:231 actions/grouplogo.php:286
 msgid "Crop"
 msgstr ""
 
-#: actions/avatarsettings.php:265 actions/disfavor.php:74
+#: actions/avatarsettings.php:268 actions/disfavor.php:74
 #: actions/emailsettings.php:238 actions/favor.php:75
 #: actions/groupblock.php:66 actions/grouplogo.php:309
 #: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -570,33 +570,70 @@ msgstr ""
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
-#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
+#: actions/avatarsettings.php:281 actions/designadminpanel.php:103
 #: actions/emailsettings.php:256 actions/grouplogo.php:319
 #: actions/imsettings.php:220 actions/recoverpassword.php:44
 #: actions/smssettings.php:248 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr ""
 
-#: actions/avatarsettings.php:322
+#: actions/avatarsettings.php:328
 msgid "Pick a square area of the image to be your avatar"
 msgstr ""
 
-#: actions/avatarsettings.php:337 actions/grouplogo.php:377
+#: actions/avatarsettings.php:343 actions/grouplogo.php:377
 msgid "Lost our file data."
 msgstr ""
 
-#: actions/avatarsettings.php:360
+#: actions/avatarsettings.php:366
 msgid "Avatar updated."
 msgstr ""
 
-#: actions/avatarsettings.php:363
+#: actions/avatarsettings.php:369
 msgid "Failed updating avatar."
 msgstr ""
 
-#: actions/avatarsettings.php:387
+#: actions/avatarsettings.php:393
 msgid "Avatar deleted."
 msgstr ""
 
+#: actions/block.php:69
+msgid "You already blocked that user."
+msgstr ""
+
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
+msgid "Block user"
+msgstr ""
+
+#: actions/block.php:130
+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/block.php:143 actions/deletenotice.php:145
+#: actions/deleteuser.php:147 actions/groupblock.php:178
+msgid "No"
+msgstr ""
+
+#: actions/block.php:143 actions/deleteuser.php:147
+msgid "Do not block this user"
+msgstr ""
+
+#: actions/block.php:144 actions/deletenotice.php:146
+#: actions/deleteuser.php:148 actions/groupblock.php:179
+msgid "Yes"
+msgstr ""
+
+#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
+msgid "Block this user"
+msgstr ""
+
+#: actions/block.php:162
+msgid "Failed to save block information."
+msgstr ""
+
 #: actions/blockedfromgroup.php:73 actions/editgroup.php:84
 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
 #: actions/groupmembers.php:76 actions/grouprss.php:91
@@ -637,43 +674,6 @@ msgstr ""
 msgid "Unblock this user"
 msgstr ""
 
-#: actions/block.php:69
-msgid "You already blocked that user."
-msgstr ""
-
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
-msgid "Block user"
-msgstr ""
-
-#: actions/block.php:130
-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/block.php:143 actions/deletenotice.php:145
-#: actions/deleteuser.php:147 actions/groupblock.php:178
-msgid "No"
-msgstr ""
-
-#: actions/block.php:143 actions/deleteuser.php:147
-msgid "Do not block this user"
-msgstr ""
-
-#: actions/block.php:144 actions/deletenotice.php:146
-#: actions/deleteuser.php:148 actions/groupblock.php:179
-msgid "Yes"
-msgstr ""
-
-#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
-msgid "Block this user"
-msgstr ""
-
-#: actions/block.php:162
-msgid "Failed to save block information."
-msgstr ""
-
 #: actions/bookmarklet.php:50
 msgid "Post to "
 msgstr ""
@@ -1131,6 +1131,14 @@ msgstr ""
 msgid "New incoming email address added."
 msgstr ""
 
+#: actions/favor.php:79
+msgid "This notice is already a favorite!"
+msgstr ""
+
+#: actions/favor.php:92 lib/disfavorform.php:140
+msgid "Disfavor favorite"
+msgstr ""
+
 #: actions/favorited.php:65 lib/popularnoticesection.php:88
 #: lib/publicgroupnav.php:93
 msgid "Popular notices"
@@ -1173,14 +1181,6 @@ msgstr ""
 msgid "Updates favored by %1$s on %2$s!"
 msgstr ""
 
-#: actions/favor.php:79
-msgid "This notice is already a favorite!"
-msgstr ""
-
-#: actions/favor.php:92 lib/disfavorform.php:140
-msgid "Disfavor favorite"
-msgstr ""
-
 #: actions/featured.php:69 lib/featureduserssection.php:87
 #: lib/publicgroupnav.php:89
 msgid "Featured users"
@@ -1405,6 +1405,30 @@ msgstr ""
 msgid "Updates from members of %1$s on %2$s!"
 msgstr ""
 
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 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 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/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
+msgid "Create a new group"
+msgstr ""
+
 #: actions/groupsearch.php:52
 #, php-format
 msgid ""
@@ -1435,30 +1459,6 @@ msgid ""
 "action.newgroup%%) yourself!"
 msgstr ""
 
-#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 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 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/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
-msgid "Create a new group"
-msgstr ""
-
 #: actions/groupunblock.php:91
 msgid "Only an admin can unblock group members."
 msgstr ""
@@ -1636,7 +1636,7 @@ msgstr ""
 msgid "Optionally add a personal message to the invitation."
 msgstr ""
 
-#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:222
 msgid "Send"
 msgstr ""
 
@@ -1716,61 +1716,61 @@ msgstr ""
 msgid "%s left group %s"
 msgstr ""
 
-#: actions/login.php:82 actions/register.php:137
+#: actions/login.php:83 actions/register.php:137
 msgid "Already logged in."
 msgstr ""
 
-#: actions/login.php:113 actions/login.php:123
+#: actions/login.php:114 actions/login.php:124
 msgid "Invalid or expired token."
 msgstr ""
 
-#: actions/login.php:146
+#: actions/login.php:147
 msgid "Incorrect username or password."
 msgstr ""
 
-#: actions/login.php:152
+#: actions/login.php:153
 msgid "Error setting user. You are probably not authorized."
 msgstr ""
 
-#: actions/login.php:207 actions/login.php:260 lib/action.php:458
+#: actions/login.php:208 actions/login.php:261 lib/action.php:458
 #: lib/logingroupnav.php:79
 msgid "Login"
 msgstr ""
 
-#: actions/login.php:246
+#: actions/login.php:247
 msgid "Login to site"
 msgstr ""
 
-#: actions/login.php:249 actions/profilesettings.php:106
+#: actions/login.php:250 actions/profilesettings.php:106
 #: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
 #: lib/groupeditform.php:152 lib/userprofile.php:131
 msgid "Nickname"
 msgstr ""
 
-#: actions/login.php:252 actions/register.php:428
+#: actions/login.php:253 actions/register.php:428
 #: lib/accountsettingsaction.php:116
 msgid "Password"
 msgstr ""
 
-#: actions/login.php:255 actions/register.php:477
+#: actions/login.php:256 actions/register.php:477
 msgid "Remember me"
 msgstr ""
 
-#: actions/login.php:256 actions/register.php:479
+#: actions/login.php:257 actions/register.php:479
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 
-#: actions/login.php:266
+#: actions/login.php:267
 msgid "Lost or forgotten password?"
 msgstr ""
 
-#: actions/login.php:285
+#: actions/login.php:286
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 msgstr ""
 
-#: actions/login.php:289
+#: actions/login.php:290
 #, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -1839,7 +1839,7 @@ msgstr ""
 msgid "Direct message to %s sent"
 msgstr ""
 
-#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:242 lib/channel.php:170
 msgid "Ajax Error"
 msgstr ""
 
@@ -1847,7 +1847,7 @@ msgstr ""
 msgid "New notice"
 msgstr ""
 
-#: actions/newnotice.php:206
+#: actions/newnotice.php:208
 msgid "Notice posted"
 msgstr ""
 
@@ -1921,8 +1921,8 @@ msgstr ""
 msgid "Only "
 msgstr ""
 
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996
-#: lib/api.php:1024 lib/api.php:1134
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011
+#: lib/api.php:1039 lib/api.php:1149
 msgid "Not a supported data format."
 msgstr ""
 
@@ -3393,6 +3393,26 @@ msgstr ""
 msgid "SMS"
 msgstr ""
 
+#: actions/tag.php:68
+#, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr ""
+
+#: actions/tag.php:86
+#, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr ""
+
+#: actions/tag.php:92
+#, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr ""
+
+#: actions/tag.php:98
+#, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr ""
+
 #: actions/tagother.php:33
 msgid "Not logged in"
 msgstr ""
@@ -3437,26 +3457,6 @@ msgstr ""
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 
-#: actions/tag.php:68
-#, php-format
-msgid "Notices tagged with %s, page %d"
-msgstr ""
-
-#: actions/tag.php:86
-#, php-format
-msgid "Notice feed for tag %s (RSS 1.0)"
-msgstr ""
-
-#: actions/tag.php:92
-#, php-format
-msgid "Notice feed for tag %s (RSS 2.0)"
-msgstr ""
-
-#: actions/tag.php:98
-#, php-format
-msgid "Notice feed for tag %s (Atom)"
-msgstr ""
-
 #: actions/tagrss.php:35
 msgid "No such tag."
 msgstr ""
@@ -3745,38 +3745,43 @@ msgstr ""
 msgid "DB error inserting hashtag: %s"
 msgstr ""
 
-#: classes/Notice.php:179
+#: classes/Notice.php:188
 msgid "Problem saving notice. Too long."
 msgstr ""
 
-#: classes/Notice.php:183
+#: classes/Notice.php:192
 msgid "Problem saving notice. Unknown user."
 msgstr ""
 
-#: classes/Notice.php:188
+#: classes/Notice.php:197
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
-#: classes/Notice.php:194
+#: classes/Notice.php:203
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
 msgstr ""
 
-#: classes/Notice.php:200
+#: classes/Notice.php:209
 msgid "You are banned from posting notices on this site."
 msgstr ""
 
-#: classes/Notice.php:265 classes/Notice.php:290
+#: classes/Notice.php:274 classes/Notice.php:299
 msgid "Problem saving notice."
 msgstr ""
 
-#: classes/Notice.php:1124
+#: classes/Notice.php:1115
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr ""
 
+#: classes/User.php:347
+#, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr ""
+
 #: classes/User_group.php:380
 msgid "Could not create group."
 msgstr ""
@@ -3785,11 +3790,6 @@ msgstr ""
 msgid "Could not set group membership."
 msgstr ""
 
-#: classes/User.php:347
-#, php-format
-msgid "Welcome to %1$s, @%2$s!"
-msgstr ""
-
 #: lib/accountsettingsaction.php:108
 msgid "Change your profile settings"
 msgstr ""
@@ -4086,7 +4086,7 @@ msgstr ""
 msgid "Notice with that id does not exist"
 msgstr ""
 
-#: lib/command.php:168 lib/command.php:416 lib/command.php:471
+#: lib/command.php:168 lib/command.php:416 lib/command.php:472
 msgid "User has no last notice"
 msgstr ""
 
@@ -4133,98 +4133,98 @@ msgstr ""
 msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr ""
 
-#: lib/command.php:439
+#: lib/command.php:440
 #, php-format
 msgid "Reply to %s sent"
 msgstr ""
 
-#: lib/command.php:441
+#: lib/command.php:442
 msgid "Error saving notice."
 msgstr ""
 
-#: lib/command.php:495
+#: lib/command.php:496
 msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: lib/command.php:502
+#: lib/command.php:503
 #, php-format
 msgid "Subscribed to %s"
 msgstr ""
 
-#: lib/command.php:523
+#: lib/command.php:524
 msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: lib/command.php:530
+#: lib/command.php:531
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr ""
 
-#: lib/command.php:548 lib/command.php:571
+#: lib/command.php:549 lib/command.php:572
 msgid "Command not yet implemented."
 msgstr ""
 
-#: lib/command.php:551
+#: lib/command.php:552
 msgid "Notification off."
 msgstr ""
 
-#: lib/command.php:553
+#: lib/command.php:554
 msgid "Can't turn off notification."
 msgstr ""
 
-#: lib/command.php:574
+#: lib/command.php:575
 msgid "Notification on."
 msgstr ""
 
-#: lib/command.php:576
+#: lib/command.php:577
 msgid "Can't turn on notification."
 msgstr ""
 
-#: lib/command.php:588
+#: lib/command.php:590
 msgid "Login command is disabled"
 msgstr ""
 
-#: lib/command.php:602
+#: lib/command.php:604
 #, php-format
 msgid "Could not create login token for %s"
 msgstr ""
 
-#: lib/command.php:607
+#: lib/command.php:609
 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:623
+#: lib/command.php:625
 msgid "You are not subscribed to anyone."
 msgstr ""
 
-#: lib/command.php:625
+#: lib/command.php:627
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/command.php:645
+#: lib/command.php:647
 msgid "No one is subscribed to you."
 msgstr ""
 
-#: lib/command.php:647
+#: lib/command.php:649
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/command.php:667
+#: lib/command.php:669
 msgid "You are not a member of any groups."
 msgstr ""
 
-#: lib/command.php:669
+#: lib/command.php:671
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/command.php:683
+#: lib/command.php:685
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -4320,10 +4320,6 @@ msgstr ""
 msgid "Favor"
 msgstr ""
 
-#: lib/feedlist.php:64
-msgid "Export data"
-msgstr ""
-
 #: lib/feed.php:85
 msgid "RSS 1.0"
 msgstr ""
@@ -4340,6 +4336,10 @@ msgstr ""
 msgid "FOAF"
 msgstr ""
 
+#: lib/feedlist.php:64
+msgid "Export data"
+msgstr ""
+
 #: lib/galleryaction.php:121
 msgid "Filter tags"
 msgstr ""
@@ -4498,20 +4498,6 @@ msgstr ""
 msgid "Sign up for a new account"
 msgstr ""
 
-#: lib/mailbox.php:89
-msgid "Only the user can read their own mailboxes."
-msgstr ""
-
-#: lib/mailbox.php:139
-msgid ""
-"You have no private messages. You can send private message to engage other "
-"users in conversation. People can send you messages for your eyes only."
-msgstr ""
-
-#: lib/mailbox.php:227 lib/noticelist.php:452
-msgid "from"
-msgstr ""
-
 #: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr ""
@@ -4688,6 +4674,20 @@ msgid ""
 "\n"
 msgstr ""
 
+#: lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
+msgstr ""
+
+#: lib/mailbox.php:139
+msgid ""
+"You have no private messages. You can send private message to engage other "
+"users in conversation. People can send you messages for your eyes only."
+msgstr ""
+
+#: lib/mailbox.php:227 lib/noticelist.php:452
+msgid "from"
+msgstr ""
+
 #: lib/mediafile.php:98 lib/mediafile.php:123
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
@@ -4748,7 +4748,7 @@ msgstr ""
 msgid "To"
 msgstr ""
 
-#: lib/messageform.php:161 lib/noticeform.php:185
+#: lib/messageform.php:159 lib/noticeform.php:183
 msgid "Available characters"
 msgstr ""
 
@@ -4761,11 +4761,11 @@ msgstr ""
 msgid "What's up, %s?"
 msgstr ""
 
-#: lib/noticeform.php:192
+#: lib/noticeform.php:190
 msgid "Attach"
 msgstr ""
 
-#: lib/noticeform.php:196
+#: lib/noticeform.php:194
 msgid "Attach a file"
 msgstr ""
 
@@ -4834,11 +4834,11 @@ msgstr ""
 msgid "Duplicate notice"
 msgstr ""
 
-#: lib/oauthstore.php:467 lib/subs.php:48
+#: lib/oauthstore.php:466 lib/subs.php:48
 msgid "You have been banned from subscribing."
 msgstr ""
 
-#: lib/oauthstore.php:492
+#: lib/oauthstore.php:491
 msgid "Couldn't insert new subscription."
 msgstr ""
 
@@ -4998,20 +4998,6 @@ msgstr ""
 msgid "Groups %s is a member of"
 msgstr ""
 
-#: lib/subscriberspeopleselftagcloudsection.php:48
-#: lib/subscriptionspeopleselftagcloudsection.php:48
-msgid "People Tagcloud as self-tagged"
-msgstr ""
-
-#: lib/subscriberspeopletagcloudsection.php:48
-#: lib/subscriptionspeopletagcloudsection.php:48
-msgid "People Tagcloud as tagged"
-msgstr ""
-
-#: lib/subscriptionlist.php:126
-msgid "(none)"
-msgstr ""
-
 #: lib/subs.php:52
 msgid "Already subscribed!"
 msgstr ""
@@ -5040,6 +5026,20 @@ msgstr ""
 msgid "Couldn't delete subscription."
 msgstr ""
 
+#: lib/subscriberspeopleselftagcloudsection.php:48
+#: lib/subscriptionspeopleselftagcloudsection.php:48
+msgid "People Tagcloud as self-tagged"
+msgstr ""
+
+#: lib/subscriberspeopletagcloudsection.php:48
+#: lib/subscriptionspeopletagcloudsection.php:48
+msgid "People Tagcloud as tagged"
+msgstr ""
+
+#: lib/subscriptionlist.php:126
+msgid "(none)"
+msgstr ""
+
 #: lib/tagcloudsection.php:56
 msgid "None"
 msgstr ""
diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po
index 01e895f8e9..60e4f72011 100644
--- a/locale/sv/LC_MESSAGES/statusnet.po
+++ b/locale/sv/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 21:25+0000\n"
-"PO-Revision-Date: 2009-12-07 21:27:23+0000\n"
+"POT-Creation-Date: 2009-12-12 17:09+0000\n"
+"PO-Revision-Date: 2009-12-12 17:10:28+0000\n"
 "Language-Team: Swedish\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n"
+"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: sv\n"
 "X-Message-Group: out-statusnet\n"
@@ -27,11 +27,11 @@ msgstr "Ingen sådan sida"
 
 #: actions/all.php:74 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofile.php:105
 #: actions/apiaccountupdateprofilebackgroundimage.php:116
-#: actions/apiaccountupdateprofileimage.php:105
-#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
-#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
-#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
+#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90
 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
@@ -44,7 +44,7 @@ msgstr "Ingen sådan sida"
 #: actions/repliesrss.php:38 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38
 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
-#: lib/command.php:364 lib/command.php:411 lib/command.php:466
+#: lib/command.php:364 lib/command.php:411 lib/command.php:467
 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
 #: lib/subs.php:34 lib/subs.php:116
 msgid "No such user."
@@ -56,7 +56,7 @@ msgid "%s and friends, page %d"
 msgstr "%s och vänner, sida %d"
 
 #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
-#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100
+#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s och vänner"
@@ -114,24 +114,24 @@ msgstr ""
 msgid "You and friends"
 msgstr "Du och vänner"
 
-#: actions/allrss.php:119 actions/apitimelinefriends.php:121
+#: actions/allrss.php:119 actions/apitimelinefriends.php:122
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Uppdateringar från %1$s och vänner på %2$s!"
 
 #: actions/apiaccountratelimitstatus.php:70
 #: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofile.php:97
 #: actions/apiaccountupdateprofilebackgroundimage.php:94
 #: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apiaccountupdateprofile.php:97
 msgid "API method not found."
 msgstr "API-metoden hittades inte"
 
 #: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofile.php:89
 #: actions/apiaccountupdateprofilebackgroundimage.php:86
 #: actions/apiaccountupdateprofilecolors.php:110
-#: actions/apiaccountupdateprofileimage.php:84
-#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
+#: actions/apiaccountupdateprofileimage.php:84 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
@@ -150,9 +150,22 @@ msgstr "Du måste ange ett värdet på parametern 'device': sms, im, none"
 msgid "Could not update user."
 msgstr "Kunde inte uppdatera användare."
 
+#: actions/apiaccountupdateprofile.php:112
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+msgid "User has no profile."
+msgstr "Användaren har ingen profil."
+
+#: actions/apiaccountupdateprofile.php:147
+msgid "Could not save profile."
+msgstr "Kunde inte spara profil."
+
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257
 #: actions/designadminpanel.php:122 actions/newnotice.php:94
 #: lib/designsettings.php:283
 #, php-format
@@ -175,19 +188,6 @@ msgstr "Kunde inte spara dina utseendeinställningar."
 msgid "Could not update your design."
 msgstr "Kunde inte uppdatera din profils utseende."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
-#: actions/apiaccountupdateprofileimage.php:130
-#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
-#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
-msgid "User has no profile."
-msgstr "Användaren har ingen profil."
-
-#: actions/apiaccountupdateprofile.php:147
-msgid "Could not save profile."
-msgstr "Kunde inte spara profil."
-
 #: actions/apiblockcreate.php:105
 msgid "You cannot block yourself!"
 msgstr "Du kan inte blockera dig själv!"
@@ -200,23 +200,6 @@ msgstr "Blockering av användare misslyckades."
 msgid "Unblock user failed."
 msgstr "Hävning av blockering av användare misslyckades."
 
-#: actions/apidirectmessagenew.php:126
-msgid "No message text!"
-msgstr "Ingen meddelandetext!"
-
-#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
-#, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr "Detta är för långt. Maximal meddelandestorlek är %d tecken."
-
-#: actions/apidirectmessagenew.php:146
-msgid "Recipient user not found."
-msgstr "Mottagare hittades inte."
-
-#: actions/apidirectmessagenew.php:150
-msgid "Can't send direct messages to users who aren't your friend."
-msgstr "Kan inte skicka direktmeddelanden till användare som inte är din vän."
-
 #: actions/apidirectmessage.php:89
 #, php-format
 msgid "Direct messages from %s"
@@ -242,18 +225,35 @@ msgstr "Alla direktmeddelanden skickade till %s"
 #: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
-#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
-#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149
-#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
-#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156
+#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151
+#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141
+#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
 msgid "API method not found!"
 msgstr "API-metoden hittades inte!"
 
+#: actions/apidirectmessagenew.php:126
+msgid "No message text!"
+msgstr "Ingen meddelandetext!"
+
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "Detta är för långt. Maximal meddelandestorlek är %d tecken."
+
+#: actions/apidirectmessagenew.php:146
+msgid "Recipient user not found."
+msgstr "Mottagare hittades inte."
+
+#: actions/apidirectmessagenew.php:150
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr "Kan inte skicka direktmeddelanden till användare som inte är din vän."
+
 #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
 #: actions/apistatusesdestroy.php:113
 msgid "No status found with that ID."
@@ -397,16 +397,6 @@ msgstr "Du är inte en medlem i denna grupp."
 msgid "Could not remove user %s to group %s."
 msgstr "Kunde inte ta bort användare %s från grupp %s."
 
-#: actions/apigrouplistall.php:90 actions/usergroups.php:62
-#, php-format
-msgid "%s groups"
-msgstr "%s grupper"
-
-#: actions/apigrouplistall.php:94
-#, php-format
-msgid "groups on %s"
-msgstr "grupper på %s"
-
 #: actions/apigrouplist.php:95
 #, php-format
 msgid "%s's groups"
@@ -417,6 +407,16 @@ msgstr "%ss grupper"
 msgid "Groups %s is a member of on %s."
 msgstr "Grupper %s är en medlem i på %s."
 
+#: actions/apigrouplistall.php:90 actions/usergroups.php:62
+#, php-format
+msgid "%s groups"
+msgstr "%s grupper"
+
+#: actions/apigrouplistall.php:94
+#, php-format
+msgid "groups on %s"
+msgstr "grupper på %s"
+
 #: actions/apistatusesdestroy.php:107
 msgid "This method requires a POST or DELETE."
 msgstr "Denna metod kräver en POST eller en DELETE."
@@ -452,54 +452,54 @@ msgstr "Maximal notisstorlek är %d tecken, inklusive bilage-URL."
 msgid "Unsupported format."
 msgstr "Format som inte stödjs."
 
-#: actions/apitimelinefavorites.php:107
+#: actions/apitimelinefavorites.php:108
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr "%s / Favoriter från %s"
 
-#: actions/apitimelinefavorites.php:119
+#: actions/apitimelinefavorites.php:120
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr "%s uppdateringar markerade som favorit av %s / %s."
 
-#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117
+#: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118
 #: actions/grouprss.php:131 actions/userrss.php:90
 #, php-format
 msgid "%s timeline"
 msgstr "%s tidslinje"
 
-#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125
+#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
 #: actions/userrss.php:92
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Uppdateringar från %1$s på %2$s!"
 
-#: actions/apitimelinementions.php:116
+#: actions/apitimelinementions.php:117
 #, php-format
 msgid "%1$s / Updates mentioning %2$s"
 msgstr "%1$s / Uppdateringar som nämner %2$s"
 
-#: actions/apitimelinementions.php:126
+#: actions/apitimelinementions.php:127
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s uppdateringar med svar på uppdatering från %2$s / %3$s."
 
-#: actions/apitimelinepublic.php:106 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s publika tidslinje"
 
-#: actions/apitimelinepublic.php:110 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s uppdateringar från alla!"
 
-#: actions/apitimelinetag.php:101 actions/tag.php:66
+#: actions/apitimelinetag.php:102 actions/tag.php:66
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Notiser taggade med %s"
 
-#: actions/apitimelinetag.php:107 actions/tagrss.php:64
+#: actions/apitimelinetag.php:108 actions/tagrss.php:64
 #, php-format
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Uppdateringar taggade med %1$s på %2$s!"
@@ -535,45 +535,45 @@ msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr ""
 "Du kan ladda upp din personliga avatar. Den maximala filstorleken är %s."
 
-#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:185
 #: actions/grouplogo.php:178 actions/remotesubscribe.php:191
 #: actions/userauthorization.php:72 actions/userrss.php:103
 msgid "User without matching profile"
 msgstr "Användare utan matchande profil"
 
-#: actions/avatarsettings.php:119 actions/avatarsettings.php:194
+#: actions/avatarsettings.php:119 actions/avatarsettings.php:197
 #: actions/grouplogo.php:251
 msgid "Avatar settings"
 msgstr "Avatarinställningar"
 
-#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/avatarsettings.php:127 actions/avatarsettings.php:205
 #: actions/grouplogo.php:199 actions/grouplogo.php:259
 msgid "Original"
 msgstr "Orginal"
 
-#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/avatarsettings.php:142 actions/avatarsettings.php:217
 #: actions/grouplogo.php:210 actions/grouplogo.php:271
 msgid "Preview"
 msgstr "Förhandsgranska"
 
-#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
+#: actions/avatarsettings.php:149 lib/deleteuserform.php:66
 #: lib/noticelist.php:550
 msgid "Delete"
 msgstr "Ta bort"
 
-#: actions/avatarsettings.php:165 actions/grouplogo.php:233
+#: actions/avatarsettings.php:166 actions/grouplogo.php:233
 msgid "Upload"
 msgstr "Ladda upp"
 
-#: actions/avatarsettings.php:228 actions/grouplogo.php:286
+#: actions/avatarsettings.php:231 actions/grouplogo.php:286
 msgid "Crop"
 msgstr "Beskär"
 
-#: actions/avatarsettings.php:265 actions/disfavor.php:74
+#: actions/avatarsettings.php:268 actions/disfavor.php:74
 #: actions/emailsettings.php:238 actions/favor.php:75
 #: actions/groupblock.php:66 actions/grouplogo.php:309
 #: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -584,33 +584,73 @@ msgstr "Beskär"
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Det var ett problem med din sessions-token. Var vänlig försök igen."
 
-#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
+#: actions/avatarsettings.php:281 actions/designadminpanel.php:103
 #: actions/emailsettings.php:256 actions/grouplogo.php:319
 #: actions/imsettings.php:220 actions/recoverpassword.php:44
 #: actions/smssettings.php:248 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "Oväntat inskick av formulär."
 
-#: actions/avatarsettings.php:322
+#: actions/avatarsettings.php:328
 msgid "Pick a square area of the image to be your avatar"
 msgstr "Välj ett kvadratiskt område i bilden som din avatar"
 
-#: actions/avatarsettings.php:337 actions/grouplogo.php:377
+#: actions/avatarsettings.php:343 actions/grouplogo.php:377
 msgid "Lost our file data."
 msgstr "Förlorade vår fildata."
 
-#: actions/avatarsettings.php:360
+#: actions/avatarsettings.php:366
 msgid "Avatar updated."
 msgstr "Avatar uppdaterad."
 
-#: actions/avatarsettings.php:363
+#: actions/avatarsettings.php:369
 msgid "Failed updating avatar."
 msgstr "Misslyckades uppdatera avatar."
 
-#: actions/avatarsettings.php:387
+#: actions/avatarsettings.php:393
 msgid "Avatar deleted."
 msgstr "Avatar borttagen."
 
+#: actions/block.php:69
+msgid "You already blocked that user."
+msgstr "Du har redan blockerat denna användare."
+
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
+msgid "Block user"
+msgstr "Blockera användare"
+
+#: actions/block.php:130
+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 ""
+"Är du säker på att du vill blockera denna användare? Efteråt kommer deras "
+"prenumeration på dig tas bort, de kommer inte kunna prenumerera på dig i "
+"framtiden och du kommer inte bli underrättad om några @-svar från dem."
+
+#: actions/block.php:143 actions/deletenotice.php:145
+#: actions/deleteuser.php:147 actions/groupblock.php:178
+msgid "No"
+msgstr "Nej"
+
+#: actions/block.php:143 actions/deleteuser.php:147
+msgid "Do not block this user"
+msgstr "Blockera inte denna användare"
+
+#: actions/block.php:144 actions/deletenotice.php:146
+#: actions/deleteuser.php:148 actions/groupblock.php:179
+msgid "Yes"
+msgstr "Ja"
+
+#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
+msgid "Block this user"
+msgstr "Blockera denna användare"
+
+#: actions/block.php:162
+msgid "Failed to save block information."
+msgstr "Misslyckades att spara blockeringsinformation."
+
 #: actions/blockedfromgroup.php:73 actions/editgroup.php:84
 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
 #: actions/groupmembers.php:76 actions/grouprss.php:91
@@ -652,46 +692,6 @@ msgstr "Häv blockering"
 msgid "Unblock this user"
 msgstr "Häv blockering av denna användare"
 
-#: actions/block.php:69
-msgid "You already blocked that user."
-msgstr "Du har redan blockerat denna användare."
-
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
-msgid "Block user"
-msgstr "Blockera användare"
-
-#: actions/block.php:130
-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 ""
-"Är du säker på att du vill blockera denna användare? Efteråt kommer deras "
-"prenumeration på dig tas bort, de kommer inte kunna prenumerera på dig i "
-"framtiden och du kommer inte bli underrättad om några @-svar från dem."
-
-#: actions/block.php:143 actions/deletenotice.php:145
-#: actions/deleteuser.php:147 actions/groupblock.php:178
-msgid "No"
-msgstr "Nej"
-
-#: actions/block.php:143 actions/deleteuser.php:147
-msgid "Do not block this user"
-msgstr "Blockera inte denna användare"
-
-#: actions/block.php:144 actions/deletenotice.php:146
-#: actions/deleteuser.php:148 actions/groupblock.php:179
-msgid "Yes"
-msgstr "Ja"
-
-#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
-msgid "Block this user"
-msgstr "Blockera denna användare"
-
-#: actions/block.php:162
-msgid "Failed to save block information."
-msgstr "Misslyckades att spara blockeringsinformation."
-
 #: actions/bookmarklet.php:50
 msgid "Post to "
 msgstr "Posta till "
@@ -1025,7 +1025,7 @@ msgstr "E-postadress"
 
 #: actions/emailsettings.php:123
 msgid "Email address, like \"UserName@example.org\""
-msgstr "E-postadress, såsom \"användarnamn@exempel.se\""
+msgstr "E-postadress, såsom \"användarnamn@example.org\""
 
 #: actions/emailsettings.php:126 actions/imsettings.php:133
 #: actions/smssettings.php:145
@@ -1161,6 +1161,14 @@ msgstr "Inkommande e-postadress borttagen."
 msgid "New incoming email address added."
 msgstr "Ny inkommande e-postadress tillagd."
 
+#: actions/favor.php:79
+msgid "This notice is already a favorite!"
+msgstr "Denna notis är redan en favorit!"
+
+#: actions/favor.php:92 lib/disfavorform.php:140
+msgid "Disfavor favorite"
+msgstr "Ta bort märkning som favorit"
+
 #: actions/favorited.php:65 lib/popularnoticesection.php:88
 #: lib/publicgroupnav.php:93
 msgid "Popular notices"
@@ -1207,14 +1215,6 @@ msgstr "%ss favoritnotiser"
 msgid "Updates favored by %1$s on %2$s!"
 msgstr "Uppdateringar markerade som favorit av %1$s på %2$s!"
 
-#: actions/favor.php:79
-msgid "This notice is already a favorite!"
-msgstr "Denna notis är redan en favorit!"
-
-#: actions/favor.php:92 lib/disfavorform.php:140
-msgid "Disfavor favorite"
-msgstr "Ta bort märkning som favorit"
-
 #: actions/featured.php:69 lib/featureduserssection.php:87
 #: lib/publicgroupnav.php:89
 msgid "Featured users"
@@ -1445,6 +1445,35 @@ msgstr "Gör denna användare till administratör"
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "Uppdateringar från medlemmar i %1$s på %2$s!"
 
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+msgid "Groups"
+msgstr "Grupper"
+
+#: actions/groups.php:64
+#, php-format
+msgid "Groups, page %d"
+msgstr "Grupper, sida %d"
+
+#: actions/groups.php:90
+#, php-format
+msgid ""
+"%%%%site.name%%%% groups let you find and talk with people of similar "
+"interests. After you join a group you can send messages to all other members "
+"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
+"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
+"%%%%)"
+msgstr ""
+"%%%%site.name%%%% grupper låter dig hitta och prata med personer med "
+"liknande intressen. Efter att ha gått med i en grupp kan du skicka "
+"meddelanden till alla andra medlemmar mha. syntaxen \"!gruppnamn\". Ser du "
+"inte någon grupp du gillar? Prova att [söka efter en](%%%%action.groupsearch%"
+"%%%) eller [starta din egen!](%%%%action.newgroup%%%%)"
+
+#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
+msgid "Create a new group"
+msgstr "Skapa en ny grupp"
+
 #: actions/groupsearch.php:52
 #, php-format
 msgid ""
@@ -1482,35 +1511,6 @@ msgstr ""
 "Varför inte [registrera ett konto](%%action.register%%) och [skapa gruppen](%"
 "%action.newgroup%%) själv!"
 
-#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
-msgid "Groups"
-msgstr "Grupper"
-
-#: actions/groups.php:64
-#, php-format
-msgid "Groups, page %d"
-msgstr "Grupper, sida %d"
-
-#: actions/groups.php:90
-#, php-format
-msgid ""
-"%%%%site.name%%%% groups let you find and talk with people of similar "
-"interests. After you join a group you can send messages to all other members "
-"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
-"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
-"%%%%)"
-msgstr ""
-"%%%%site.name%%%% grupper låter dig hitta och prata med personer med "
-"liknande intressen. Efter att ha gått med i en grupp kan du skicka "
-"meddelanden till alla andra medlemmar mha. syntaxen \"!gruppnamn\". Ser du "
-"inte någon grupp du gillar? Prova att [söka efter en](%%%%action.groupsearch%"
-"%%%) eller [starta din egen!](%%%%action.newgroup%%%%)"
-
-#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
-msgid "Create a new group"
-msgstr "Skapa en ny grupp"
-
 #: actions/groupunblock.php:91
 msgid "Only an admin can unblock group members."
 msgstr "Bara en administratör kan häva blockering av gruppmedlemmar."
@@ -1705,7 +1705,7 @@ msgstr "Personligt meddelande"
 msgid "Optionally add a personal message to the invitation."
 msgstr "Om du vill, skriv ett personligt meddelande till inbjudan."
 
-#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:222
 msgid "Send"
 msgstr "Skicka"
 
@@ -1785,55 +1785,55 @@ msgstr "Kunde inte ta bort användare %s från grupp %s"
 msgid "%s left group %s"
 msgstr "%s lämnade grupp %s"
 
-#: actions/login.php:82 actions/register.php:137
+#: actions/login.php:83 actions/register.php:137
 msgid "Already logged in."
 msgstr "Redan inloggad."
 
-#: actions/login.php:113 actions/login.php:123
+#: actions/login.php:114 actions/login.php:124
 msgid "Invalid or expired token."
 msgstr "Ogiltig eller utgången token."
 
-#: actions/login.php:146
+#: actions/login.php:147
 msgid "Incorrect username or password."
 msgstr "Felaktigt användarnamn eller lösenord."
 
-#: actions/login.php:152
+#: actions/login.php:153
 msgid "Error setting user. You are probably not authorized."
 msgstr "Fel vid inställning av användare. Du har sannolikt inte tillstånd."
 
-#: actions/login.php:207 actions/login.php:260 lib/action.php:458
+#: actions/login.php:208 actions/login.php:261 lib/action.php:458
 #: lib/logingroupnav.php:79
 msgid "Login"
 msgstr "Logga in"
 
-#: actions/login.php:246
+#: actions/login.php:247
 msgid "Login to site"
 msgstr "Logga in på webbplatsen"
 
-#: actions/login.php:249 actions/profilesettings.php:106
+#: actions/login.php:250 actions/profilesettings.php:106
 #: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
 #: lib/groupeditform.php:152 lib/userprofile.php:131
 msgid "Nickname"
 msgstr "Smeknamn"
 
-#: actions/login.php:252 actions/register.php:428
+#: actions/login.php:253 actions/register.php:428
 #: lib/accountsettingsaction.php:116
 msgid "Password"
 msgstr "Lösenord"
 
-#: actions/login.php:255 actions/register.php:477
+#: actions/login.php:256 actions/register.php:477
 msgid "Remember me"
 msgstr "Kom ihåg mig"
 
-#: actions/login.php:256 actions/register.php:479
+#: actions/login.php:257 actions/register.php:479
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Logga in automatiskt i framtiden; inte för delade datorer!"
 
-#: actions/login.php:266
+#: actions/login.php:267
 msgid "Lost or forgotten password?"
 msgstr "Tappat bort eller glömt ditt lösenord?"
 
-#: actions/login.php:285
+#: actions/login.php:286
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -1841,7 +1841,7 @@ msgstr ""
 "Av säkerhetsskäl, var vänlig och skriv in ditt användarnamn och lösenord "
 "igen innan du ändrar dina inställningar."
 
-#: actions/login.php:289
+#: actions/login.php:290
 #, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -1914,7 +1914,7 @@ msgstr "Meddelande skickat"
 msgid "Direct message to %s sent"
 msgstr "Direktmeddelande till %s skickat"
 
-#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:242 lib/channel.php:170
 msgid "Ajax Error"
 msgstr "AJAX-fel"
 
@@ -1922,7 +1922,7 @@ msgstr "AJAX-fel"
 msgid "New notice"
 msgstr "Ny notis"
 
-#: actions/newnotice.php:206
+#: actions/newnotice.php:208
 msgid "Notice posted"
 msgstr "Notis postad"
 
@@ -2004,8 +2004,8 @@ msgstr "innehållstyp "
 msgid "Only "
 msgstr "Bara "
 
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996
-#: lib/api.php:1024 lib/api.php:1134
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011
+#: lib/api.php:1039 lib/api.php:1149
 msgid "Not a supported data format."
 msgstr "Ett dataformat som inte stödjs"
 
@@ -3559,6 +3559,26 @@ msgstr "Jabber"
 msgid "SMS"
 msgstr "SMS"
 
+#: actions/tag.php:68
+#, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr "Notiser taggade med %s, sida %d"
+
+#: actions/tag.php:86
+#, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "Flöde av notiser för tagg %s (RSS 1.0)"
+
+#: actions/tag.php:92
+#, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "Flöde av notiser för tagg %s (RSS 2.0)"
+
+#: actions/tag.php:98
+#, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "Flöde av notiser för tagg %s (Atom)"
+
 #: actions/tagother.php:33
 msgid "Not logged in"
 msgstr "Inte inloggad"
@@ -3608,26 +3628,6 @@ msgstr ""
 "Använd detta formulär för att lägga till taggar till dina prenumeranter "
 "eller prenumerationer."
 
-#: actions/tag.php:68
-#, php-format
-msgid "Notices tagged with %s, page %d"
-msgstr "Notiser taggade med %s, sida %d"
-
-#: actions/tag.php:86
-#, php-format
-msgid "Notice feed for tag %s (RSS 1.0)"
-msgstr "Flöde av notiser för tagg %s (RSS 1.0)"
-
-#: actions/tag.php:92
-#, php-format
-msgid "Notice feed for tag %s (RSS 2.0)"
-msgstr "Flöde av notiser för tagg %s (RSS 2.0)"
-
-#: actions/tag.php:98
-#, php-format
-msgid "Notice feed for tag %s (Atom)"
-msgstr "Flöde av notiser för tagg %s (Atom)"
-
 #: actions/tagrss.php:35
 msgid "No such tag."
 msgstr "Ingen sådan tagg."
@@ -3934,22 +3934,22 @@ msgstr "Kunde inte uppdatera meddelande med ny URI."
 msgid "DB error inserting hashtag: %s"
 msgstr "Databasfel vid infogning av hashtag: %s"
 
-#: classes/Notice.php:179
+#: classes/Notice.php:188
 msgid "Problem saving notice. Too long."
 msgstr "Problem vid sparande av notis. För långt."
 
-#: classes/Notice.php:183
+#: classes/Notice.php:192
 msgid "Problem saving notice. Unknown user."
 msgstr "Problem vid sparande av notis. Okänd användare."
 
-#: classes/Notice.php:188
+#: classes/Notice.php:197
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 "För många notiser för snabbt; ta en vilopaus och posta igen om ett par "
 "minuter."
 
-#: classes/Notice.php:194
+#: classes/Notice.php:203
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
@@ -3957,19 +3957,24 @@ msgstr ""
 "För många duplicerade meddelanden för snabbt; ta en vilopaus och posta igen "
 "om ett par minuter."
 
-#: classes/Notice.php:200
+#: classes/Notice.php:209
 msgid "You are banned from posting notices on this site."
 msgstr "Du är utestängd från att posta notiser på denna webbplats."
 
-#: classes/Notice.php:265 classes/Notice.php:290
+#: classes/Notice.php:274 classes/Notice.php:299
 msgid "Problem saving notice."
 msgstr "Problem med att spara notis."
 
-#: classes/Notice.php:1124
+#: classes/Notice.php:1115
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Databasfel vid infogning av svar: %s"
 
+#: classes/User.php:347
+#, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr "Välkommen till %1$s, @%2$s!"
+
 #: classes/User_group.php:380
 msgid "Could not create group."
 msgstr "Kunde inte skapa grupp."
@@ -3978,11 +3983,6 @@ msgstr "Kunde inte skapa grupp."
 msgid "Could not set group membership."
 msgstr "Kunde inte ställa in gruppmedlemskap."
 
-#: classes/User.php:347
-#, php-format
-msgid "Welcome to %1$s, @%2$s!"
-msgstr "Välkommen till %1$s, @%2$s!"
-
 #: lib/accountsettingsaction.php:108
 msgid "Change your profile settings"
 msgstr "Ändra dina profilinställningar"
@@ -4287,7 +4287,7 @@ msgstr ""
 msgid "Notice with that id does not exist"
 msgstr "Notis med den ID:n finns inte"
 
-#: lib/command.php:168 lib/command.php:416 lib/command.php:471
+#: lib/command.php:168 lib/command.php:416 lib/command.php:472
 msgid "User has no last notice"
 msgstr "Användare har ingen sista notis"
 
@@ -4334,98 +4334,98 @@ msgstr "Fel vid sändning av direktmeddelande."
 msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr "Notis för långt - maximum är %d tecken, du skickade %d"
 
-#: lib/command.php:439
+#: lib/command.php:440
 #, php-format
 msgid "Reply to %s sent"
 msgstr "Svar på %s skickat"
 
-#: lib/command.php:441
+#: lib/command.php:442
 msgid "Error saving notice."
 msgstr "Fel vid sparande av notis."
 
-#: lib/command.php:495
+#: lib/command.php:496
 msgid "Specify the name of the user to subscribe to"
 msgstr "Ange namnet på användaren att prenumerara på"
 
-#: lib/command.php:502
+#: lib/command.php:503
 #, php-format
 msgid "Subscribed to %s"
 msgstr "Prenumerar på %s"
 
-#: lib/command.php:523
+#: lib/command.php:524
 msgid "Specify the name of the user to unsubscribe from"
 msgstr "Ange namnet på användaren att avsluta prenumeration på"
 
-#: lib/command.php:530
+#: lib/command.php:531
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr "Prenumeration hos %s avslutad"
 
-#: lib/command.php:548 lib/command.php:571
+#: lib/command.php:549 lib/command.php:572
 msgid "Command not yet implemented."
 msgstr "Kommando inte implementerat än."
 
-#: lib/command.php:551
+#: lib/command.php:552
 msgid "Notification off."
 msgstr "Notifikation av."
 
-#: lib/command.php:553
+#: lib/command.php:554
 msgid "Can't turn off notification."
 msgstr "Kan inte sätta på notifikation."
 
-#: lib/command.php:574
+#: lib/command.php:575
 msgid "Notification on."
 msgstr "Notifikation på."
 
-#: lib/command.php:576
+#: lib/command.php:577
 msgid "Can't turn on notification."
 msgstr "Kan inte stänga av notifikation."
 
-#: lib/command.php:588
+#: lib/command.php:590
 msgid "Login command is disabled"
 msgstr ""
 
-#: lib/command.php:602
+#: lib/command.php:604
 #, fuzzy, php-format
 msgid "Could not create login token for %s"
 msgstr "Kunde inte skapa alias."
 
-#: lib/command.php:607
+#: lib/command.php:609
 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:623
+#: lib/command.php:625
 msgid "You are not subscribed to anyone."
 msgstr "Du prenumererar inte på någon."
 
-#: lib/command.php:625
+#: lib/command.php:627
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Du prenumererar på denna person:"
 msgstr[1] "Du prenumererar på dessa personer:"
 
-#: lib/command.php:645
+#: lib/command.php:647
 msgid "No one is subscribed to you."
 msgstr "Ingen prenumerar på dig."
 
-#: lib/command.php:647
+#: lib/command.php:649
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Denna person prenumererar på dig:"
 msgstr[1] "Dessa personer prenumererar på dig:"
 
-#: lib/command.php:667
+#: lib/command.php:669
 msgid "You are not a member of any groups."
 msgstr "Du är inte medlem i några grupper."
 
-#: lib/command.php:669
+#: lib/command.php:671
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Du är en medlem i denna grupp:"
 msgstr[1] "Du är en medlem i dessa grupper:"
 
-#: lib/command.php:683
+#: lib/command.php:685
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -4523,10 +4523,6 @@ msgstr "Markera denna notis som favorit"
 msgid "Favor"
 msgstr "Markera som favorit"
 
-#: lib/feedlist.php:64
-msgid "Export data"
-msgstr "Exportdata"
-
 #: lib/feed.php:85
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
@@ -4543,6 +4539,10 @@ msgstr "Atom"
 msgid "FOAF"
 msgstr "FOAF"
 
+#: lib/feedlist.php:64
+msgid "Export data"
+msgstr "Exportdata"
+
 #: lib/galleryaction.php:121
 msgid "Filter tags"
 msgstr "Filtrera taggar"
@@ -4701,23 +4701,6 @@ msgstr "Logga in med ett användarnamn och lösenord"
 msgid "Sign up for a new account"
 msgstr "Registrera dig för ett nytt konto"
 
-#: lib/mailbox.php:89
-msgid "Only the user can read their own mailboxes."
-msgstr "Bara användaren kan läsa sina egna brevlådor."
-
-#: 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 ""
-"Du har inga privata meddelanden. Du kan skicka privata meddelanden för att "
-"engagera andra användare i konversationen. Folk kan skicka meddelanden till "
-"dig som bara du ser."
-
-#: lib/mailbox.php:227 lib/noticelist.php:452
-msgid "from"
-msgstr "från"
-
 #: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "E-postadressbekräftelse"
@@ -4904,6 +4887,23 @@ msgid ""
 "\n"
 msgstr ""
 
+#: lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
+msgstr "Bara användaren kan läsa sina egna brevlådor."
+
+#: 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 ""
+"Du har inga privata meddelanden. Du kan skicka privata meddelanden för att "
+"engagera andra användare i konversationen. Folk kan skicka meddelanden till "
+"dig som bara du ser."
+
+#: lib/mailbox.php:227 lib/noticelist.php:452
+msgid "from"
+msgstr "från"
+
 #: lib/mediafile.php:98 lib/mediafile.php:123
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
@@ -4968,7 +4968,7 @@ msgstr "Skicka ett direktinlägg"
 msgid "To"
 msgstr "Till"
 
-#: lib/messageform.php:161 lib/noticeform.php:185
+#: lib/messageform.php:159 lib/noticeform.php:183
 msgid "Available characters"
 msgstr "Tillgängliga tecken"
 
@@ -4981,11 +4981,11 @@ msgstr "Skicka ett inlägg"
 msgid "What's up, %s?"
 msgstr "Vad är på gång, %s?"
 
-#: lib/noticeform.php:192
+#: lib/noticeform.php:190
 msgid "Attach"
 msgstr "Bifoga"
 
-#: lib/noticeform.php:196
+#: lib/noticeform.php:194
 msgid "Attach a file"
 msgstr "Bifoga en fil"
 
@@ -5054,11 +5054,11 @@ msgstr "Fel vid infogning av fjärrprofilen"
 msgid "Duplicate notice"
 msgstr "Duplicera notis"
 
-#: lib/oauthstore.php:467 lib/subs.php:48
+#: lib/oauthstore.php:466 lib/subs.php:48
 msgid "You have been banned from subscribing."
 msgstr "Du har blivit utestängd från att prenumerera."
 
-#: lib/oauthstore.php:492
+#: lib/oauthstore.php:491
 msgid "Couldn't insert new subscription."
 msgstr "Kunde inte infoga ny prenumeration."
 
@@ -5220,20 +5220,6 @@ msgstr "Personer som prenumererar på %s"
 msgid "Groups %s is a member of"
 msgstr "Grupper %s är en medlem i"
 
-#: 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/subscriptionlist.php:126
-msgid "(none)"
-msgstr "(ingen)"
-
 #: lib/subs.php:52
 msgid "Already subscribed!"
 msgstr "Redan prenumerant!"
@@ -5262,6 +5248,20 @@ msgstr "Kunde inte ta bort själv-prenumeration."
 msgid "Couldn't delete subscription."
 msgstr "Kunde inte ta bort prenumeration."
 
+#: 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/subscriptionlist.php:126
+msgid "(none)"
+msgstr "(ingen)"
+
 #: lib/tagcloudsection.php:56
 msgid "None"
 msgstr "Ingen"
diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po
index 4e3b165acf..c3b2dd169d 100644
--- a/locale/te/LC_MESSAGES/statusnet.po
+++ b/locale/te/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 21:25+0000\n"
-"PO-Revision-Date: 2009-12-07 21:27:26+0000\n"
+"POT-Creation-Date: 2009-12-12 17:09+0000\n"
+"PO-Revision-Date: 2009-12-12 17:10:31+0000\n"
 "Language-Team: Telugu\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n"
+"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: te\n"
 "X-Message-Group: out-statusnet\n"
@@ -26,11 +26,11 @@ msgstr "అటువంటి పేజీ లేదు"
 
 #: actions/all.php:74 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofile.php:105
 #: actions/apiaccountupdateprofilebackgroundimage.php:116
-#: actions/apiaccountupdateprofileimage.php:105
-#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
-#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
-#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
+#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90
 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
@@ -43,7 +43,7 @@ msgstr "అటువంటి పేజీ లేదు"
 #: actions/repliesrss.php:38 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38
 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
-#: lib/command.php:364 lib/command.php:411 lib/command.php:466
+#: lib/command.php:364 lib/command.php:411 lib/command.php:467
 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
 #: lib/subs.php:34 lib/subs.php:116
 msgid "No such user."
@@ -55,7 +55,7 @@ msgid "%s and friends, page %d"
 msgstr "%s మరియు మిత్రులు, పేజీ %d"
 
 #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
-#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100
+#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s మరియు మిత్రులు"
@@ -106,25 +106,25 @@ msgstr ""
 msgid "You and friends"
 msgstr "మీరు మరియు మీ స్నేహితులు"
 
-#: actions/allrss.php:119 actions/apitimelinefriends.php:121
+#: actions/allrss.php:119 actions/apitimelinefriends.php:122
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr ""
 
 #: actions/apiaccountratelimitstatus.php:70
 #: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofile.php:97
 #: actions/apiaccountupdateprofilebackgroundimage.php:94
 #: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apiaccountupdateprofile.php:97
 #, fuzzy
 msgid "API method not found."
 msgstr "నిర్ధారణ సంకేతం కనబడలేదు."
 
 #: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofile.php:89
 #: actions/apiaccountupdateprofilebackgroundimage.php:86
 #: actions/apiaccountupdateprofilecolors.php:110
-#: actions/apiaccountupdateprofileimage.php:84
-#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
+#: actions/apiaccountupdateprofileimage.php:84 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
@@ -144,9 +144,23 @@ msgstr ""
 msgid "Could not update user."
 msgstr "వాడుకరిని తాజాకరించలేకున్నాం."
 
+#: actions/apiaccountupdateprofile.php:112
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+msgid "User has no profile."
+msgstr "వాడుకరికి ప్రొఫైలు లేదు."
+
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "ప్రొఫైలుని భద్రపరచలేకున్నాం."
+
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257
 #: actions/designadminpanel.php:122 actions/newnotice.php:94
 #: lib/designsettings.php:283
 #, php-format
@@ -168,20 +182,6 @@ msgstr ""
 msgid "Could not update your design."
 msgstr "వాడుకరిని తాజాకరించలేకున్నాం."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
-#: actions/apiaccountupdateprofileimage.php:130
-#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
-#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
-msgid "User has no profile."
-msgstr "వాడుకరికి ప్రొఫైలు లేదు."
-
-#: actions/apiaccountupdateprofile.php:147
-#, fuzzy
-msgid "Could not save profile."
-msgstr "ప్రొఫైలుని భద్రపరచలేకున్నాం."
-
 #: actions/apiblockcreate.php:105
 #, fuzzy
 msgid "You cannot block yourself!"
@@ -195,6 +195,43 @@ msgstr "వాడుకరి నిరోధం విఫలమైంది."
 msgid "Unblock user failed."
 msgstr ""
 
+#: actions/apidirectmessage.php:89
+#, php-format
+msgid "Direct messages from %s"
+msgstr "%s నుండి నేరు సందేశాలు"
+
+#: actions/apidirectmessage.php:93
+#, php-format
+msgid "All the direct messages sent from %s"
+msgstr ""
+
+#: actions/apidirectmessage.php:101
+#, php-format
+msgid "Direct messages to %s"
+msgstr "%s కి నేరు సందేశాలు"
+
+#: actions/apidirectmessage.php:105
+#, php-format
+msgid "All the direct messages sent to %s"
+msgstr ""
+
+#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
+#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
+#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
+#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
+#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
+#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156
+#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151
+#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141
+#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
+msgid "API method not found!"
+msgstr ""
+
 #: actions/apidirectmessagenew.php:126
 msgid "No message text!"
 msgstr "సందేశపు పాఠ్యం లేదు!"
@@ -212,43 +249,6 @@ msgstr ""
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 
-#: actions/apidirectmessage.php:89
-#, php-format
-msgid "Direct messages from %s"
-msgstr ""
-
-#: actions/apidirectmessage.php:93
-#, php-format
-msgid "All the direct messages sent from %s"
-msgstr ""
-
-#: actions/apidirectmessage.php:101
-#, php-format
-msgid "Direct messages to %s"
-msgstr ""
-
-#: actions/apidirectmessage.php:105
-#, php-format
-msgid "All the direct messages sent to %s"
-msgstr ""
-
-#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
-#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
-#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
-#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
-#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
-#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
-#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
-#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
-#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
-#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
-#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149
-#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
-#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
-msgid "API method not found!"
-msgstr ""
-
 #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
 #: actions/apistatusesdestroy.php:113
 msgid "No status found with that ID."
@@ -386,25 +386,14 @@ msgid "Could not join user %s to group %s."
 msgstr "ఓపెన్ఐడీ ఫారమును సృష్టించలేకపోయాం: %s"
 
 #: actions/apigroupleave.php:114
-#, fuzzy
 msgid "You are not a member of this group."
-msgstr "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!"
+msgstr "మీరు ఈ గుంపులో సభ్యులు కాదు."
 
 #: actions/apigroupleave.php:124
 #, fuzzy, php-format
 msgid "Could not remove user %s to group %s."
 msgstr "ఓపెన్ఐడీ ఫారమును సృష్టించలేకపోయాం: %s"
 
-#: actions/apigrouplistall.php:90 actions/usergroups.php:62
-#, php-format
-msgid "%s groups"
-msgstr "%s గుంపులు"
-
-#: actions/apigrouplistall.php:94
-#, php-format
-msgid "groups on %s"
-msgstr "%s పై గుంపులు"
-
 #: actions/apigrouplist.php:95
 #, php-format
 msgid "%s's groups"
@@ -415,6 +404,16 @@ msgstr "%s యొక్క గుంపులు"
 msgid "Groups %s is a member of on %s."
 msgstr "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!"
 
+#: actions/apigrouplistall.php:90 actions/usergroups.php:62
+#, php-format
+msgid "%s groups"
+msgstr "%s గుంపులు"
+
+#: actions/apigrouplistall.php:94
+#, php-format
+msgid "groups on %s"
+msgstr "%s పై గుంపులు"
+
 #: actions/apistatusesdestroy.php:107
 msgid "This method requires a POST or DELETE."
 msgstr ""
@@ -433,9 +432,9 @@ msgstr ""
 
 #: actions/apistatusesupdate.php:157 actions/newnotice.php:155
 #: scripts/maildaemon.php:71
-#, fuzzy, php-format
+#, php-format
 msgid "That's too long. Max notice size is %d chars."
-msgstr "ఇది చాలా పొడవుంది. గరిష్ఠ సందేశ పరిమాణం 140 అక్షరాలు."
+msgstr "అది చాలా పొడవుంది. గరిష్ఠ నోటీసు పరిమాణం %d అక్షరాలు."
 
 #: actions/apistatusesupdate.php:198
 msgid "Not found"
@@ -450,54 +449,54 @@ msgstr ""
 msgid "Unsupported format."
 msgstr ""
 
-#: actions/apitimelinefavorites.php:107
+#: actions/apitimelinefavorites.php:108
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr ""
 
-#: actions/apitimelinefavorites.php:119
+#: actions/apitimelinefavorites.php:120
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr ""
 
-#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117
+#: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118
 #: actions/grouprss.php:131 actions/userrss.php:90
 #, php-format
 msgid "%s timeline"
 msgstr "%s కాలరేఖ"
 
-#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125
+#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
 #: actions/userrss.php:92
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr ""
 
-#: actions/apitimelinementions.php:116
+#: actions/apitimelinementions.php:117
 #, php-format
 msgid "%1$s / Updates mentioning %2$s"
 msgstr ""
 
-#: actions/apitimelinementions.php:126
+#: actions/apitimelinementions.php:127
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr ""
 
-#: actions/apitimelinepublic.php:106 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s బహిరంగ కాలరేఖ"
 
-#: actions/apitimelinepublic.php:110 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr ""
 
-#: actions/apitimelinetag.php:101 actions/tag.php:66
+#: actions/apitimelinetag.php:102 actions/tag.php:66
 #, php-format
 msgid "Notices tagged with %s"
 msgstr ""
 
-#: actions/apitimelinetag.php:107 actions/tagrss.php:64
+#: actions/apitimelinetag.php:108 actions/tagrss.php:64
 #, fuzzy, php-format
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr "%s యొక్క మైక్రోబ్లాగు"
@@ -533,45 +532,45 @@ msgstr "అవతారం"
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr ""
 
-#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:185
 #: actions/grouplogo.php:178 actions/remotesubscribe.php:191
 #: actions/userauthorization.php:72 actions/userrss.php:103
 msgid "User without matching profile"
 msgstr ""
 
-#: actions/avatarsettings.php:119 actions/avatarsettings.php:194
+#: actions/avatarsettings.php:119 actions/avatarsettings.php:197
 #: actions/grouplogo.php:251
 msgid "Avatar settings"
 msgstr "అవతారపు అమరికలు"
 
-#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/avatarsettings.php:127 actions/avatarsettings.php:205
 #: actions/grouplogo.php:199 actions/grouplogo.php:259
 msgid "Original"
 msgstr "అసలు"
 
-#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/avatarsettings.php:142 actions/avatarsettings.php:217
 #: actions/grouplogo.php:210 actions/grouplogo.php:271
 msgid "Preview"
 msgstr "మునుజూపు"
 
-#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
+#: actions/avatarsettings.php:149 lib/deleteuserform.php:66
 #: lib/noticelist.php:550
 msgid "Delete"
 msgstr "తొలగించు"
 
-#: actions/avatarsettings.php:165 actions/grouplogo.php:233
+#: actions/avatarsettings.php:166 actions/grouplogo.php:233
 msgid "Upload"
 msgstr "ఎగుమతించు"
 
-#: actions/avatarsettings.php:228 actions/grouplogo.php:286
+#: actions/avatarsettings.php:231 actions/grouplogo.php:286
 msgid "Crop"
 msgstr "కత్తిరించు"
 
-#: actions/avatarsettings.php:265 actions/disfavor.php:74
+#: actions/avatarsettings.php:268 actions/disfavor.php:74
 #: actions/emailsettings.php:238 actions/favor.php:75
 #: actions/groupblock.php:66 actions/grouplogo.php:309
 #: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -582,80 +581,36 @@ msgstr "కత్తిరించు"
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
-#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
+#: actions/avatarsettings.php:281 actions/designadminpanel.php:103
 #: actions/emailsettings.php:256 actions/grouplogo.php:319
 #: actions/imsettings.php:220 actions/recoverpassword.php:44
 #: actions/smssettings.php:248 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr ""
 
-#: actions/avatarsettings.php:322
+#: actions/avatarsettings.php:328
 msgid "Pick a square area of the image to be your avatar"
 msgstr ""
 
-#: actions/avatarsettings.php:337 actions/grouplogo.php:377
+#: actions/avatarsettings.php:343 actions/grouplogo.php:377
 msgid "Lost our file data."
 msgstr ""
 
-#: actions/avatarsettings.php:360
+#: actions/avatarsettings.php:366
 msgid "Avatar updated."
 msgstr "అవతారాన్ని తాజాకరించాం."
 
-#: actions/avatarsettings.php:363
+#: actions/avatarsettings.php:369
 msgid "Failed updating avatar."
 msgstr "అవతారపు తాజాకరణ విఫలమైంది."
 
-#: actions/avatarsettings.php:387
+#: actions/avatarsettings.php:393
 msgid "Avatar deleted."
 msgstr "అవతారాన్ని తొలగించాం."
 
-#: actions/blockedfromgroup.php:73 actions/editgroup.php:84
-#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
-#: actions/groupmembers.php:76 actions/grouprss.php:91
-#: actions/joingroup.php:76 actions/showgroup.php:121
-#, fuzzy
-msgid "No nickname"
-msgstr "పేరు లేదు."
-
-#: actions/blockedfromgroup.php:80 actions/editgroup.php:96
-#: actions/groupbyid.php:83 actions/groupdesignsettings.php:97
-#: actions/grouplogo.php:99 actions/groupmembers.php:83
-#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
-msgid "No such group"
-msgstr "అటువంటి గుంపు లేదు"
-
-#: actions/blockedfromgroup.php:90
-#, fuzzy, php-format
-msgid "%s blocked profiles"
-msgstr "వాడుకరికి ప్రొఫైలు లేదు."
-
-#: actions/blockedfromgroup.php:93
-#, fuzzy, php-format
-msgid "%s blocked profiles, page %d"
-msgstr "%s మరియు మిత్రులు"
-
-#: actions/blockedfromgroup.php:108
-msgid "A list of the users blocked from joining this group."
-msgstr ""
-
-#: actions/blockedfromgroup.php:281
-#, fuzzy
-msgid "Unblock user from group"
-msgstr "అటువంటి వాడుకరి లేరు."
-
-#: actions/blockedfromgroup.php:313 lib/unblockform.php:69
-msgid "Unblock"
-msgstr ""
-
-#: actions/blockedfromgroup.php:313 lib/unblockform.php:80
-#, fuzzy
-msgid "Unblock this user"
-msgstr "అటువంటి వాడుకరి లేరు."
-
 #: actions/block.php:69
-#, fuzzy
 msgid "You already blocked that user."
-msgstr "మీరు ఇప్పటికే ఈ వాడుకరిని నిరోధించారు."
+msgstr "మీరు ఇప్పటికే ఆ వాడుకరిని నిరోధించారు."
 
 #: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
 msgid "Block user"
@@ -690,6 +645,49 @@ msgstr "ఈ వాడుకరిని నిరోధించు"
 msgid "Failed to save block information."
 msgstr "నిరోధపు సమాచారాన్ని భద్రపరచడంలో విఫలమయ్యాం."
 
+#: actions/blockedfromgroup.php:73 actions/editgroup.php:84
+#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
+#: actions/groupmembers.php:76 actions/grouprss.php:91
+#: actions/joingroup.php:76 actions/showgroup.php:121
+#, fuzzy
+msgid "No nickname"
+msgstr "పేరు లేదు."
+
+#: actions/blockedfromgroup.php:80 actions/editgroup.php:96
+#: actions/groupbyid.php:83 actions/groupdesignsettings.php:97
+#: actions/grouplogo.php:99 actions/groupmembers.php:83
+#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
+msgid "No such group"
+msgstr "అటువంటి గుంపు లేదు"
+
+#: actions/blockedfromgroup.php:90
+#, fuzzy, php-format
+msgid "%s blocked profiles"
+msgstr "వాడుకరికి ప్రొఫైలు లేదు."
+
+#: actions/blockedfromgroup.php:93
+#, fuzzy, php-format
+msgid "%s blocked profiles, page %d"
+msgstr "%s మరియు మిత్రులు"
+
+#: actions/blockedfromgroup.php:108
+msgid "A list of the users blocked from joining this group."
+msgstr "ఈ గుంపు లోనికి చేరకుండా నిరోధించిన వాడుకరుల యొక్క జాబితా."
+
+#: actions/blockedfromgroup.php:281
+#, fuzzy
+msgid "Unblock user from group"
+msgstr "అటువంటి వాడుకరి లేరు."
+
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:69
+msgid "Unblock"
+msgstr ""
+
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:80
+#, fuzzy
+msgid "Unblock this user"
+msgstr "అటువంటి వాడుకరి లేరు."
+
 #: actions/bookmarklet.php:50
 msgid "Post to "
 msgstr ""
@@ -1152,6 +1150,14 @@ msgstr ""
 msgid "New incoming email address added."
 msgstr ""
 
+#: actions/favor.php:79
+msgid "This notice is already a favorite!"
+msgstr "ఈ నోటీసు ఇప్పటికే మీ ఇష్టాంశం!"
+
+#: actions/favor.php:92 lib/disfavorform.php:140
+msgid "Disfavor favorite"
+msgstr ""
+
 #: actions/favorited.php:65 lib/popularnoticesection.php:88
 #: lib/publicgroupnav.php:93
 msgid "Popular notices"
@@ -1194,14 +1200,6 @@ msgstr "%sకి ఇష్టమైన నోటీసులు"
 msgid "Updates favored by %1$s on %2$s!"
 msgstr "%s యొక్క మైక్రోబ్లాగు"
 
-#: actions/favor.php:79
-msgid "This notice is already a favorite!"
-msgstr "ఈ నోటీసు ఇప్పటికే మీ ఇష్టాంశం!"
-
-#: actions/favor.php:92 lib/disfavorform.php:140
-msgid "Disfavor favorite"
-msgstr ""
-
 #: actions/featured.php:69 lib/featureduserssection.php:87
 #: lib/publicgroupnav.php:89
 msgid "Featured users"
@@ -1248,7 +1246,7 @@ msgstr ""
 
 #: actions/finishremotesubscribe.php:99
 msgid "That user has blocked you from subscribing."
-msgstr ""
+msgstr "ఆ వాడుకరి మిమ్మల్ని చందాచేరకుండా నిరోధించారు."
 
 #: actions/finishremotesubscribe.php:110
 msgid "You are not authorized."
@@ -1323,7 +1321,7 @@ msgstr ""
 
 #: actions/groupblock.php:178
 msgid "Do not block this user from this group"
-msgstr ""
+msgstr "ఈ వాడుకరిని ఈ గుంపు నుండి నిరోధించకు"
 
 #: actions/groupblock.php:179
 msgid "Block this user from this group"
@@ -1353,9 +1351,8 @@ msgstr ""
 
 #: actions/groupdesignsettings.php:263 actions/userdesignsettings.php:186
 #: lib/designsettings.php:391 lib/designsettings.php:413
-#, fuzzy
 msgid "Couldn't update your design."
-msgstr "వాడుకరిని తాజాకరించలేకున్నాం."
+msgstr "మీ రూపురేఖలని తాజాకరించలేకపోయాం."
 
 #: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297
 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
@@ -1376,7 +1373,7 @@ msgstr "గుంపు చిహ్నం"
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
-msgstr ""
+msgstr "మీ గుంపుకి మీరు ఒక చిహ్నాన్ని ఎక్కించవచ్చు. ఆ ఫైలు యొక్క గరిష్ఠ పరిమాణం %s."
 
 #: actions/grouplogo.php:362
 msgid "Pick a square area of the image to be the logo."
@@ -1430,6 +1427,30 @@ msgstr ""
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "%s యొక్క మైక్రోబ్లాగు"
 
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+msgid "Groups"
+msgstr "గుంపులు"
+
+#: actions/groups.php:64
+#, php-format
+msgid "Groups, page %d"
+msgstr "గుంపులు, పేజీ %d"
+
+#: actions/groups.php:90
+#, php-format
+msgid ""
+"%%%%site.name%%%% groups let you find and talk with people of similar "
+"interests. After you join a group you can send messages to all other members "
+"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
+"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
+"%%%%)"
+msgstr ""
+
+#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
+msgid "Create a new group"
+msgstr "కొత్త గుంపుని సృష్టించు"
+
 #: actions/groupsearch.php:52
 #, fuzzy, php-format
 msgid ""
@@ -1462,30 +1483,6 @@ msgid ""
 "action.newgroup%%) yourself!"
 msgstr ""
 
-#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
-msgid "Groups"
-msgstr "గుంపులు"
-
-#: actions/groups.php:64
-#, php-format
-msgid "Groups, page %d"
-msgstr "గుంపులు, పేజీ %d"
-
-#: actions/groups.php:90
-#, php-format
-msgid ""
-"%%%%site.name%%%% groups let you find and talk with people of similar "
-"interests. After you join a group you can send messages to all other members "
-"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
-"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
-"%%%%)"
-msgstr ""
-
-#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
-msgid "Create a new group"
-msgstr "కొత్త గుంపుని సృష్టించు"
-
 #: actions/groupunblock.php:91
 msgid "Only an admin can unblock group members."
 msgstr ""
@@ -1664,7 +1661,7 @@ msgstr "వ్యక్తిగత సందేశం"
 msgid "Optionally add a personal message to the invitation."
 msgstr "ఐచ్ఛికంగా ఆహ్వానానికి వ్యక్తిగత సందేశం చేర్చండి."
 
-#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:222
 msgid "Send"
 msgstr "పంపించు"
 
@@ -1720,7 +1717,7 @@ msgstr ""
 #: actions/joingroup.php:135 lib/command.php:239
 #, php-format
 msgid "%s joined group %s"
-msgstr ""
+msgstr "%s %s గుంపులో చేరారు"
 
 #: actions/leavegroup.php:60
 msgid "You must be logged in to leave a group."
@@ -1744,63 +1741,63 @@ msgstr "ఓపెన్ఐడీ ఫారమును సృష్టించ
 msgid "%s left group %s"
 msgstr "%2$s గుంపు నుండి %1$s వైదొలిగారు"
 
-#: actions/login.php:82 actions/register.php:137
+#: actions/login.php:83 actions/register.php:137
 msgid "Already logged in."
 msgstr "ఇప్పటికే లోనికి ప్రవేశించారు."
 
-#: actions/login.php:113 actions/login.php:123
+#: actions/login.php:114 actions/login.php:124
 #, fuzzy
 msgid "Invalid or expired token."
 msgstr "సందేశపు విషయం సరైనది కాదు"
 
-#: actions/login.php:146
+#: actions/login.php:147
 msgid "Incorrect username or password."
 msgstr "వాడుకరిపేరు లేదా సంకేతపదం తప్పు."
 
-#: actions/login.php:152
+#: actions/login.php:153
 msgid "Error setting user. You are probably not authorized."
 msgstr ""
 
-#: actions/login.php:207 actions/login.php:260 lib/action.php:458
+#: actions/login.php:208 actions/login.php:261 lib/action.php:458
 #: lib/logingroupnav.php:79
 msgid "Login"
 msgstr "ప్రవేశించండి"
 
-#: actions/login.php:246
+#: actions/login.php:247
 msgid "Login to site"
 msgstr ""
 
-#: actions/login.php:249 actions/profilesettings.php:106
+#: actions/login.php:250 actions/profilesettings.php:106
 #: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
 #: lib/groupeditform.php:152 lib/userprofile.php:131
 msgid "Nickname"
 msgstr "పేరు"
 
-#: actions/login.php:252 actions/register.php:428
+#: actions/login.php:253 actions/register.php:428
 #: lib/accountsettingsaction.php:116
 msgid "Password"
 msgstr "సంకేతపదం"
 
-#: actions/login.php:255 actions/register.php:477
+#: actions/login.php:256 actions/register.php:477
 msgid "Remember me"
 msgstr "నన్ను గుర్తుంచుకో"
 
-#: actions/login.php:256 actions/register.php:479
+#: actions/login.php:257 actions/register.php:479
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "భవిష్యత్తులో ఆటోమెటిగ్గా లోనికి ప్రవేశించు; బయటి కంప్యూర్ల కొరకు కాదు!"
 
-#: actions/login.php:266
+#: actions/login.php:267
 msgid "Lost or forgotten password?"
 msgstr "మీ సంకేతపదం మర్చిపోయారా?"
 
-#: actions/login.php:285
+#: actions/login.php:286
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 msgstr ""
 "భద్రతా కారణాల దృష్ట్యా, అమరికలు మార్చే ముందు మీ వాడుకరి పేరుని మరియు సంకేతపదాన్ని మరోసారి ఇవ్వండి."
 
-#: actions/login.php:289
+#: actions/login.php:290
 #, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -1869,7 +1866,7 @@ msgstr "సందేశాన్ని పంపించాం"
 msgid "Direct message to %s sent"
 msgstr ""
 
-#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:242 lib/channel.php:170
 msgid "Ajax Error"
 msgstr ""
 
@@ -1877,7 +1874,7 @@ msgstr ""
 msgid "New notice"
 msgstr "కొత్త సందేశం"
 
-#: actions/newnotice.php:206
+#: actions/newnotice.php:208
 #, fuzzy
 msgid "Notice posted"
 msgstr "సందేశాలు"
@@ -1954,8 +1951,8 @@ msgstr "విషయ రకం "
 msgid "Only "
 msgstr "మాత్రమే "
 
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996
-#: lib/api.php:1024 lib/api.php:1134
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011
+#: lib/api.php:1039 lib/api.php:1149
 msgid "Not a supported data format."
 msgstr ""
 
@@ -2297,7 +2294,7 @@ msgstr "కాలమండలం"
 
 #: actions/profilesettings.php:155
 msgid "What timezone are you normally in?"
-msgstr ""
+msgstr "మీరు సామాన్యంగా ఉండే కాలమండలం ఏది?"
 
 #: actions/profilesettings.php:160
 msgid ""
@@ -2560,9 +2557,8 @@ msgid "Sorry, only invited people can register."
 msgstr "క్షమించండి, ఆహ్వానితులు మాత్రమే నమోదుకాగలరు."
 
 #: actions/register.php:92
-#, fuzzy
 msgid "Sorry, invalid invitation code."
-msgstr "నిర్ధారణ సంకేతంలో పొరపాటు."
+msgstr "క్షమించండి, తప్పు ఆహ్వాన సంకేతం."
 
 #: actions/register.php:112
 msgid "Registration successful"
@@ -2579,7 +2575,7 @@ msgstr ""
 
 #: actions/register.php:198
 msgid "You can't register if you don't agree to the license."
-msgstr ""
+msgstr "ఈ లైసెన్సుకి అంగీకరించకపోతే మీరు నమోదుచేసుకోలేరు."
 
 #: actions/register.php:201
 msgid "Not a valid email address."
@@ -2601,7 +2597,7 @@ msgstr ""
 
 #: actions/register.php:424
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
+msgstr "1-64 చిన్నబడి అక్షరాలు లేదా అంకెలు, విరామ చిహ్నాలు లేదా ఖాళీలు లేకుండా. తప్పనిసరి."
 
 #: actions/register.php:429
 msgid "6 or more characters. Required."
@@ -2630,14 +2626,13 @@ msgstr ""
 
 #: actions/register.php:495
 msgid "Creative Commons Attribution 3.0"
-msgstr ""
+msgstr "క్రియేటివ్ కామన్స్ అట్రిబ్యూషన్ 3.0"
 
 #: actions/register.php:496
-#, fuzzy
 msgid ""
 " except this private data: password, email address, IM address, and phone "
 "number."
-msgstr "ఈ అంతరంగిక భోగట్టా తప్ప: సంకేతపదం, ఈమెయిల్ చిరునామా, IM చిరునామా, ఫోన్ నంబర్."
+msgstr " ఈ అంతరంగిక భోగట్టా తప్ప: సంకేతపదం, ఈమెయిల్ చిరునామా, IM చిరునామా, మరియు ఫోన్ నంబర్."
 
 #: actions/register.php:537
 #, php-format
@@ -2781,9 +2776,9 @@ msgid "User is already sandboxed."
 msgstr "వాడుకరిని ఇప్పటికే గుంపునుండి నిరోధించారు."
 
 #: actions/showfavorites.php:79
-#, fuzzy, php-format
+#, php-format
 msgid "%s's favorite notices, page %d"
-msgstr "అటువంటి సందేశమేమీ లేదు."
+msgstr "%sకి ఇష్టమైన నోటీసులు, పేజీ %d"
 
 #: actions/showfavorites.php:132
 msgid "Could not retrieve favorite notices."
@@ -2827,7 +2822,7 @@ msgstr ""
 
 #: actions/showfavorites.php:242
 msgid "This is a way to share what you like."
-msgstr ""
+msgstr "మీకు నచ్చినవి పంచుకోడానికి ఇదొక మార్గం."
 
 #: actions/showgroup.php:82 lib/groupnav.php:86
 #, php-format
@@ -2932,7 +2927,7 @@ msgstr "అటువంటి సందేశం లేదు."
 
 #: actions/showmessage.php:98
 msgid "Only the sender and recipient may read this message."
-msgstr ""
+msgstr "పంపినవారు మరియు అందుకున్నవారు మాత్రమే ఈ సందేశాన్ని చదవవచ్చు."
 
 #: actions/showmessage.php:108
 #, php-format
@@ -3036,9 +3031,8 @@ msgid "Site name must have non-zero length."
 msgstr ""
 
 #: actions/siteadminpanel.php:155
-#, fuzzy
 msgid "You must have a valid contact email address"
-msgstr "సరైన ఈమెయిలు చిరునామా కాదు"
+msgstr "మీకు సరైన సంప్రదింపు ఈమెయిలు చిరునామా ఉండాలి"
 
 #: actions/siteadminpanel.php:173
 #, php-format
@@ -3067,7 +3061,7 @@ msgstr ""
 
 #: actions/siteadminpanel.php:210
 msgid "Minimum text limit is 140 characters."
-msgstr ""
+msgstr "కనిష్ఠ పాఠ్య పరిమితి 140 అక్షరాలు."
 
 #: actions/siteadminpanel.php:216
 msgid "Dupe limit must 1 or more seconds."
@@ -3151,18 +3145,16 @@ msgid "Access"
 msgstr "అంగీకరించు"
 
 #: actions/siteadminpanel.php:334
-#, fuzzy
 msgid "Private"
-msgstr "అంతరంగికత"
+msgstr "అంతరంగికం"
 
 #: actions/siteadminpanel.php:336
 msgid "Prohibit anonymous users (not logged in) from viewing site?"
 msgstr ""
 
 #: actions/siteadminpanel.php:340
-#, fuzzy
 msgid "Invite only"
-msgstr "ఆహ్వానించు"
+msgstr "ఆహ్వానితులకు మాత్రమే"
 
 #: actions/siteadminpanel.php:342
 msgid "Make registration invitation only."
@@ -3391,7 +3383,7 @@ msgstr "%s చందాదార్లు"
 #: actions/subscribers.php:52
 #, php-format
 msgid "%s subscribers, page %d"
-msgstr ""
+msgstr "%s చందాదార్లు, పేజీ %d"
 
 #: actions/subscribers.php:63
 msgid "These are the people who listen to your notices."
@@ -3455,14 +3447,33 @@ msgid "%s is not listening to anyone."
 msgstr ""
 
 #: actions/subscriptions.php:194
-#, fuzzy
 msgid "Jabber"
-msgstr "Jabber ID లేదు."
+msgstr "జాబర్"
 
 #: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
 msgid "SMS"
 msgstr ""
 
+#: actions/tag.php:68
+#, fuzzy, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr "%s యొక్క మైక్రోబ్లాగు"
+
+#: actions/tag.php:86
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "%s యొక్క సందేశముల ఫీడు"
+
+#: actions/tag.php:92
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "%s యొక్క సందేశముల ఫీడు"
+
+#: actions/tag.php:98
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "%s యొక్క సందేశముల ఫీడు"
+
 #: actions/tagother.php:33
 msgid "Not logged in"
 msgstr "లోనికి ప్రవేశించలేదు"
@@ -3508,30 +3519,9 @@ msgstr "ట్యాగులని భద్రపరచలేకపోయా
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 
-#: actions/tag.php:68
-#, fuzzy, php-format
-msgid "Notices tagged with %s, page %d"
-msgstr "%s యొక్క మైక్రోబ్లాగు"
-
-#: actions/tag.php:86
-#, fuzzy, php-format
-msgid "Notice feed for tag %s (RSS 1.0)"
-msgstr "%s యొక్క సందేశముల ఫీడు"
-
-#: actions/tag.php:92
-#, fuzzy, php-format
-msgid "Notice feed for tag %s (RSS 2.0)"
-msgstr "%s యొక్క సందేశముల ఫీడు"
-
-#: actions/tag.php:98
-#, fuzzy, php-format
-msgid "Notice feed for tag %s (Atom)"
-msgstr "%s యొక్క సందేశముల ఫీడు"
-
 #: actions/tagrss.php:35
-#, fuzzy
 msgid "No such tag."
-msgstr "అటువంటి సందేశమేమీ లేదు."
+msgstr "అటువంటి ట్యాగు లేదు."
 
 #: actions/twitapitrends.php:87
 msgid "API method under construction."
@@ -3577,7 +3567,7 @@ msgstr "వాడుకరి"
 
 #: actions/useradminpanel.php:69
 msgid "User settings for this StatusNet site."
-msgstr ""
+msgstr "ఈ స్టేటస్&zwnj;నెట్ సైటుకి వాడుకరి అమరికలు."
 
 #: actions/useradminpanel.php:149
 msgid "Invalid bio limit. Must be numeric."
@@ -3689,9 +3679,8 @@ msgid "Reject"
 msgstr "తిరస్కరించు"
 
 #: actions/userauthorization.php:212
-#, fuzzy
 msgid "Reject this subscription"
-msgstr "అన్ని చందాలు"
+msgstr "ఈ చందాని తిరస్కరించు"
 
 #: actions/userauthorization.php:225
 msgid "No authorization request!"
@@ -3759,9 +3748,8 @@ msgid "No id."
 msgstr "ఐడీ లేదు."
 
 #: actions/userdesignsettings.php:76 lib/designsettings.php:65
-#, fuzzy
 msgid "Profile design"
-msgstr "ఫ్రొఫైలు అమరికలు"
+msgstr "ఫ్రొఫైలు రూపురేఖలు"
 
 #: actions/userdesignsettings.php:87 lib/designsettings.php:76
 msgid ""
@@ -3780,12 +3768,12 @@ msgstr "%s గుంపులు, పేజీ %d"
 
 #: actions/usergroups.php:130
 msgid "Search for more groups"
-msgstr ""
+msgstr "మరిన్ని గుంపులకై వెతుకు"
 
 #: actions/usergroups.php:153
-#, fuzzy, php-format
+#, php-format
 msgid "%s is not a member of any group."
-msgstr "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!"
+msgstr "%s ఏ గుంపు లోనూ సభ్యులు కాదు."
 
 #: actions/usergroups.php:158
 #, php-format
@@ -3810,9 +3798,8 @@ msgid "A file this large would exceed your monthly quota of %d bytes."
 msgstr ""
 
 #: classes/Message.php:45
-#, fuzzy
 msgid "You are banned from sending direct messages."
-msgstr "మీకు వచ్చిన సందేశాలు"
+msgstr "నేరుగా సందేశాలు పంపడం నుండి మిమ్మల్ని నిషేధించారు."
 
 #: classes/Message.php:61
 msgid "Could not insert message."
@@ -3827,40 +3814,45 @@ msgstr ""
 msgid "DB error inserting hashtag: %s"
 msgstr ""
 
-#: classes/Notice.php:179
+#: classes/Notice.php:188
 #, fuzzy
 msgid "Problem saving notice. Too long."
 msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు."
 
-#: classes/Notice.php:183
+#: classes/Notice.php:192
 #, fuzzy
 msgid "Problem saving notice. Unknown user."
 msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు."
 
-#: classes/Notice.php:188
+#: classes/Notice.php:197
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
-#: classes/Notice.php:194
+#: classes/Notice.php:203
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
 msgstr ""
 
-#: classes/Notice.php:200
+#: classes/Notice.php:209
 msgid "You are banned from posting notices on this site."
 msgstr ""
 
-#: classes/Notice.php:265 classes/Notice.php:290
+#: classes/Notice.php:274 classes/Notice.php:299
 msgid "Problem saving notice."
 msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు."
 
-#: classes/Notice.php:1124
+#: classes/Notice.php:1115
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr ""
 
+#: classes/User.php:347
+#, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr "@%2$s, %1$sకి స్వాగతం!"
+
 #: classes/User_group.php:380
 msgid "Could not create group."
 msgstr "గుంపుని సృష్టించలేకపోయాం."
@@ -3870,11 +3862,6 @@ msgstr "గుంపుని సృష్టించలేకపోయాం."
 msgid "Could not set group membership."
 msgstr "చందాని సృష్టించలేకపోయాం."
 
-#: classes/User.php:347
-#, php-format
-msgid "Welcome to %1$s, @%2$s!"
-msgstr "@%2$s, %1$sకి స్వాగతం!"
-
 #: lib/accountsettingsaction.php:108
 msgid "Change your profile settings"
 msgstr ""
@@ -3976,9 +3963,8 @@ msgid "Help"
 msgstr "సహాయం"
 
 #: lib/action.php:461
-#, fuzzy
 msgid "Help me!"
-msgstr "సహాయం"
+msgstr "సహాయం కావాలి!"
 
 #: lib/action.php:464 lib/searchaction.php:127
 msgid "Search"
@@ -4189,7 +4175,7 @@ msgstr ""
 msgid "Notice with that id does not exist"
 msgstr ""
 
-#: lib/command.php:168 lib/command.php:416 lib/command.php:471
+#: lib/command.php:168 lib/command.php:416 lib/command.php:472
 msgid "User has no last notice"
 msgstr ""
 
@@ -4236,102 +4222,99 @@ msgstr ""
 msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr "నోటిసు చాలా పొడవుగా ఉంది - %d అక్షరాలు గరిష్ఠం, మీరు %d పంపించారు"
 
-#: lib/command.php:439
+#: lib/command.php:440
 #, fuzzy, php-format
 msgid "Reply to %s sent"
 msgstr "%sకి స్పందనలు"
 
-#: lib/command.php:441
+#: lib/command.php:442
 #, fuzzy
 msgid "Error saving notice."
 msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు."
 
-#: lib/command.php:495
+#: lib/command.php:496
 msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: lib/command.php:502
+#: lib/command.php:503
 #, php-format
 msgid "Subscribed to %s"
 msgstr ""
 
-#: lib/command.php:523
+#: lib/command.php:524
 msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: lib/command.php:530
+#: lib/command.php:531
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr ""
 
-#: lib/command.php:548 lib/command.php:571
+#: lib/command.php:549 lib/command.php:572
 msgid "Command not yet implemented."
 msgstr ""
 
-#: lib/command.php:551
+#: lib/command.php:552
 msgid "Notification off."
 msgstr ""
 
-#: lib/command.php:553
+#: lib/command.php:554
 msgid "Can't turn off notification."
 msgstr ""
 
-#: lib/command.php:574
+#: lib/command.php:575
 msgid "Notification on."
 msgstr ""
 
-#: lib/command.php:576
+#: lib/command.php:577
 msgid "Can't turn on notification."
 msgstr ""
 
-#: lib/command.php:588
+#: lib/command.php:590
 msgid "Login command is disabled"
 msgstr ""
 
-#: lib/command.php:602
+#: lib/command.php:604
 #, fuzzy, php-format
 msgid "Could not create login token for %s"
 msgstr "మారుపేర్లని సృష్టించలేకపోయాం."
 
-#: lib/command.php:607
+#: lib/command.php:609
 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:623
-#, fuzzy
-msgid "You are not subscribed to anyone."
-msgstr "%sకి స్పందనలు"
-
 #: lib/command.php:625
+msgid "You are not subscribed to anyone."
+msgstr "మీరు ఎవరికీ చందాచేరలేదు."
+
+#: lib/command.php:627
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "%sకి స్పందనలు"
 msgstr[1] "%sకి స్పందనలు"
 
-#: lib/command.php:645
-#, fuzzy
-msgid "No one is subscribed to you."
-msgstr "%sకి స్పందనలు"
-
 #: lib/command.php:647
+msgid "No one is subscribed to you."
+msgstr "మీకు చందాదార్లు ఎవరూ లేరు."
+
+#: lib/command.php:649
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "%sకి స్పందనలు"
 msgstr[1] "%sకి స్పందనలు"
 
-#: lib/command.php:667
-#, fuzzy
-msgid "You are not a member of any groups."
-msgstr "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!"
-
 #: lib/command.php:669
+msgid "You are not a member of any groups."
+msgstr "మీరు ఏ గుంపులోనూ సభ్యులు కాదు."
+
+#: lib/command.php:671
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!"
 msgstr[1] "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!"
 
-#: lib/command.php:683
+#: lib/command.php:685
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -4404,9 +4387,8 @@ msgid "Database error"
 msgstr ""
 
 #: lib/designsettings.php:105
-#, fuzzy
 msgid "Upload file"
-msgstr "ఎగుమతించు"
+msgstr "ఫైలుని ఎక్కించు"
 
 #: lib/designsettings.php:109
 #, fuzzy
@@ -4431,10 +4413,6 @@ msgstr "అటువంటి సందేశమేమీ లేదు."
 msgid "Favor"
 msgstr ""
 
-#: lib/feedlist.php:64
-msgid "Export data"
-msgstr ""
-
 #: lib/feed.php:85
 msgid "RSS 1.0"
 msgstr ""
@@ -4451,6 +4429,10 @@ msgstr ""
 msgid "FOAF"
 msgstr ""
 
+#: lib/feedlist.php:64
+msgid "Export data"
+msgstr ""
+
 #: lib/galleryaction.php:121
 msgid "Filter tags"
 msgstr ""
@@ -4522,7 +4504,7 @@ msgstr "%s నిరోధిత వాడుకరులు"
 #: lib/groupnav.php:108
 #, php-format
 msgid "Edit %s group properties"
-msgstr ""
+msgstr "%s గుంపు లక్షణాలను మార్చు"
 
 #: lib/groupnav.php:113
 msgid "Logo"
@@ -4615,20 +4597,6 @@ msgstr "వాడుకరిపేరు మరియు సంకేతపద
 msgid "Sign up for a new account"
 msgstr "కొత్త ఖాతా సృష్టించుకోండి"
 
-#: lib/mailbox.php:89
-msgid "Only the user can read their own mailboxes."
-msgstr ""
-
-#: lib/mailbox.php:139
-msgid ""
-"You have no private messages. You can send private message to engage other "
-"users in conversation. People can send you messages for your eyes only."
-msgstr ""
-
-#: lib/mailbox.php:227 lib/noticelist.php:452
-msgid "from"
-msgstr "నుండి"
-
 #: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "ఈమెయిల్ చిరునామా నిర్ధారణ"
@@ -4686,6 +4654,8 @@ msgid ""
 "Bio: %s\n"
 "\n"
 msgstr ""
+"స్వపరిచయం: %s\n"
+"\n"
 
 #: lib/mail.php:286
 #, php-format
@@ -4805,6 +4775,20 @@ msgid ""
 "\n"
 msgstr ""
 
+#: lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
+msgstr ""
+
+#: lib/mailbox.php:139
+msgid ""
+"You have no private messages. You can send private message to engage other "
+"users in conversation. People can send you messages for your eyes only."
+msgstr ""
+
+#: lib/mailbox.php:227 lib/noticelist.php:452
+msgid "from"
+msgstr "నుండి"
+
 #: lib/mediafile.php:98 lib/mediafile.php:123
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
@@ -4866,7 +4850,7 @@ msgstr ""
 msgid "To"
 msgstr ""
 
-#: lib/messageform.php:161 lib/noticeform.php:185
+#: lib/messageform.php:159 lib/noticeform.php:183
 msgid "Available characters"
 msgstr "అందుబాటులో ఉన్న అక్షరాలు"
 
@@ -4880,11 +4864,11 @@ msgstr "కొత్త సందేశం"
 msgid "What's up, %s?"
 msgstr "%s, సంగతులేమిటి?"
 
-#: lib/noticeform.php:192
+#: lib/noticeform.php:190
 msgid "Attach"
 msgstr "జోడించు"
 
-#: lib/noticeform.php:196
+#: lib/noticeform.php:194
 msgid "Attach a file"
 msgstr "ఒక ఫైలుని జోడించు"
 
@@ -4894,21 +4878,20 @@ msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 
 #: lib/noticelist.php:404
-#, fuzzy
 msgid "N"
-msgstr "కాదు"
+msgstr "ఉ"
 
 #: lib/noticelist.php:404
 msgid "S"
-msgstr ""
+msgstr "ద"
 
 #: lib/noticelist.php:405
 msgid "E"
-msgstr ""
+msgstr "తూ"
 
 #: lib/noticelist.php:405
 msgid "W"
-msgstr ""
+msgstr "ప"
 
 #: lib/noticelist.php:411
 msgid "at"
@@ -4956,11 +4939,11 @@ msgstr "దూరపు ప్రొపైలుని చేర్చటంల
 msgid "Duplicate notice"
 msgstr "కొత్త సందేశం"
 
-#: lib/oauthstore.php:467 lib/subs.php:48
+#: lib/oauthstore.php:466 lib/subs.php:48
 msgid "You have been banned from subscribing."
-msgstr ""
+msgstr "చందాచేరడం నుండి మిమ్మల్ని నిషేధించారు."
 
-#: lib/oauthstore.php:492
+#: lib/oauthstore.php:491
 msgid "Couldn't insert new subscription."
 msgstr ""
 
@@ -4978,7 +4961,7 @@ msgstr "ఇష్టాంశాలు"
 
 #: lib/personalgroupnav.php:124
 msgid "Inbox"
-msgstr ""
+msgstr "వచ్చినవి"
 
 #: lib/personalgroupnav.php:125
 msgid "Your incoming messages"
@@ -4986,7 +4969,7 @@ msgstr "మీకు వచ్చిన సందేశాలు"
 
 #: lib/personalgroupnav.php:129
 msgid "Outbox"
-msgstr ""
+msgstr "పంపినవి"
 
 #: lib/personalgroupnav.php:130
 msgid "Your sent messages"
@@ -5126,20 +5109,6 @@ msgstr "%sకి స్పందనలు"
 msgid "Groups %s is a member of"
 msgstr "%s సభ్యులుగా ఉన్న గుంపులు"
 
-#: lib/subscriberspeopleselftagcloudsection.php:48
-#: lib/subscriptionspeopleselftagcloudsection.php:48
-msgid "People Tagcloud as self-tagged"
-msgstr ""
-
-#: lib/subscriberspeopletagcloudsection.php:48
-#: lib/subscriptionspeopletagcloudsection.php:48
-msgid "People Tagcloud as tagged"
-msgstr ""
-
-#: lib/subscriptionlist.php:126
-msgid "(none)"
-msgstr "(ఏమీలేవు)"
-
 #: lib/subs.php:52
 msgid "Already subscribed!"
 msgstr ""
@@ -5170,6 +5139,20 @@ msgstr "చందాని తొలగించలేకపోయాం."
 msgid "Couldn't delete subscription."
 msgstr "చందాని తొలగించలేకపోయాం."
 
+#: lib/subscriberspeopleselftagcloudsection.php:48
+#: lib/subscriptionspeopleselftagcloudsection.php:48
+msgid "People Tagcloud as self-tagged"
+msgstr ""
+
+#: lib/subscriberspeopletagcloudsection.php:48
+#: lib/subscriptionspeopletagcloudsection.php:48
+msgid "People Tagcloud as tagged"
+msgstr ""
+
+#: lib/subscriptionlist.php:126
+msgid "(none)"
+msgstr "(ఏమీలేవు)"
+
 #: lib/tagcloudsection.php:56
 msgid "None"
 msgstr "ఏమీలేదు"
@@ -5285,7 +5268,7 @@ msgstr "%s అనేది సరైన రంగు కాదు!"
 #: lib/webcolor.php:123
 #, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex chars."
-msgstr ""
+msgstr "%s అనేది సరైన రంగు కాదు! 3 లేదా 6 హెక్స్ అక్షరాలను వాడండి."
 
 #: scripts/maildaemon.php:48
 msgid "Could not parse message."
@@ -5297,7 +5280,7 @@ msgstr "నమోదైన వాడుకరి కాదు."
 
 #: scripts/maildaemon.php:57
 msgid "Sorry, that is not your incoming email address."
-msgstr ""
+msgstr "క్షమించండి, అది మీ లోనికివచ్చు ఈమెయిలు చిరునామా కాదు."
 
 #: scripts/maildaemon.php:61
 msgid "Sorry, no incoming email allowed."
diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po
index 3d9661e7db..713c2731f8 100644
--- a/locale/tr/LC_MESSAGES/statusnet.po
+++ b/locale/tr/LC_MESSAGES/statusnet.po
@@ -7,12 +7,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 21:25+0000\n"
-"PO-Revision-Date: 2009-12-07 21:27:29+0000\n"
+"POT-Creation-Date: 2009-12-12 17:09+0000\n"
+"PO-Revision-Date: 2009-12-12 17:10:33+0000\n"
 "Language-Team: Turkish\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n"
+"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tr\n"
 "X-Message-Group: out-statusnet\n"
@@ -26,11 +26,11 @@ msgstr "Böyle bir durum mesajı yok."
 
 #: actions/all.php:74 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofile.php:105
 #: actions/apiaccountupdateprofilebackgroundimage.php:116
-#: actions/apiaccountupdateprofileimage.php:105
-#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
-#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
-#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
+#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90
 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
@@ -43,7 +43,7 @@ msgstr "Böyle bir durum mesajı yok."
 #: actions/repliesrss.php:38 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38
 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
-#: lib/command.php:364 lib/command.php:411 lib/command.php:466
+#: lib/command.php:364 lib/command.php:411 lib/command.php:467
 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
 #: lib/subs.php:34 lib/subs.php:116
 msgid "No such user."
@@ -55,7 +55,7 @@ msgid "%s and friends, page %d"
 msgstr "%s ve arkadaşları"
 
 #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
-#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100
+#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s ve arkadaşları"
@@ -107,25 +107,25 @@ msgstr ""
 msgid "You and friends"
 msgstr "%s ve arkadaşları"
 
-#: actions/allrss.php:119 actions/apitimelinefriends.php:121
+#: actions/allrss.php:119 actions/apitimelinefriends.php:122
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr ""
 
 #: actions/apiaccountratelimitstatus.php:70
 #: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofile.php:97
 #: actions/apiaccountupdateprofilebackgroundimage.php:94
 #: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apiaccountupdateprofile.php:97
 #, fuzzy
 msgid "API method not found."
 msgstr "Onay kodu bulunamadı."
 
 #: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofile.php:89
 #: actions/apiaccountupdateprofilebackgroundimage.php:86
 #: actions/apiaccountupdateprofilecolors.php:110
-#: actions/apiaccountupdateprofileimage.php:84
-#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
+#: actions/apiaccountupdateprofileimage.php:84 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
@@ -145,9 +145,23 @@ msgstr ""
 msgid "Could not update user."
 msgstr "Kullanıcı güncellenemedi."
 
+#: actions/apiaccountupdateprofile.php:112
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+msgid "User has no profile."
+msgstr "Kullanıcının profili yok."
+
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "Profil kaydedilemedi."
+
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257
 #: actions/designadminpanel.php:122 actions/newnotice.php:94
 #: lib/designsettings.php:283
 #, php-format
@@ -169,20 +183,6 @@ msgstr ""
 msgid "Could not update your design."
 msgstr "Kullanıcı güncellenemedi."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
-#: actions/apiaccountupdateprofileimage.php:130
-#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
-#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
-msgid "User has no profile."
-msgstr "Kullanıcının profili yok."
-
-#: actions/apiaccountupdateprofile.php:147
-#, fuzzy
-msgid "Could not save profile."
-msgstr "Profil kaydedilemedi."
-
 #: actions/apiblockcreate.php:105
 #, fuzzy
 msgid "You cannot block yourself!"
@@ -196,24 +196,6 @@ msgstr ""
 msgid "Unblock user failed."
 msgstr ""
 
-#: actions/apidirectmessagenew.php:126
-msgid "No message text!"
-msgstr ""
-
-#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
-#, fuzzy, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr ""
-"Ah, durumunuz biraz uzun kaçtı. Azami 180 karaktere sığdırmaya ne dersiniz?"
-
-#: actions/apidirectmessagenew.php:146
-msgid "Recipient user not found."
-msgstr ""
-
-#: actions/apidirectmessagenew.php:150
-msgid "Can't send direct messages to users who aren't your friend."
-msgstr ""
-
 #: actions/apidirectmessage.php:89
 #, php-format
 msgid "Direct messages from %s"
@@ -239,18 +221,36 @@ msgstr ""
 #: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
-#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
-#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149
-#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
-#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156
+#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151
+#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141
+#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
 msgid "API method not found!"
 msgstr ""
 
+#: actions/apidirectmessagenew.php:126
+msgid "No message text!"
+msgstr ""
+
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, fuzzy, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr ""
+"Ah, durumunuz biraz uzun kaçtı. Azami 180 karaktere sığdırmaya ne dersiniz?"
+
+#: actions/apidirectmessagenew.php:146
+msgid "Recipient user not found."
+msgstr ""
+
+#: actions/apidirectmessagenew.php:150
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr ""
+
 #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
 #: actions/apistatusesdestroy.php:113
 msgid "No status found with that ID."
@@ -401,16 +401,6 @@ msgstr "Bize o profili yollamadınız"
 msgid "Could not remove user %s to group %s."
 msgstr "OpenID formu yaratılamadı: %s"
 
-#: actions/apigrouplistall.php:90 actions/usergroups.php:62
-#, php-format
-msgid "%s groups"
-msgstr ""
-
-#: actions/apigrouplistall.php:94
-#, php-format
-msgid "groups on %s"
-msgstr ""
-
 #: actions/apigrouplist.php:95
 #, fuzzy, php-format
 msgid "%s's groups"
@@ -421,6 +411,16 @@ msgstr "Profil"
 msgid "Groups %s is a member of on %s."
 msgstr "Bize o profili yollamadınız"
 
+#: actions/apigrouplistall.php:90 actions/usergroups.php:62
+#, php-format
+msgid "%s groups"
+msgstr ""
+
+#: actions/apigrouplistall.php:94
+#, php-format
+msgid "groups on %s"
+msgstr ""
+
 #: actions/apistatusesdestroy.php:107
 msgid "This method requires a POST or DELETE."
 msgstr ""
@@ -459,54 +459,54 @@ msgstr ""
 msgid "Unsupported format."
 msgstr "Desteklenmeyen görüntü dosyası biçemi."
 
-#: actions/apitimelinefavorites.php:107
+#: actions/apitimelinefavorites.php:108
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr ""
 
-#: actions/apitimelinefavorites.php:119
+#: actions/apitimelinefavorites.php:120
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr ""
 
-#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117
+#: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118
 #: actions/grouprss.php:131 actions/userrss.php:90
 #, php-format
 msgid "%s timeline"
 msgstr ""
 
-#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125
+#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
 #: actions/userrss.php:92
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr ""
 
-#: actions/apitimelinementions.php:116
+#: actions/apitimelinementions.php:117
 #, fuzzy, php-format
 msgid "%1$s / Updates mentioning %2$s"
 msgstr "%1$s'in %2$s'deki durum mesajları "
 
-#: actions/apitimelinementions.php:126
+#: actions/apitimelinementions.php:127
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr ""
 
-#: actions/apitimelinepublic.php:106 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr ""
 
-#: actions/apitimelinepublic.php:110 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr ""
 
-#: actions/apitimelinetag.php:101 actions/tag.php:66
+#: actions/apitimelinetag.php:102 actions/tag.php:66
 #, php-format
 msgid "Notices tagged with %s"
 msgstr ""
 
-#: actions/apitimelinetag.php:107 actions/tagrss.php:64
+#: actions/apitimelinetag.php:108 actions/tagrss.php:64
 #, fuzzy, php-format
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr "%s adli kullanicinin durum mesajlari"
@@ -543,46 +543,46 @@ msgstr "Avatar"
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr ""
 
-#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:185
 #: actions/grouplogo.php:178 actions/remotesubscribe.php:191
 #: actions/userauthorization.php:72 actions/userrss.php:103
 msgid "User without matching profile"
 msgstr ""
 
-#: actions/avatarsettings.php:119 actions/avatarsettings.php:194
+#: actions/avatarsettings.php:119 actions/avatarsettings.php:197
 #: actions/grouplogo.php:251
 #, fuzzy
 msgid "Avatar settings"
 msgstr "Ayarlar"
 
-#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/avatarsettings.php:127 actions/avatarsettings.php:205
 #: actions/grouplogo.php:199 actions/grouplogo.php:259
 msgid "Original"
 msgstr ""
 
-#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/avatarsettings.php:142 actions/avatarsettings.php:217
 #: actions/grouplogo.php:210 actions/grouplogo.php:271
 msgid "Preview"
 msgstr ""
 
-#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
+#: actions/avatarsettings.php:149 lib/deleteuserform.php:66
 #: lib/noticelist.php:550
 msgid "Delete"
 msgstr ""
 
-#: actions/avatarsettings.php:165 actions/grouplogo.php:233
+#: actions/avatarsettings.php:166 actions/grouplogo.php:233
 msgid "Upload"
 msgstr "Yükle"
 
-#: actions/avatarsettings.php:228 actions/grouplogo.php:286
+#: actions/avatarsettings.php:231 actions/grouplogo.php:286
 msgid "Crop"
 msgstr ""
 
-#: actions/avatarsettings.php:265 actions/disfavor.php:74
+#: actions/avatarsettings.php:268 actions/disfavor.php:74
 #: actions/emailsettings.php:238 actions/favor.php:75
 #: actions/groupblock.php:66 actions/grouplogo.php:309
 #: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -593,34 +593,75 @@ msgstr ""
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
-#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
+#: actions/avatarsettings.php:281 actions/designadminpanel.php:103
 #: actions/emailsettings.php:256 actions/grouplogo.php:319
 #: actions/imsettings.php:220 actions/recoverpassword.php:44
 #: actions/smssettings.php:248 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "Beklenmeğen form girdisi."
 
-#: actions/avatarsettings.php:322
+#: actions/avatarsettings.php:328
 msgid "Pick a square area of the image to be your avatar"
 msgstr ""
 
-#: actions/avatarsettings.php:337 actions/grouplogo.php:377
+#: actions/avatarsettings.php:343 actions/grouplogo.php:377
 msgid "Lost our file data."
 msgstr ""
 
-#: actions/avatarsettings.php:360
+#: actions/avatarsettings.php:366
 msgid "Avatar updated."
 msgstr "Avatar güncellendi."
 
-#: actions/avatarsettings.php:363
+#: actions/avatarsettings.php:369
 msgid "Failed updating avatar."
 msgstr "Avatar güncellemede hata."
 
-#: actions/avatarsettings.php:387
+#: actions/avatarsettings.php:393
 #, fuzzy
 msgid "Avatar deleted."
 msgstr "Avatar güncellendi."
 
+#: actions/block.php:69
+#, fuzzy
+msgid "You already blocked that user."
+msgstr "Zaten giriş yapmış durumdasıznız!"
+
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
+#, fuzzy
+msgid "Block user"
+msgstr "Böyle bir kullanıcı yok."
+
+#: actions/block.php:130
+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/block.php:143 actions/deletenotice.php:145
+#: actions/deleteuser.php:147 actions/groupblock.php:178
+msgid "No"
+msgstr ""
+
+#: actions/block.php:143 actions/deleteuser.php:147
+#, fuzzy
+msgid "Do not block this user"
+msgstr "Böyle bir kullanıcı yok."
+
+#: actions/block.php:144 actions/deletenotice.php:146
+#: actions/deleteuser.php:148 actions/groupblock.php:179
+msgid "Yes"
+msgstr ""
+
+#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
+#, fuzzy
+msgid "Block this user"
+msgstr "Böyle bir kullanıcı yok."
+
+#: actions/block.php:162
+msgid "Failed to save block information."
+msgstr ""
+
 #: actions/blockedfromgroup.php:73 actions/editgroup.php:84
 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
 #: actions/groupmembers.php:76 actions/grouprss.php:91
@@ -665,47 +706,6 @@ msgstr ""
 msgid "Unblock this user"
 msgstr "Böyle bir kullanıcı yok."
 
-#: actions/block.php:69
-#, fuzzy
-msgid "You already blocked that user."
-msgstr "Zaten giriş yapmış durumdasıznız!"
-
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
-#, fuzzy
-msgid "Block user"
-msgstr "Böyle bir kullanıcı yok."
-
-#: actions/block.php:130
-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/block.php:143 actions/deletenotice.php:145
-#: actions/deleteuser.php:147 actions/groupblock.php:178
-msgid "No"
-msgstr ""
-
-#: actions/block.php:143 actions/deleteuser.php:147
-#, fuzzy
-msgid "Do not block this user"
-msgstr "Böyle bir kullanıcı yok."
-
-#: actions/block.php:144 actions/deletenotice.php:146
-#: actions/deleteuser.php:148 actions/groupblock.php:179
-msgid "Yes"
-msgstr ""
-
-#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
-#, fuzzy
-msgid "Block this user"
-msgstr "Böyle bir kullanıcı yok."
-
-#: actions/block.php:162
-msgid "Failed to save block information."
-msgstr ""
-
 #: actions/bookmarklet.php:50
 msgid "Post to "
 msgstr ""
@@ -1181,6 +1181,14 @@ msgstr ""
 msgid "New incoming email address added."
 msgstr ""
 
+#: actions/favor.php:79
+msgid "This notice is already a favorite!"
+msgstr ""
+
+#: actions/favor.php:92 lib/disfavorform.php:140
+msgid "Disfavor favorite"
+msgstr ""
+
 #: actions/favorited.php:65 lib/popularnoticesection.php:88
 #: lib/publicgroupnav.php:93
 #, fuzzy
@@ -1224,14 +1232,6 @@ msgstr ""
 msgid "Updates favored by %1$s on %2$s!"
 msgstr "%s adli kullanicinin durum mesajlari"
 
-#: actions/favor.php:79
-msgid "This notice is already a favorite!"
-msgstr ""
-
-#: actions/favor.php:92 lib/disfavorform.php:140
-msgid "Disfavor favorite"
-msgstr ""
-
 #: actions/featured.php:69 lib/featureduserssection.php:87
 #: lib/publicgroupnav.php:89
 msgid "Featured users"
@@ -1472,6 +1472,31 @@ msgstr ""
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "%s adli kullanicinin durum mesajlari"
 
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 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 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/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
+#, fuzzy
+msgid "Create a new group"
+msgstr "Yeni hesap oluştur"
+
 #: actions/groupsearch.php:52
 #, fuzzy, php-format
 msgid ""
@@ -1507,31 +1532,6 @@ msgid ""
 "action.newgroup%%) yourself!"
 msgstr ""
 
-#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 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 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/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
-#, fuzzy
-msgid "Create a new group"
-msgstr "Yeni hesap oluştur"
-
 #: actions/groupunblock.php:91
 msgid "Only an admin can unblock group members."
 msgstr ""
@@ -1721,7 +1721,7 @@ msgstr ""
 msgid "Optionally add a personal message to the invitation."
 msgstr ""
 
-#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:222
 msgid "Send"
 msgstr "Gönder"
 
@@ -1803,58 +1803,58 @@ msgstr "OpenID formu yaratılamadı: %s"
 msgid "%s left group %s"
 msgstr ""
 
-#: actions/login.php:82 actions/register.php:137
+#: actions/login.php:83 actions/register.php:137
 msgid "Already logged in."
 msgstr "Zaten giriş yapılmış."
 
-#: actions/login.php:113 actions/login.php:123
+#: actions/login.php:114 actions/login.php:124
 #, fuzzy
 msgid "Invalid or expired token."
 msgstr "Geçersiz durum mesajı"
 
-#: actions/login.php:146
+#: actions/login.php:147
 msgid "Incorrect username or password."
 msgstr "Yanlış kullanıcı adı veya parola."
 
-#: actions/login.php:152
+#: actions/login.php:153
 #, fuzzy
 msgid "Error setting user. You are probably not authorized."
 msgstr "Yetkilendirilmemiş."
 
-#: actions/login.php:207 actions/login.php:260 lib/action.php:458
+#: actions/login.php:208 actions/login.php:261 lib/action.php:458
 #: lib/logingroupnav.php:79
 msgid "Login"
 msgstr "Giriş"
 
-#: actions/login.php:246
+#: actions/login.php:247
 msgid "Login to site"
 msgstr ""
 
-#: actions/login.php:249 actions/profilesettings.php:106
+#: actions/login.php:250 actions/profilesettings.php:106
 #: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
 #: lib/groupeditform.php:152 lib/userprofile.php:131
 msgid "Nickname"
 msgstr "Takma ad"
 
-#: actions/login.php:252 actions/register.php:428
+#: actions/login.php:253 actions/register.php:428
 #: lib/accountsettingsaction.php:116
 msgid "Password"
 msgstr "Parola"
 
-#: actions/login.php:255 actions/register.php:477
+#: actions/login.php:256 actions/register.php:477
 msgid "Remember me"
 msgstr "Beni hatırla"
 
-#: actions/login.php:256 actions/register.php:479
+#: actions/login.php:257 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!"
 
-#: actions/login.php:266
+#: actions/login.php:267
 msgid "Lost or forgotten password?"
 msgstr "Parolamı unuttum veya kaybettim"
 
-#: actions/login.php:285
+#: actions/login.php:286
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -1862,7 +1862,7 @@ msgstr ""
 "Güvenliğiniz için, ayarlarınızı değiştirmeden önce lütfen kullanıcı adınızı "
 "ve parolanızı tekrar giriniz."
 
-#: actions/login.php:289
+#: actions/login.php:290
 #, fuzzy, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -1934,7 +1934,7 @@ msgstr ""
 msgid "Direct message to %s sent"
 msgstr ""
 
-#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:242 lib/channel.php:170
 msgid "Ajax Error"
 msgstr ""
 
@@ -1942,7 +1942,7 @@ msgstr ""
 msgid "New notice"
 msgstr "Yeni durum mesajı"
 
-#: actions/newnotice.php:206
+#: actions/newnotice.php:208
 #, fuzzy
 msgid "Notice posted"
 msgstr "Durum mesajları"
@@ -2020,8 +2020,8 @@ msgstr "Bağlan"
 msgid "Only "
 msgstr ""
 
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996
-#: lib/api.php:1024 lib/api.php:1134
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011
+#: lib/api.php:1039 lib/api.php:1149
 msgid "Not a supported data format."
 msgstr ""
 
@@ -3553,6 +3553,26 @@ msgstr "JabberID yok."
 msgid "SMS"
 msgstr ""
 
+#: actions/tag.php:68
+#, fuzzy, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr "%s adli kullanicinin durum mesajlari"
+
+#: actions/tag.php:86
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "%s için durum RSS beslemesi"
+
+#: actions/tag.php:92
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "%s için durum RSS beslemesi"
+
+#: actions/tag.php:98
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "%s için durum RSS beslemesi"
+
 #: actions/tagother.php:33
 #, fuzzy
 msgid "Not logged in"
@@ -3601,26 +3621,6 @@ msgstr "Avatar bilgisi kaydedilemedi"
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 
-#: actions/tag.php:68
-#, fuzzy, php-format
-msgid "Notices tagged with %s, page %d"
-msgstr "%s adli kullanicinin durum mesajlari"
-
-#: actions/tag.php:86
-#, fuzzy, php-format
-msgid "Notice feed for tag %s (RSS 1.0)"
-msgstr "%s için durum RSS beslemesi"
-
-#: actions/tag.php:92
-#, fuzzy, php-format
-msgid "Notice feed for tag %s (RSS 2.0)"
-msgstr "%s için durum RSS beslemesi"
-
-#: actions/tag.php:98
-#, fuzzy, php-format
-msgid "Notice feed for tag %s (Atom)"
-msgstr "%s için durum RSS beslemesi"
-
 #: actions/tagrss.php:35
 #, fuzzy
 msgid "No such tag."
@@ -3925,40 +3925,45 @@ msgstr ""
 msgid "DB error inserting hashtag: %s"
 msgstr ""
 
-#: classes/Notice.php:179
+#: classes/Notice.php:188
 #, fuzzy
 msgid "Problem saving notice. Too long."
 msgstr "Durum mesajını kaydederken hata oluştu."
 
-#: classes/Notice.php:183
+#: classes/Notice.php:192
 #, fuzzy
 msgid "Problem saving notice. Unknown user."
 msgstr "Durum mesajını kaydederken hata oluştu."
 
-#: classes/Notice.php:188
+#: classes/Notice.php:197
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
-#: classes/Notice.php:194
+#: classes/Notice.php:203
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
 msgstr ""
 
-#: classes/Notice.php:200
+#: classes/Notice.php:209
 msgid "You are banned from posting notices on this site."
 msgstr ""
 
-#: classes/Notice.php:265 classes/Notice.php:290
+#: classes/Notice.php:274 classes/Notice.php:299
 msgid "Problem saving notice."
 msgstr "Durum mesajını kaydederken hata oluştu."
 
-#: classes/Notice.php:1124
+#: classes/Notice.php:1115
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Cevap eklenirken veritabanı hatası: %s"
 
+#: classes/User.php:347
+#, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr ""
+
 #: classes/User_group.php:380
 #, fuzzy
 msgid "Could not create group."
@@ -3969,11 +3974,6 @@ msgstr "Avatar bilgisi kaydedilemedi"
 msgid "Could not set group membership."
 msgstr "Abonelik oluşturulamadı."
 
-#: classes/User.php:347
-#, php-format
-msgid "Welcome to %1$s, @%2$s!"
-msgstr ""
-
 #: lib/accountsettingsaction.php:108
 msgid "Change your profile settings"
 msgstr ""
@@ -4292,7 +4292,7 @@ msgstr ""
 msgid "Notice with that id does not exist"
 msgstr ""
 
-#: lib/command.php:168 lib/command.php:416 lib/command.php:471
+#: lib/command.php:168 lib/command.php:416 lib/command.php:472
 msgid "User has no last notice"
 msgstr ""
 
@@ -4339,99 +4339,99 @@ msgstr ""
 msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr ""
 
-#: lib/command.php:439
+#: lib/command.php:440
 #, fuzzy, php-format
 msgid "Reply to %s sent"
 msgstr "%s için cevaplar"
 
-#: lib/command.php:441
+#: lib/command.php:442
 #, fuzzy
 msgid "Error saving notice."
 msgstr "Durum mesajını kaydederken hata oluştu."
 
-#: lib/command.php:495
+#: lib/command.php:496
 msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: lib/command.php:502
+#: lib/command.php:503
 #, php-format
 msgid "Subscribed to %s"
 msgstr ""
 
-#: lib/command.php:523
+#: lib/command.php:524
 msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: lib/command.php:530
+#: lib/command.php:531
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr ""
 
-#: lib/command.php:548 lib/command.php:571
+#: lib/command.php:549 lib/command.php:572
 msgid "Command not yet implemented."
 msgstr ""
 
-#: lib/command.php:551
+#: lib/command.php:552
 msgid "Notification off."
 msgstr ""
 
-#: lib/command.php:553
+#: lib/command.php:554
 msgid "Can't turn off notification."
 msgstr ""
 
-#: lib/command.php:574
+#: lib/command.php:575
 msgid "Notification on."
 msgstr ""
 
-#: lib/command.php:576
+#: lib/command.php:577
 msgid "Can't turn on notification."
 msgstr ""
 
-#: lib/command.php:588
+#: lib/command.php:590
 msgid "Login command is disabled"
 msgstr ""
 
-#: lib/command.php:602
+#: lib/command.php:604
 #, fuzzy, php-format
 msgid "Could not create login token for %s"
 msgstr "Avatar bilgisi kaydedilemedi"
 
-#: lib/command.php:607
+#: lib/command.php:609
 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:623
+#: lib/command.php:625
 #, fuzzy
 msgid "You are not subscribed to anyone."
 msgstr "Bize o profili yollamadınız"
 
-#: lib/command.php:625
+#: lib/command.php:627
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Bize o profili yollamadınız"
 
-#: lib/command.php:645
+#: lib/command.php:647
 #, fuzzy
 msgid "No one is subscribed to you."
 msgstr "Uzaktan abonelik"
 
-#: lib/command.php:647
+#: lib/command.php:649
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Uzaktan abonelik"
 
-#: lib/command.php:667
+#: lib/command.php:669
 #, fuzzy
 msgid "You are not a member of any groups."
 msgstr "Bize o profili yollamadınız"
 
-#: lib/command.php:669
+#: lib/command.php:671
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Bize o profili yollamadınız"
 
-#: lib/command.php:683
+#: lib/command.php:685
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -4532,10 +4532,6 @@ msgstr "Böyle bir durum mesajı yok."
 msgid "Favor"
 msgstr ""
 
-#: lib/feedlist.php:64
-msgid "Export data"
-msgstr ""
-
 #: lib/feed.php:85
 msgid "RSS 1.0"
 msgstr ""
@@ -4552,6 +4548,10 @@ msgstr ""
 msgid "FOAF"
 msgstr ""
 
+#: lib/feedlist.php:64
+msgid "Export data"
+msgstr ""
+
 #: lib/galleryaction.php:121
 msgid "Filter tags"
 msgstr ""
@@ -4723,20 +4723,6 @@ msgstr "Geçersiz kullanıcı adı veya parola."
 msgid "Sign up for a new account"
 msgstr "Yeni hesap oluştur"
 
-#: lib/mailbox.php:89
-msgid "Only the user can read their own mailboxes."
-msgstr ""
-
-#: lib/mailbox.php:139
-msgid ""
-"You have no private messages. You can send private message to engage other "
-"users in conversation. People can send you messages for your eyes only."
-msgstr ""
-
-#: lib/mailbox.php:227 lib/noticelist.php:452
-msgid "from"
-msgstr ""
-
 #: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Eposta adresi onayı"
@@ -4919,6 +4905,20 @@ msgid ""
 "\n"
 msgstr ""
 
+#: lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
+msgstr ""
+
+#: lib/mailbox.php:139
+msgid ""
+"You have no private messages. You can send private message to engage other "
+"users in conversation. People can send you messages for your eyes only."
+msgstr ""
+
+#: lib/mailbox.php:227 lib/noticelist.php:452
+msgid "from"
+msgstr ""
+
 #: lib/mediafile.php:98 lib/mediafile.php:123
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
@@ -4980,7 +4980,7 @@ msgstr ""
 msgid "To"
 msgstr ""
 
-#: lib/messageform.php:161 lib/noticeform.php:185
+#: lib/messageform.php:159 lib/noticeform.php:183
 #, fuzzy
 msgid "Available characters"
 msgstr "6 veya daha fazla karakter"
@@ -4995,11 +4995,11 @@ msgstr "Yeni durum mesajı"
 msgid "What's up, %s?"
 msgstr "N'aber %s?"
 
-#: lib/noticeform.php:192
+#: lib/noticeform.php:190
 msgid "Attach"
 msgstr ""
 
-#: lib/noticeform.php:196
+#: lib/noticeform.php:194
 msgid "Attach a file"
 msgstr ""
 
@@ -5071,11 +5071,11 @@ msgstr "Uzak profil eklemede hata oluştu"
 msgid "Duplicate notice"
 msgstr "Yeni durum mesajı"
 
-#: lib/oauthstore.php:467 lib/subs.php:48
+#: lib/oauthstore.php:466 lib/subs.php:48
 msgid "You have been banned from subscribing."
 msgstr ""
 
-#: lib/oauthstore.php:492
+#: lib/oauthstore.php:491
 msgid "Couldn't insert new subscription."
 msgstr "Yeni abonelik eklenemedi."
 
@@ -5243,20 +5243,6 @@ msgstr "Uzaktan abonelik"
 msgid "Groups %s is a member of"
 msgstr ""
 
-#: lib/subscriberspeopleselftagcloudsection.php:48
-#: lib/subscriptionspeopleselftagcloudsection.php:48
-msgid "People Tagcloud as self-tagged"
-msgstr ""
-
-#: lib/subscriberspeopletagcloudsection.php:48
-#: lib/subscriptionspeopletagcloudsection.php:48
-msgid "People Tagcloud as tagged"
-msgstr ""
-
-#: lib/subscriptionlist.php:126
-msgid "(none)"
-msgstr ""
-
 #: lib/subs.php:52
 msgid "Already subscribed!"
 msgstr ""
@@ -5288,6 +5274,20 @@ msgstr "Abonelik silinemedi."
 msgid "Couldn't delete subscription."
 msgstr "Abonelik silinemedi."
 
+#: 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/subscriptionlist.php:126
+msgid "(none)"
+msgstr ""
+
 #: lib/tagcloudsection.php:56
 msgid "None"
 msgstr ""
diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po
index 0d8674bfd5..767c63ca50 100644
--- a/locale/uk/LC_MESSAGES/statusnet.po
+++ b/locale/uk/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 21:25+0000\n"
-"PO-Revision-Date: 2009-12-07 21:27:33+0000\n"
+"POT-Creation-Date: 2009-12-12 17:09+0000\n"
+"PO-Revision-Date: 2009-12-12 17:10:36+0000\n"
 "Language-Team: Ukrainian\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n"
+"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: out-statusnet\n"
@@ -28,11 +28,11 @@ msgstr "Немає такої сторінки"
 
 #: actions/all.php:74 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofile.php:105
 #: actions/apiaccountupdateprofilebackgroundimage.php:116
-#: actions/apiaccountupdateprofileimage.php:105
-#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
-#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
-#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
+#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90
 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
@@ -45,7 +45,7 @@ msgstr "Немає такої сторінки"
 #: actions/repliesrss.php:38 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38
 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
-#: lib/command.php:364 lib/command.php:411 lib/command.php:466
+#: lib/command.php:364 lib/command.php:411 lib/command.php:467
 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
 #: lib/subs.php:34 lib/subs.php:116
 msgid "No such user."
@@ -57,7 +57,7 @@ msgid "%s and friends, page %d"
 msgstr "%s з друзями, сторінка %d"
 
 #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
-#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100
+#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s з друзями"
@@ -114,24 +114,24 @@ msgstr ""
 msgid "You and friends"
 msgstr "Ви з друзями"
 
-#: actions/allrss.php:119 actions/apitimelinefriends.php:121
+#: actions/allrss.php:119 actions/apitimelinefriends.php:122
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Оновлення від %1$s та друзів на %2$s!"
 
 #: actions/apiaccountratelimitstatus.php:70
 #: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofile.php:97
 #: actions/apiaccountupdateprofilebackgroundimage.php:94
 #: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apiaccountupdateprofile.php:97
 msgid "API method not found."
 msgstr "API метод не знайдено."
 
 #: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofile.php:89
 #: actions/apiaccountupdateprofilebackgroundimage.php:86
 #: actions/apiaccountupdateprofilecolors.php:110
-#: actions/apiaccountupdateprofileimage.php:84
-#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
+#: actions/apiaccountupdateprofileimage.php:84 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
@@ -151,9 +151,22 @@ msgstr ""
 msgid "Could not update user."
 msgstr "Не вдалося оновити користувача."
 
+#: actions/apiaccountupdateprofile.php:112
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+msgid "User has no profile."
+msgstr "Користувач не має профілю."
+
+#: actions/apiaccountupdateprofile.php:147
+msgid "Could not save profile."
+msgstr "Не вдалося зберегти профіль."
+
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257
 #: actions/designadminpanel.php:122 actions/newnotice.php:94
 #: lib/designsettings.php:283
 #, php-format
@@ -176,19 +189,6 @@ msgstr "Не маю можливості зберегти налаштуванн
 msgid "Could not update your design."
 msgstr "Не вдалося оновити Ваш дизайн."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
-#: actions/apiaccountupdateprofileimage.php:130
-#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
-#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
-msgid "User has no profile."
-msgstr "Користувач не має профілю."
-
-#: actions/apiaccountupdateprofile.php:147
-msgid "Could not save profile."
-msgstr "Не вдалося зберегти профіль."
-
 #: actions/apiblockcreate.php:105
 msgid "You cannot block yourself!"
 msgstr "Ви не можете блокувати самого себе!"
@@ -201,24 +201,6 @@ msgstr "Спроба заблокувати користувача невдал
 msgid "Unblock user failed."
 msgstr "Спроба розблокувати користувача невдала."
 
-#: actions/apidirectmessagenew.php:126
-msgid "No message text!"
-msgstr "Повідомлення без тексту!"
-
-#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
-#, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr "Надто довго. Максимальний розмір %d знаків."
-
-#: actions/apidirectmessagenew.php:146
-msgid "Recipient user not found."
-msgstr "Отримувача не знайдено."
-
-#: actions/apidirectmessagenew.php:150
-msgid "Can't send direct messages to users who aren't your friend."
-msgstr ""
-"Не можна надіслати пряме повідомлення користувачеві, який не є Вашим другом."
-
 #: actions/apidirectmessage.php:89
 #, php-format
 msgid "Direct messages from %s"
@@ -244,18 +226,36 @@ msgstr "Всі прямі повідомлення надіслані до %s"
 #: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
-#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
-#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149
-#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
-#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156
+#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151
+#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141
+#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
 msgid "API method not found!"
 msgstr "API метод не знайдено!"
 
+#: actions/apidirectmessagenew.php:126
+msgid "No message text!"
+msgstr "Повідомлення без тексту!"
+
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "Надто довго. Максимальний розмір %d знаків."
+
+#: actions/apidirectmessagenew.php:146
+msgid "Recipient user not found."
+msgstr "Отримувача не знайдено."
+
+#: actions/apidirectmessagenew.php:150
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr ""
+"Не можна надіслати пряме повідомлення користувачеві, який не є Вашим другом."
+
 #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
 #: actions/apistatusesdestroy.php:113
 msgid "No status found with that ID."
@@ -400,16 +400,6 @@ msgstr "Ви не є учасником цієї групи."
 msgid "Could not remove user %s to group %s."
 msgstr "Не вдалося видалити користувача %s з групи %s."
 
-#: actions/apigrouplistall.php:90 actions/usergroups.php:62
-#, php-format
-msgid "%s groups"
-msgstr "%s групи"
-
-#: actions/apigrouplistall.php:94
-#, php-format
-msgid "groups on %s"
-msgstr "групи на %s"
-
 #: actions/apigrouplist.php:95
 #, php-format
 msgid "%s's groups"
@@ -420,6 +410,16 @@ msgstr "%s групи"
 msgid "Groups %s is a member of on %s."
 msgstr "Групи, в яких %s бере участь на %s."
 
+#: actions/apigrouplistall.php:90 actions/usergroups.php:62
+#, php-format
+msgid "%s groups"
+msgstr "%s групи"
+
+#: actions/apigrouplistall.php:94
+#, php-format
+msgid "groups on %s"
+msgstr "групи на %s"
+
 #: actions/apistatusesdestroy.php:107
 msgid "This method requires a POST or DELETE."
 msgstr "Цей метод потребує або НАПИСАТИ, або ВИДАЛИТИ."
@@ -457,54 +457,54 @@ msgstr ""
 msgid "Unsupported format."
 msgstr "Формат не підтримується."
 
-#: actions/apitimelinefavorites.php:107
+#: actions/apitimelinefavorites.php:108
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr "%s / Обрані від %s"
 
-#: actions/apitimelinefavorites.php:119
+#: actions/apitimelinefavorites.php:120
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr "%s оновлення обраних від %s / %s."
 
-#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117
+#: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118
 #: actions/grouprss.php:131 actions/userrss.php:90
 #, php-format
 msgid "%s timeline"
 msgstr "%s стрічка"
 
-#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125
+#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
 #: actions/userrss.php:92
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Оновлення від %1$s на %2$s!"
 
-#: actions/apitimelinementions.php:116
+#: actions/apitimelinementions.php:117
 #, php-format
 msgid "%1$s / Updates mentioning %2$s"
 msgstr "%1$s / Оновленні відповіді %2$s"
 
-#: actions/apitimelinementions.php:126
+#: actions/apitimelinementions.php:127
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "%1$s оновив цю відповідь на допис від %2$s / %3$s."
 
-#: actions/apitimelinepublic.php:106 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s загальна стрічка"
 
-#: actions/apitimelinepublic.php:110 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s оновлення від усіх!"
 
-#: actions/apitimelinetag.php:101 actions/tag.php:66
+#: actions/apitimelinetag.php:102 actions/tag.php:66
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Дописи позначені з %s"
 
-#: actions/apitimelinetag.php:107 actions/tagrss.php:64
+#: actions/apitimelinetag.php:108 actions/tagrss.php:64
 #, php-format
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Оновлення позначені з %1$s на %2$s!"
@@ -539,45 +539,45 @@ msgstr "Аватара"
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr "Ви можете завантажити аватару. Максимальний розмір %s."
 
-#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:185
 #: actions/grouplogo.php:178 actions/remotesubscribe.php:191
 #: actions/userauthorization.php:72 actions/userrss.php:103
 msgid "User without matching profile"
 msgstr "Користувач з невідповідним профілем"
 
-#: actions/avatarsettings.php:119 actions/avatarsettings.php:194
+#: actions/avatarsettings.php:119 actions/avatarsettings.php:197
 #: actions/grouplogo.php:251
 msgid "Avatar settings"
 msgstr "Налаштування аватари"
 
-#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/avatarsettings.php:127 actions/avatarsettings.php:205
 #: actions/grouplogo.php:199 actions/grouplogo.php:259
 msgid "Original"
 msgstr "Оригінал"
 
-#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/avatarsettings.php:142 actions/avatarsettings.php:217
 #: actions/grouplogo.php:210 actions/grouplogo.php:271
 msgid "Preview"
 msgstr "Перегляд"
 
-#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
+#: actions/avatarsettings.php:149 lib/deleteuserform.php:66
 #: lib/noticelist.php:550
 msgid "Delete"
 msgstr "Видалити"
 
-#: actions/avatarsettings.php:165 actions/grouplogo.php:233
+#: actions/avatarsettings.php:166 actions/grouplogo.php:233
 msgid "Upload"
 msgstr "Завантажити"
 
-#: actions/avatarsettings.php:228 actions/grouplogo.php:286
+#: actions/avatarsettings.php:231 actions/grouplogo.php:286
 msgid "Crop"
 msgstr "Втяти"
 
-#: actions/avatarsettings.php:265 actions/disfavor.php:74
+#: actions/avatarsettings.php:268 actions/disfavor.php:74
 #: actions/emailsettings.php:238 actions/favor.php:75
 #: actions/groupblock.php:66 actions/grouplogo.php:309
 #: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -589,73 +589,33 @@ msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 "Виникли певні проблеми з токеном поточної сесії. Спробуйте знов, будь ласка."
 
-#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
+#: actions/avatarsettings.php:281 actions/designadminpanel.php:103
 #: actions/emailsettings.php:256 actions/grouplogo.php:319
 #: actions/imsettings.php:220 actions/recoverpassword.php:44
 #: actions/smssettings.php:248 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "Несподіване представлення форми."
 
-#: actions/avatarsettings.php:322
+#: actions/avatarsettings.php:328
 msgid "Pick a square area of the image to be your avatar"
 msgstr "Оберіть квадратну ділянку зображення, яка й буде Вашою автарою."
 
-#: actions/avatarsettings.php:337 actions/grouplogo.php:377
+#: actions/avatarsettings.php:343 actions/grouplogo.php:377
 msgid "Lost our file data."
 msgstr "Дані Вашого файлу десь загубились."
 
-#: actions/avatarsettings.php:360
+#: actions/avatarsettings.php:366
 msgid "Avatar updated."
 msgstr "Аватару оновлено."
 
-#: actions/avatarsettings.php:363
+#: actions/avatarsettings.php:369
 msgid "Failed updating avatar."
 msgstr "Оновлення аватари невдале."
 
-#: actions/avatarsettings.php:387
+#: actions/avatarsettings.php:393
 msgid "Avatar deleted."
 msgstr "Аватару видалено."
 
-#: actions/blockedfromgroup.php:73 actions/editgroup.php:84
-#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
-#: actions/groupmembers.php:76 actions/grouprss.php:91
-#: actions/joingroup.php:76 actions/showgroup.php:121
-msgid "No nickname"
-msgstr "Немає імені"
-
-#: actions/blockedfromgroup.php:80 actions/editgroup.php:96
-#: actions/groupbyid.php:83 actions/groupdesignsettings.php:97
-#: actions/grouplogo.php:99 actions/groupmembers.php:83
-#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
-msgid "No such group"
-msgstr "Такої групи немає"
-
-#: actions/blockedfromgroup.php:90
-#, php-format
-msgid "%s blocked profiles"
-msgstr "Заблоковані профілі %s"
-
-#: actions/blockedfromgroup.php:93
-#, php-format
-msgid "%s blocked profiles, page %d"
-msgstr "Заблоковані профілі %s, сторінка %d"
-
-#: 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/blockedfromgroup.php:313 lib/unblockform.php:69
-msgid "Unblock"
-msgstr "Розблокувати"
-
-#: actions/blockedfromgroup.php:313 lib/unblockform.php:80
-msgid "Unblock this user"
-msgstr "Розблокувати цього користувача"
-
 #: actions/block.php:69
 msgid "You already blocked that user."
 msgstr "Цього користувача вже заблоковано."
@@ -696,6 +656,46 @@ msgstr "Блокувати користувача"
 msgid "Failed to save block information."
 msgstr "Збереження інформації про блокування завершилось невдачею."
 
+#: actions/blockedfromgroup.php:73 actions/editgroup.php:84
+#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
+#: actions/groupmembers.php:76 actions/grouprss.php:91
+#: actions/joingroup.php:76 actions/showgroup.php:121
+msgid "No nickname"
+msgstr "Немає імені"
+
+#: actions/blockedfromgroup.php:80 actions/editgroup.php:96
+#: actions/groupbyid.php:83 actions/groupdesignsettings.php:97
+#: actions/grouplogo.php:99 actions/groupmembers.php:83
+#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
+msgid "No such group"
+msgstr "Такої групи немає"
+
+#: actions/blockedfromgroup.php:90
+#, php-format
+msgid "%s blocked profiles"
+msgstr "Заблоковані профілі %s"
+
+#: actions/blockedfromgroup.php:93
+#, php-format
+msgid "%s blocked profiles, page %d"
+msgstr "Заблоковані профілі %s, сторінка %d"
+
+#: 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/blockedfromgroup.php:313 lib/unblockform.php:69
+msgid "Unblock"
+msgstr "Розблокувати"
+
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:80
+msgid "Unblock this user"
+msgstr "Розблокувати цього користувача"
+
 #: actions/bookmarklet.php:50
 msgid "Post to "
 msgstr "Написати "
@@ -1163,6 +1163,14 @@ msgstr "Адресу вхідної пошти видалено."
 msgid "New incoming email address added."
 msgstr "Нову адресу для вхідних повідомлень додано."
 
+#: actions/favor.php:79
+msgid "This notice is already a favorite!"
+msgstr "Цей допис вже є обраним!"
+
+#: actions/favor.php:92 lib/disfavorform.php:140
+msgid "Disfavor favorite"
+msgstr "Видалити з обраних"
+
 #: actions/favorited.php:65 lib/popularnoticesection.php:88
 #: lib/publicgroupnav.php:93
 msgid "Popular notices"
@@ -1209,14 +1217,6 @@ msgstr "Обрані дописи %s"
 msgid "Updates favored by %1$s on %2$s!"
 msgstr "Оновлення обраних дописів %1$s на %2$s!"
 
-#: actions/favor.php:79
-msgid "This notice is already a favorite!"
-msgstr "Цей допис вже є обраним!"
-
-#: actions/favor.php:92 lib/disfavorform.php:140
-msgid "Disfavor favorite"
-msgstr "Видалити з обраних"
-
 #: actions/featured.php:69 lib/featureduserssection.php:87
 #: lib/publicgroupnav.php:89
 msgid "Featured users"
@@ -1448,6 +1448,35 @@ msgstr "Надати цьому користувачеві права адмін
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "Оновлення членів %1$s на %2$s!"
 
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+msgid "Groups"
+msgstr "Групи"
+
+#: actions/groups.php:64
+#, php-format
+msgid "Groups, page %d"
+msgstr "Групи, сторінка %d"
+
+#: actions/groups.php:90
+#, php-format
+msgid ""
+"%%%%site.name%%%% groups let you find and talk with people of similar "
+"interests. After you join a group you can send messages to all other members "
+"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
+"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
+"%%%%)"
+msgstr ""
+"Групи на сайті %%%%site.name%%%% дозволять Вам відшукати людей зі спільними "
+"інтересами. Лише приєднайтеся до групи і надсилайте повідомлення до усіх її "
+"учасників використовуючи просту команду \"!groupname\" у тексті "
+"повідомлення. Не бачите групу, яка Вас цікавить? Спробуйте її [знайти](%%%%"
+"action.groupsearch%%%%) або [створіть власну!](%%%%action.newgroup%%%%)"
+
+#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
+msgid "Create a new group"
+msgstr "Створити нову групу"
+
 #: actions/groupsearch.php:52
 #, php-format
 msgid ""
@@ -1485,35 +1514,6 @@ msgstr ""
 "Чому б не [зареєструватись](%%action.register%%) і не [створити](%%action."
 "newgroup%%) свою власну групу!"
 
-#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
-msgid "Groups"
-msgstr "Групи"
-
-#: actions/groups.php:64
-#, php-format
-msgid "Groups, page %d"
-msgstr "Групи, сторінка %d"
-
-#: actions/groups.php:90
-#, php-format
-msgid ""
-"%%%%site.name%%%% groups let you find and talk with people of similar "
-"interests. After you join a group you can send messages to all other members "
-"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
-"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
-"%%%%)"
-msgstr ""
-"Групи на сайті %%%%site.name%%%% дозволять Вам відшукати людей зі спільними "
-"інтересами. Лише приєднайтеся до групи і надсилайте повідомлення до усіх її "
-"учасників використовуючи просту команду \"!groupname\" у тексті "
-"повідомлення. Не бачите групу, яка Вас цікавить? Спробуйте її [знайти](%%%%"
-"action.groupsearch%%%%) або [створіть власну!](%%%%action.newgroup%%%%)"
-
-#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
-msgid "Create a new group"
-msgstr "Створити нову групу"
-
 #: actions/groupunblock.php:91
 msgid "Only an admin can unblock group members."
 msgstr "Лише адміни можуть розблокувати членів групи."
@@ -1709,7 +1709,7 @@ msgstr "Особисті повідомлення"
 msgid "Optionally add a personal message to the invitation."
 msgstr "Можна додати персональне повідомлення до запрошення (опціонально)."
 
-#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:222
 msgid "Send"
 msgstr "Так!"
 
@@ -1816,57 +1816,57 @@ msgstr "Не вдалося видалити користувача %s з гру
 msgid "%s left group %s"
 msgstr "%s залишив групу %s"
 
-#: actions/login.php:82 actions/register.php:137
+#: actions/login.php:83 actions/register.php:137
 msgid "Already logged in."
 msgstr "Тепер Ви увійшли."
 
-#: actions/login.php:113 actions/login.php:123
+#: actions/login.php:114 actions/login.php:124
 msgid "Invalid or expired token."
 msgstr "Недійсний або неправильний токен."
 
-#: actions/login.php:146
+#: actions/login.php:147
 msgid "Incorrect username or password."
 msgstr "Неточне ім’я або пароль."
 
-#: actions/login.php:152
+#: actions/login.php:153
 msgid "Error setting user. You are probably not authorized."
 msgstr "Помилка. Можливо, Ви не авторизовані."
 
-#: actions/login.php:207 actions/login.php:260 lib/action.php:458
+#: actions/login.php:208 actions/login.php:261 lib/action.php:458
 #: lib/logingroupnav.php:79
 msgid "Login"
 msgstr "Увійти"
 
-#: actions/login.php:246
+#: actions/login.php:247
 msgid "Login to site"
 msgstr "Вхід на сайт"
 
-#: actions/login.php:249 actions/profilesettings.php:106
+#: actions/login.php:250 actions/profilesettings.php:106
 #: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
 #: lib/groupeditform.php:152 lib/userprofile.php:131
 msgid "Nickname"
 msgstr "Ім’я користувача"
 
-#: actions/login.php:252 actions/register.php:428
+#: actions/login.php:253 actions/register.php:428
 #: lib/accountsettingsaction.php:116
 msgid "Password"
 msgstr "Пароль"
 
-#: actions/login.php:255 actions/register.php:477
+#: actions/login.php:256 actions/register.php:477
 msgid "Remember me"
 msgstr "Пам’ятати мене"
 
-#: actions/login.php:256 actions/register.php:479
+#: actions/login.php:257 actions/register.php:479
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Автоматично входити у майбутньому; не для комп’ютерів загального "
 "користування!"
 
-#: actions/login.php:266
+#: actions/login.php:267
 msgid "Lost or forgotten password?"
 msgstr "Загубили або забули пароль?"
 
-#: actions/login.php:285
+#: actions/login.php:286
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -1874,7 +1874,7 @@ msgstr ""
 "З міркувань безпеки, будь ласка, введіть ще раз ім’я та пароль, перед тим як "
 "змінювати налаштування."
 
-#: actions/login.php:289
+#: actions/login.php:290
 #, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -1947,7 +1947,7 @@ msgstr "Повідомлення надіслано"
 msgid "Direct message to %s sent"
 msgstr "Пряме повідомлення до %s надіслано"
 
-#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:242 lib/channel.php:170
 msgid "Ajax Error"
 msgstr "Помилка в Ajax"
 
@@ -1955,7 +1955,7 @@ msgstr "Помилка в Ajax"
 msgid "New notice"
 msgstr "Новий допис"
 
-#: actions/newnotice.php:206
+#: actions/newnotice.php:208
 msgid "Notice posted"
 msgstr "Допис надіслано"
 
@@ -2037,8 +2037,8 @@ msgstr "тип змісту "
 msgid "Only "
 msgstr "Лише "
 
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996
-#: lib/api.php:1024 lib/api.php:1134
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011
+#: lib/api.php:1039 lib/api.php:1149
 msgid "Not a supported data format."
 msgstr "Такий формат даних не підтримується."
 
@@ -3623,6 +3623,26 @@ msgstr "Jabber"
 msgid "SMS"
 msgstr "СМС"
 
+#: actions/tag.php:68
+#, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr "Дописи позначені %s, сторінка %d"
+
+#: actions/tag.php:86
+#, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "Стрічка дописів для теґу %s (RSS 1.0)"
+
+#: actions/tag.php:92
+#, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "Стрічка дописів для теґу %s (RSS 2.0)"
+
+#: actions/tag.php:98
+#, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "Стрічка дописів для теґу %s (Atom)"
+
 #: actions/tagother.php:33
 msgid "Not logged in"
 msgstr "Не увійшли"
@@ -3671,26 +3691,6 @@ msgstr "Не вдалося зберегти теґи."
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr "Скористайтесь цією формою, щоб додати теґи підпискам та підписчикам."
 
-#: actions/tag.php:68
-#, php-format
-msgid "Notices tagged with %s, page %d"
-msgstr "Дописи позначені %s, сторінка %d"
-
-#: actions/tag.php:86
-#, php-format
-msgid "Notice feed for tag %s (RSS 1.0)"
-msgstr "Стрічка дописів для теґу %s (RSS 1.0)"
-
-#: actions/tag.php:92
-#, php-format
-msgid "Notice feed for tag %s (RSS 2.0)"
-msgstr "Стрічка дописів для теґу %s (RSS 2.0)"
-
-#: actions/tag.php:98
-#, php-format
-msgid "Notice feed for tag %s (Atom)"
-msgstr "Стрічка дописів для теґу %s (Atom)"
-
 #: actions/tagrss.php:35
 msgid "No such tag."
 msgstr "Такого теґу немає."
@@ -3994,22 +3994,22 @@ msgstr "Не можна оновити повідомлення з новим UR
 msgid "DB error inserting hashtag: %s"
 msgstr "Помилка бази даних при додаванні теґу: %s"
 
-#: classes/Notice.php:179
+#: classes/Notice.php:188
 msgid "Problem saving notice. Too long."
 msgstr "Проблема при збереженні допису. Надто довге."
 
-#: classes/Notice.php:183
+#: classes/Notice.php:192
 msgid "Problem saving notice. Unknown user."
 msgstr "Проблема при збереженні допису. Невідомий користувач."
 
-#: classes/Notice.php:188
+#: classes/Notice.php:197
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 "Дуже багато дописів за короткий термін; ходіть подихайте повітрям і "
 "повертайтесь за кілька хвилин."
 
-#: classes/Notice.php:194
+#: classes/Notice.php:203
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
@@ -4017,19 +4017,24 @@ msgstr ""
 "Дуже багато повідомлень за короткий термін; ходіть подихайте повітрям і "
 "повертайтесь за кілька хвилин."
 
-#: classes/Notice.php:200
+#: classes/Notice.php:209
 msgid "You are banned from posting notices on this site."
 msgstr "Вам заборонено надсилати дописи до цього сайту."
 
-#: classes/Notice.php:265 classes/Notice.php:290
+#: classes/Notice.php:274 classes/Notice.php:299
 msgid "Problem saving notice."
 msgstr "Проблема при збереженні допису."
 
-#: classes/Notice.php:1124
+#: classes/Notice.php:1115
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Помилка бази даних при додаванні відповіді: %s"
 
+#: classes/User.php:347
+#, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr "Вітаємо на %1$s, @%2$s!"
+
 #: classes/User_group.php:380
 msgid "Could not create group."
 msgstr "Не вдалося створити нову групу."
@@ -4038,11 +4043,6 @@ msgstr "Не вдалося створити нову групу."
 msgid "Could not set group membership."
 msgstr "Не вдалося встановити членство."
 
-#: classes/User.php:347
-#, php-format
-msgid "Welcome to %1$s, @%2$s!"
-msgstr "Вітаємо на %1$s, @%2$s!"
-
 #: lib/accountsettingsaction.php:108
 msgid "Change your profile settings"
 msgstr "Змінити налаштування профілю"
@@ -4347,7 +4347,7 @@ msgstr ""
 msgid "Notice with that id does not exist"
 msgstr "Такого допису не існує"
 
-#: lib/command.php:168 lib/command.php:416 lib/command.php:471
+#: lib/command.php:168 lib/command.php:416 lib/command.php:472
 msgid "User has no last notice"
 msgstr "Користувач не має останнього допису"
 
@@ -4394,102 +4394,102 @@ msgstr "Помилка при відправці прямого повідомл
 msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr "Допис надто довгий — максимум %d знаків, а ви надсилаєте %d"
 
-#: lib/command.php:439
+#: lib/command.php:440
 #, php-format
 msgid "Reply to %s sent"
 msgstr "Відповідь до %s надіслано"
 
-#: lib/command.php:441
+#: lib/command.php:442
 msgid "Error saving notice."
 msgstr "Проблема при збереженні допису."
 
-#: lib/command.php:495
+#: lib/command.php:496
 msgid "Specify the name of the user to subscribe to"
 msgstr "Зазначте ім’я користувача, до якого бажаєте підписатись"
 
-#: lib/command.php:502
+#: lib/command.php:503
 #, php-format
 msgid "Subscribed to %s"
 msgstr "Підписано до %s"
 
-#: lib/command.php:523
+#: lib/command.php:524
 msgid "Specify the name of the user to unsubscribe from"
 msgstr "Зазначте ім’я користувача, від якого бажаєте відписатись"
 
-#: lib/command.php:530
+#: lib/command.php:531
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr "Відписано від %s"
 
-#: lib/command.php:548 lib/command.php:571
+#: lib/command.php:549 lib/command.php:572
 msgid "Command not yet implemented."
 msgstr "Виконання команди ще не завершено."
 
-#: lib/command.php:551
+#: lib/command.php:552
 msgid "Notification off."
 msgstr "Сповіщення вимкнуто."
 
-#: lib/command.php:553
+#: lib/command.php:554
 msgid "Can't turn off notification."
 msgstr "Не можна вимкнути сповіщення."
 
-#: lib/command.php:574
+#: lib/command.php:575
 msgid "Notification on."
 msgstr "Сповіщення увімкнуто."
 
-#: lib/command.php:576
+#: lib/command.php:577
 msgid "Can't turn on notification."
 msgstr "Не можна увімкнути сповіщення."
 
-#: lib/command.php:588
+#: lib/command.php:590
 msgid "Login command is disabled"
-msgstr ""
+msgstr "Команду входу відключено"
 
-#: lib/command.php:602
-#, fuzzy, php-format
+#: lib/command.php:604
+#, php-format
 msgid "Could not create login token for %s"
-msgstr "Неможна призначити додаткові імена."
+msgstr "Не вдалося створити токен входу для %s"
 
-#: lib/command.php:607
+#: lib/command.php:609
 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
+"Це посилання можна використати лише раз, воно дійсне протягом 2 хвилин: %s"
 
-#: lib/command.php:623
+#: lib/command.php:625
 msgid "You are not subscribed to anyone."
 msgstr "Ви не маєте жодних підписок."
 
-#: lib/command.php:625
+#: lib/command.php:627
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Ви підписані до цієї особи:"
 msgstr[1] "Ви підписані до цих людей:"
 msgstr[2] "Ви підписані до цих людей:"
 
-#: lib/command.php:645
+#: lib/command.php:647
 msgid "No one is subscribed to you."
 msgstr "До Вас ніхто не підписаний."
 
-#: lib/command.php:647
+#: lib/command.php:649
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Ця особа є підписаною до Вас:"
 msgstr[1] "Ці люди підписані до Вас:"
 msgstr[2] "Ці люди підписані до Вас:"
 
-#: lib/command.php:667
+#: lib/command.php:669
 msgid "You are not a member of any groups."
 msgstr "Ви не є учасником жодної групи."
 
-#: lib/command.php:669
+#: lib/command.php:671
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Ви є учасником групи:"
 msgstr[1] "Ви є учасником таких груп:"
 msgstr[2] "Ви є учасником таких груп:"
 
-#: lib/command.php:683
-#, fuzzy
+#: lib/command.php:685
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -4622,10 +4622,6 @@ msgstr "Позначити як обране"
 msgid "Favor"
 msgstr "Обрати"
 
-#: lib/feedlist.php:64
-msgid "Export data"
-msgstr "Експорт даних"
-
 #: lib/feed.php:85
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
@@ -4642,6 +4638,10 @@ msgstr "Atom"
 msgid "FOAF"
 msgstr "FOAF"
 
+#: lib/feedlist.php:64
+msgid "Export data"
+msgstr "Експорт даних"
+
 #: lib/galleryaction.php:121
 msgid "Filter tags"
 msgstr "Фільтр для теґів"
@@ -4801,24 +4801,6 @@ msgstr "Увійти використовуючи ім’я та пароль"
 msgid "Sign up for a new account"
 msgstr "Зареєструвати новий акаунт"
 
-#: lib/mailbox.php:89
-msgid "Only the user can read their own mailboxes."
-msgstr ""
-"Лише користувач має можливість переглядати свою власну поштову скриньку."
-
-#: lib/mailbox.php:139
-msgid ""
-"You have no private messages. You can send private message to engage other "
-"users in conversation. People can send you messages for your eyes only."
-msgstr ""
-"У Вас немає приватних повідомлень. Зокрема, Ви можете надсилати приватні "
-"повідомлення аби долучити користувачів до розмови. Такі повідомлення бачите "
-"лише Ви."
-
-#: lib/mailbox.php:227 lib/noticelist.php:452
-msgid "from"
-msgstr "від"
-
 #: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Підтвердження електронної адреси"
@@ -5079,6 +5061,24 @@ msgstr ""
 "\t%4$s\n"
 "\n"
 
+#: lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
+msgstr ""
+"Лише користувач має можливість переглядати свою власну поштову скриньку."
+
+#: lib/mailbox.php:139
+msgid ""
+"You have no private messages. You can send private message to engage other "
+"users in conversation. People can send you messages for your eyes only."
+msgstr ""
+"У Вас немає приватних повідомлень. Зокрема, Ви можете надсилати приватні "
+"повідомлення аби долучити користувачів до розмови. Такі повідомлення бачите "
+"лише Ви."
+
+#: lib/mailbox.php:227 lib/noticelist.php:452
+msgid "from"
+msgstr "від"
+
 #: lib/mediafile.php:98 lib/mediafile.php:123
 msgid "There was a database error while saving your file. Please try again."
 msgstr "Виникла помилка під час завантаження Вашого файлу. Спробуйте ще."
@@ -5141,7 +5141,7 @@ msgstr "Надіслати прямий допис"
 msgid "To"
 msgstr "До"
 
-#: lib/messageform.php:161 lib/noticeform.php:185
+#: lib/messageform.php:159 lib/noticeform.php:183
 msgid "Available characters"
 msgstr "Лишилось знаків"
 
@@ -5154,11 +5154,11 @@ msgstr "Надіслати допис"
 msgid "What's up, %s?"
 msgstr "Що нового, %s?"
 
-#: lib/noticeform.php:192
+#: lib/noticeform.php:190
 msgid "Attach"
 msgstr "Вкласти"
 
-#: lib/noticeform.php:196
+#: lib/noticeform.php:194
 msgid "Attach a file"
 msgstr "Вкласти файл"
 
@@ -5227,11 +5227,11 @@ msgstr "Помилка при додаванні віддаленого проф
 msgid "Duplicate notice"
 msgstr "Дублікат допису"
 
-#: lib/oauthstore.php:467 lib/subs.php:48
+#: lib/oauthstore.php:466 lib/subs.php:48
 msgid "You have been banned from subscribing."
 msgstr "Вас позбавлено можливості підписатись."
 
-#: lib/oauthstore.php:492
+#: lib/oauthstore.php:491
 msgid "Couldn't insert new subscription."
 msgstr "Не вдалося додати нову підписку."
 
@@ -5391,20 +5391,6 @@ msgstr "Люди підписані до %s"
 msgid "Groups %s is a member of"
 msgstr "%s бере участь в цих групах"
 
-#: lib/subscriberspeopleselftagcloudsection.php:48
-#: lib/subscriptionspeopleselftagcloudsection.php:48
-msgid "People Tagcloud as self-tagged"
-msgstr "Хмарка теґів (позначки самих користувачів)"
-
-#: lib/subscriberspeopletagcloudsection.php:48
-#: lib/subscriptionspeopletagcloudsection.php:48
-msgid "People Tagcloud as tagged"
-msgstr "Хмарка теґів (позначки, якими Ви позначили користувачів)"
-
-#: lib/subscriptionlist.php:126
-msgid "(none)"
-msgstr "(пусто)"
-
 #: lib/subs.php:52
 msgid "Already subscribed!"
 msgstr "Вже підписаний!"
@@ -5433,6 +5419,20 @@ msgstr "Не можу видалити самопідписку."
 msgid "Couldn't delete subscription."
 msgstr "Не вдалося видалити підписку."
 
+#: lib/subscriberspeopleselftagcloudsection.php:48
+#: lib/subscriptionspeopleselftagcloudsection.php:48
+msgid "People Tagcloud as self-tagged"
+msgstr "Хмарка теґів (позначки самих користувачів)"
+
+#: lib/subscriberspeopletagcloudsection.php:48
+#: lib/subscriptionspeopletagcloudsection.php:48
+msgid "People Tagcloud as tagged"
+msgstr "Хмарка теґів (позначки, якими Ви позначили користувачів)"
+
+#: lib/subscriptionlist.php:126
+msgid "(none)"
+msgstr "(пусто)"
+
 #: lib/tagcloudsection.php:56
 msgid "None"
 msgstr "Пусто"
diff --git a/locale/vi/LC_MESSAGES/statusnet.po b/locale/vi/LC_MESSAGES/statusnet.po
index 8e29eac3c4..362f191082 100644
--- a/locale/vi/LC_MESSAGES/statusnet.po
+++ b/locale/vi/LC_MESSAGES/statusnet.po
@@ -7,12 +7,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 21:25+0000\n"
-"PO-Revision-Date: 2009-12-07 21:27:36+0000\n"
+"POT-Creation-Date: 2009-12-12 17:09+0000\n"
+"PO-Revision-Date: 2009-12-12 17:10:39+0000\n"
 "Language-Team: Vietnamese\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59800); Translate extension (2009-12-06)\n"
+"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: vi\n"
 "X-Message-Group: out-statusnet\n"
@@ -26,11 +26,11 @@ msgstr "Không có tin nhắn nào."
 
 #: actions/all.php:74 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofile.php:105
 #: actions/apiaccountupdateprofilebackgroundimage.php:116
-#: actions/apiaccountupdateprofileimage.php:105
-#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
-#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
-#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
+#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90
 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
@@ -43,7 +43,7 @@ msgstr "Không có tin nhắn nào."
 #: actions/repliesrss.php:38 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38
 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
-#: lib/command.php:364 lib/command.php:411 lib/command.php:466
+#: lib/command.php:364 lib/command.php:411 lib/command.php:467
 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
 #: lib/subs.php:34 lib/subs.php:116
 msgid "No such user."
@@ -55,7 +55,7 @@ msgid "%s and friends, page %d"
 msgstr "%s và bạn bè"
 
 #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
-#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100
+#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s và bạn bè"
@@ -107,25 +107,25 @@ msgstr ""
 msgid "You and friends"
 msgstr "%s và bạn bè"
 
-#: actions/allrss.php:119 actions/apitimelinefriends.php:121
+#: actions/allrss.php:119 actions/apitimelinefriends.php:122
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr ""
 
 #: actions/apiaccountratelimitstatus.php:70
 #: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofile.php:97
 #: actions/apiaccountupdateprofilebackgroundimage.php:94
 #: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apiaccountupdateprofile.php:97
 #, fuzzy
 msgid "API method not found."
 msgstr "Phương thức API không tìm thấy!"
 
 #: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofile.php:89
 #: actions/apiaccountupdateprofilebackgroundimage.php:86
 #: actions/apiaccountupdateprofilecolors.php:110
-#: actions/apiaccountupdateprofileimage.php:84
-#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
+#: actions/apiaccountupdateprofileimage.php:84 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
@@ -145,9 +145,23 @@ msgstr ""
 msgid "Could not update user."
 msgstr "Không thể cập nhật thành viên."
 
+#: actions/apiaccountupdateprofile.php:112
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+msgid "User has no profile."
+msgstr "Người dùng không có thông tin."
+
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "Không thể lưu hồ sơ cá nhân."
+
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257
 #: actions/designadminpanel.php:122 actions/newnotice.php:94
 #: lib/designsettings.php:283
 #, php-format
@@ -170,20 +184,6 @@ msgstr "Không thể lưu thông tin Twitter của bạn!"
 msgid "Could not update your design."
 msgstr "Không thể cập nhật thành viên."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
-#: actions/apiaccountupdateprofileimage.php:130
-#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
-#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
-msgid "User has no profile."
-msgstr "Người dùng không có thông tin."
-
-#: actions/apiaccountupdateprofile.php:147
-#, fuzzy
-msgid "Could not save profile."
-msgstr "Không thể lưu hồ sơ cá nhân."
-
 #: actions/apiblockcreate.php:105
 #, fuzzy
 msgid "You cannot block yourself!"
@@ -197,25 +197,6 @@ msgstr ""
 msgid "Unblock user failed."
 msgstr ""
 
-#: actions/apidirectmessagenew.php:126
-#, fuzzy
-msgid "No message text!"
-msgstr "Không có tin nhắn nào."
-
-#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
-#, fuzzy, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr "Quá dài. Tối đa là 140 ký tự."
-
-#: actions/apidirectmessagenew.php:146
-#, fuzzy
-msgid "Recipient user not found."
-msgstr "Không tìm thấy user."
-
-#: actions/apidirectmessagenew.php:150
-msgid "Can't send direct messages to users who aren't your friend."
-msgstr ""
-
 #: actions/apidirectmessage.php:89
 #, fuzzy, php-format
 msgid "Direct messages from %s"
@@ -241,18 +222,37 @@ msgstr ""
 #: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
-#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
-#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149
-#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
-#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156
+#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151
+#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141
+#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
 msgid "API method not found!"
 msgstr "Phương thức API không tìm thấy!"
 
+#: actions/apidirectmessagenew.php:126
+#, fuzzy
+msgid "No message text!"
+msgstr "Không có tin nhắn nào."
+
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, fuzzy, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "Quá dài. Tối đa là 140 ký tự."
+
+#: actions/apidirectmessagenew.php:146
+#, fuzzy
+msgid "Recipient user not found."
+msgstr "Không tìm thấy user."
+
+#: actions/apidirectmessagenew.php:150
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr ""
+
 #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
 #: actions/apistatusesdestroy.php:113
 msgid "No status found with that ID."
@@ -405,16 +405,6 @@ msgstr "Bạn chưa cập nhật thông tin riêng"
 msgid "Could not remove user %s to group %s."
 msgstr "Không thể theo bạn này: %s đã có trong danh sách bạn bè của bạn rồi."
 
-#: actions/apigrouplistall.php:90 actions/usergroups.php:62
-#, fuzzy, php-format
-msgid "%s groups"
-msgstr "%s và nhóm"
-
-#: actions/apigrouplistall.php:94
-#, fuzzy, php-format
-msgid "groups on %s"
-msgstr "Mã nhóm"
-
 #: actions/apigrouplist.php:95
 #, fuzzy, php-format
 msgid "%s's groups"
@@ -425,6 +415,16 @@ msgstr "%s và nhóm"
 msgid "Groups %s is a member of on %s."
 msgstr "Bạn chưa cập nhật thông tin riêng"
 
+#: actions/apigrouplistall.php:90 actions/usergroups.php:62
+#, fuzzy, php-format
+msgid "%s groups"
+msgstr "%s và nhóm"
+
+#: actions/apigrouplistall.php:94
+#, fuzzy, php-format
+msgid "groups on %s"
+msgstr "Mã nhóm"
+
 #: actions/apistatusesdestroy.php:107
 msgid "This method requires a POST or DELETE."
 msgstr "Phương thức này yêu cầu là POST hoặc DELETE"
@@ -462,54 +462,54 @@ msgstr ""
 msgid "Unsupported format."
 msgstr "Không hỗ trợ kiểu file ảnh này."
 
-#: actions/apitimelinefavorites.php:107
+#: actions/apitimelinefavorites.php:108
 #, fuzzy, php-format
 msgid "%s / Favorites from %s"
 msgstr "Tìm kiếm các tin nhắn ưa thích của %s"
 
-#: actions/apitimelinefavorites.php:119
+#: actions/apitimelinefavorites.php:120
 #, fuzzy, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr "Tất cả các cập nhật của %s"
 
-#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117
+#: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118
 #: actions/grouprss.php:131 actions/userrss.php:90
 #, fuzzy, php-format
 msgid "%s timeline"
 msgstr "Dòng tin nhắn của %s"
 
-#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125
+#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
 #: actions/userrss.php:92
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr ""
 
-#: actions/apitimelinementions.php:116
+#: actions/apitimelinementions.php:117
 #, fuzzy, php-format
 msgid "%1$s / Updates mentioning %2$s"
 msgstr "%1$s / Các cập nhật đang trả lời tới %2$s"
 
-#: actions/apitimelinementions.php:126
+#: actions/apitimelinementions.php:127
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr ""
 
-#: actions/apitimelinepublic.php:106 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
 #, fuzzy, php-format
 msgid "%s public timeline"
 msgstr "Dòng tin công cộng"
 
-#: actions/apitimelinepublic.php:110 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s cập nhật từ tất cả mọi người!"
 
-#: actions/apitimelinetag.php:101 actions/tag.php:66
+#: actions/apitimelinetag.php:102 actions/tag.php:66
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Thông báo được gắn thẻ %s"
 
-#: actions/apitimelinetag.php:107 actions/tagrss.php:64
+#: actions/apitimelinetag.php:108 actions/tagrss.php:64
 #, fuzzy, php-format
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Dòng tin nhắn cho %s"
@@ -548,48 +548,48 @@ 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:106 actions/avatarsettings.php:182
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:185
 #: actions/grouplogo.php:178 actions/remotesubscribe.php:191
 #: actions/userauthorization.php:72 actions/userrss.php:103
 #, fuzzy
 msgid "User without matching profile"
 msgstr "Hồ sơ ở nơi khác không khớp với hồ sơ này của bạn"
 
-#: actions/avatarsettings.php:119 actions/avatarsettings.php:194
+#: actions/avatarsettings.php:119 actions/avatarsettings.php:197
 #: actions/grouplogo.php:251
 msgid "Avatar settings"
 msgstr "Thay đổi hình đại diện"
 
-#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/avatarsettings.php:127 actions/avatarsettings.php:205
 #: actions/grouplogo.php:199 actions/grouplogo.php:259
 msgid "Original"
 msgstr ""
 
-#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/avatarsettings.php:142 actions/avatarsettings.php:217
 #: actions/grouplogo.php:210 actions/grouplogo.php:271
 msgid "Preview"
 msgstr "Xem trước"
 
-#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
+#: actions/avatarsettings.php:149 lib/deleteuserform.php:66
 #: lib/noticelist.php:550
 #, fuzzy
 msgid "Delete"
 msgstr "Xóa tin nhắn"
 
-#: actions/avatarsettings.php:165 actions/grouplogo.php:233
+#: actions/avatarsettings.php:166 actions/grouplogo.php:233
 msgid "Upload"
 msgstr "Tải file"
 
-#: actions/avatarsettings.php:228 actions/grouplogo.php:286
+#: actions/avatarsettings.php:231 actions/grouplogo.php:286
 #, fuzzy
 msgid "Crop"
 msgstr "Nhóm"
 
-#: actions/avatarsettings.php:265 actions/disfavor.php:74
+#: actions/avatarsettings.php:268 actions/disfavor.php:74
 #: actions/emailsettings.php:238 actions/favor.php:75
 #: actions/groupblock.php:66 actions/grouplogo.php:309
 #: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -600,34 +600,75 @@ msgstr "Nhóm"
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Có lỗi xảy ra khi thao tác. Hãy thử lại lần nữa."
 
-#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
+#: actions/avatarsettings.php:281 actions/designadminpanel.php:103
 #: actions/emailsettings.php:256 actions/grouplogo.php:319
 #: actions/imsettings.php:220 actions/recoverpassword.php:44
 #: actions/smssettings.php:248 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "Bất ngờ gửi mẫu thông tin. "
 
-#: actions/avatarsettings.php:322
+#: actions/avatarsettings.php:328
 msgid "Pick a square area of the image to be your avatar"
 msgstr ""
 
-#: actions/avatarsettings.php:337 actions/grouplogo.php:377
+#: actions/avatarsettings.php:343 actions/grouplogo.php:377
 msgid "Lost our file data."
 msgstr ""
 
-#: actions/avatarsettings.php:360
+#: actions/avatarsettings.php:366
 msgid "Avatar updated."
 msgstr "Hình đại diện đã được cập nhật."
 
-#: actions/avatarsettings.php:363
+#: actions/avatarsettings.php:369
 msgid "Failed updating avatar."
 msgstr "Cập nhật hình đại diện không thành công."
 
-#: actions/avatarsettings.php:387
+#: actions/avatarsettings.php:393
 #, fuzzy
 msgid "Avatar deleted."
 msgstr "Hình đại diện đã được cập nhật."
 
+#: actions/block.php:69
+#, fuzzy
+msgid "You already blocked that user."
+msgstr "Bạn đã theo những người này:"
+
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
+#, fuzzy
+msgid "Block user"
+msgstr "Ban user"
+
+#: actions/block.php:130
+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/block.php:143 actions/deletenotice.php:145
+#: actions/deleteuser.php:147 actions/groupblock.php:178
+msgid "No"
+msgstr "Không"
+
+#: actions/block.php:143 actions/deleteuser.php:147
+#, fuzzy
+msgid "Do not block this user"
+msgstr "Bỏ chặn người dùng này"
+
+#: actions/block.php:144 actions/deletenotice.php:146
+#: actions/deleteuser.php:148 actions/groupblock.php:179
+msgid "Yes"
+msgstr "Có"
+
+#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
+#, fuzzy
+msgid "Block this user"
+msgstr "Ban user"
+
+#: actions/block.php:162
+msgid "Failed to save block information."
+msgstr ""
+
 #: actions/blockedfromgroup.php:73 actions/editgroup.php:84
 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
 #: actions/groupmembers.php:76 actions/grouprss.php:91
@@ -671,47 +712,6 @@ msgstr "Bỏ chặn"
 msgid "Unblock this user"
 msgstr "Bỏ chặn người dùng này"
 
-#: actions/block.php:69
-#, fuzzy
-msgid "You already blocked that user."
-msgstr "Bạn đã theo những người này:"
-
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
-#, fuzzy
-msgid "Block user"
-msgstr "Ban user"
-
-#: actions/block.php:130
-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/block.php:143 actions/deletenotice.php:145
-#: actions/deleteuser.php:147 actions/groupblock.php:178
-msgid "No"
-msgstr "Không"
-
-#: actions/block.php:143 actions/deleteuser.php:147
-#, fuzzy
-msgid "Do not block this user"
-msgstr "Bỏ chặn người dùng này"
-
-#: actions/block.php:144 actions/deletenotice.php:146
-#: actions/deleteuser.php:148 actions/groupblock.php:179
-msgid "Yes"
-msgstr "Có"
-
-#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
-#, fuzzy
-msgid "Block this user"
-msgstr "Ban user"
-
-#: actions/block.php:162
-msgid "Failed to save block information."
-msgstr ""
-
 #: actions/bookmarklet.php:50
 msgid "Post to "
 msgstr ""
@@ -1218,6 +1218,15 @@ msgstr "Địa chỉ email hoặc mật khẩu không đúng."
 msgid "New incoming email address added."
 msgstr "Đã xác nhận địa chỉ này."
 
+#: actions/favor.php:79
+msgid "This notice is already a favorite!"
+msgstr "Tin nhắn này đã có trong danh sách tin nhắn ưa thích của bạn rồi!"
+
+#: actions/favor.php:92 lib/disfavorform.php:140
+#, fuzzy
+msgid "Disfavor favorite"
+msgstr "Không thích"
+
 #: actions/favorited.php:65 lib/popularnoticesection.php:88
 #: lib/publicgroupnav.php:93
 #, fuzzy
@@ -1262,15 +1271,6 @@ msgstr "Những tin nhắn ưa thích của %s"
 msgid "Updates favored by %1$s on %2$s!"
 msgstr "Dòng tin nhắn cho %s"
 
-#: actions/favor.php:79
-msgid "This notice is already a favorite!"
-msgstr "Tin nhắn này đã có trong danh sách tin nhắn ưa thích của bạn rồi!"
-
-#: actions/favor.php:92 lib/disfavorform.php:140
-#, fuzzy
-msgid "Disfavor favorite"
-msgstr "Không thích"
-
 #: actions/featured.php:69 lib/featureduserssection.php:87
 #: lib/publicgroupnav.php:89
 msgid "Featured users"
@@ -1520,6 +1520,32 @@ msgstr "Kênh mà bạn tham gia"
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "Dòng tin nhắn cho %s"
 
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#, fuzzy
+msgid "Groups"
+msgstr "Nhóm"
+
+#: actions/groups.php:64
+#, fuzzy, php-format
+msgid "Groups, page %d"
+msgstr "Tên nhóm"
+
+#: 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/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
+#, fuzzy
+msgid "Create a new group"
+msgstr "Tạo nhóm"
+
 #: actions/groupsearch.php:52
 #, fuzzy, php-format
 msgid ""
@@ -1554,32 +1580,6 @@ msgid ""
 "action.newgroup%%) yourself!"
 msgstr ""
 
-#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
-#, fuzzy
-msgid "Groups"
-msgstr "Nhóm"
-
-#: actions/groups.php:64
-#, fuzzy, php-format
-msgid "Groups, page %d"
-msgstr "Tên nhóm"
-
-#: 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/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
-#, fuzzy
-msgid "Create a new group"
-msgstr "Tạo nhóm"
-
 #: actions/groupunblock.php:91
 msgid "Only an admin can unblock group members."
 msgstr ""
@@ -1777,7 +1777,7 @@ msgstr "Tin nhắn cá nhân"
 msgid "Optionally add a personal message to the invitation."
 msgstr "Không bắt buộc phải thêm thông điệp vào thư mời."
 
-#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:222
 msgid "Send"
 msgstr "Gửi"
 
@@ -1888,57 +1888,57 @@ msgstr "Không thể theo bạn này: %s đã có trong danh sách bạn bè c
 msgid "%s left group %s"
 msgstr "%s và nhóm"
 
-#: actions/login.php:82 actions/register.php:137
+#: actions/login.php:83 actions/register.php:137
 msgid "Already logged in."
 msgstr "Đã đăng nhập."
 
-#: actions/login.php:113 actions/login.php:123
+#: actions/login.php:114 actions/login.php:124
 #, fuzzy
 msgid "Invalid or expired token."
 msgstr "Nội dung tin nhắn không hợp lệ"
 
-#: actions/login.php:146
+#: actions/login.php:147
 msgid "Incorrect username or password."
 msgstr "Sai tên đăng nhập hoặc mật khẩu."
 
-#: actions/login.php:152
+#: actions/login.php:153
 #, fuzzy
 msgid "Error setting user. You are probably not authorized."
 msgstr "Chưa được phép."
 
-#: actions/login.php:207 actions/login.php:260 lib/action.php:458
+#: actions/login.php:208 actions/login.php:261 lib/action.php:458
 #: lib/logingroupnav.php:79
 msgid "Login"
 msgstr "Đăng nhập"
 
-#: actions/login.php:246
+#: actions/login.php:247
 msgid "Login to site"
 msgstr ""
 
-#: actions/login.php:249 actions/profilesettings.php:106
+#: actions/login.php:250 actions/profilesettings.php:106
 #: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
 #: lib/groupeditform.php:152 lib/userprofile.php:131
 msgid "Nickname"
 msgstr "Biệt danh"
 
-#: actions/login.php:252 actions/register.php:428
+#: actions/login.php:253 actions/register.php:428
 #: lib/accountsettingsaction.php:116
 msgid "Password"
 msgstr "Mật khẩu"
 
-#: actions/login.php:255 actions/register.php:477
+#: actions/login.php:256 actions/register.php:477
 msgid "Remember me"
 msgstr "Nhớ tôi"
 
-#: actions/login.php:256 actions/register.php:479
+#: actions/login.php:257 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!"
 
-#: actions/login.php:266
+#: actions/login.php:267
 msgid "Lost or forgotten password?"
 msgstr "Mất hoặc quên mật khẩu?"
 
-#: actions/login.php:285
+#: actions/login.php:286
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -1946,7 +1946,7 @@ msgstr ""
 "Vì lý do bảo mật, bạn hãy nhập lại tên đăng nhập và mật khẩu trước khi thay "
 "đổi trong điều chỉnh."
 
-#: actions/login.php:289
+#: actions/login.php:290
 #, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -2022,7 +2022,7 @@ msgstr "Tin mới nhất"
 msgid "Direct message to %s sent"
 msgstr "Tin nhắn riêng"
 
-#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:242 lib/channel.php:170
 #, fuzzy
 msgid "Ajax Error"
 msgstr "Lỗi"
@@ -2031,7 +2031,7 @@ msgstr "Lỗi"
 msgid "New notice"
 msgstr "Thông báo mới"
 
-#: actions/newnotice.php:206
+#: actions/newnotice.php:208
 #, fuzzy
 msgid "Notice posted"
 msgstr "Tin đã gửi"
@@ -2111,8 +2111,8 @@ msgstr "Kết nối"
 msgid "Only "
 msgstr ""
 
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996
-#: lib/api.php:1024 lib/api.php:1134
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011
+#: lib/api.php:1039 lib/api.php:1149
 msgid "Not a supported data format."
 msgstr "Không hỗ trợ định dạng dữ liệu này."
 
@@ -3692,6 +3692,26 @@ msgstr "Không có Jabber ID."
 msgid "SMS"
 msgstr "SMS"
 
+#: actions/tag.php:68
+#, fuzzy, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr "Dòng tin nhắn cho %s"
+
+#: actions/tag.php:86
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "Dòng tin nhắn cho %s"
+
+#: actions/tag.php:92
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "Dòng tin nhắn cho %s"
+
+#: actions/tag.php:98
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "Dòng tin nhắn cho %s"
+
 #: actions/tagother.php:33
 #, fuzzy
 msgid "Not logged in"
@@ -3741,26 +3761,6 @@ msgstr "Không thể lưu hồ sơ cá nhân."
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 
-#: actions/tag.php:68
-#, fuzzy, php-format
-msgid "Notices tagged with %s, page %d"
-msgstr "Dòng tin nhắn cho %s"
-
-#: actions/tag.php:86
-#, fuzzy, php-format
-msgid "Notice feed for tag %s (RSS 1.0)"
-msgstr "Dòng tin nhắn cho %s"
-
-#: actions/tag.php:92
-#, fuzzy, php-format
-msgid "Notice feed for tag %s (RSS 2.0)"
-msgstr "Dòng tin nhắn cho %s"
-
-#: actions/tag.php:98
-#, fuzzy, php-format
-msgid "Notice feed for tag %s (Atom)"
-msgstr "Dòng tin nhắn cho %s"
-
 #: actions/tagrss.php:35
 #, fuzzy
 msgid "No such tag."
@@ -4078,40 +4078,45 @@ msgstr "Không thể cập nhật thông tin user với địa chỉ email đã
 msgid "DB error inserting hashtag: %s"
 msgstr "Lỗi cơ sở dữ liệu khi chèn trả lời: %s"
 
-#: classes/Notice.php:179
+#: classes/Notice.php:188
 #, fuzzy
 msgid "Problem saving notice. Too long."
 msgstr "Có lỗi xảy ra khi lưu tin nhắn."
 
-#: classes/Notice.php:183
+#: classes/Notice.php:192
 #, fuzzy
 msgid "Problem saving notice. Unknown user."
 msgstr "Có lỗi xảy ra khi lưu tin nhắn."
 
-#: classes/Notice.php:188
+#: classes/Notice.php:197
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
-#: classes/Notice.php:194
+#: classes/Notice.php:203
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
 msgstr ""
 
-#: classes/Notice.php:200
+#: classes/Notice.php:209
 msgid "You are banned from posting notices on this site."
 msgstr ""
 
-#: classes/Notice.php:265 classes/Notice.php:290
+#: classes/Notice.php:274 classes/Notice.php:299
 msgid "Problem saving notice."
 msgstr "Có lỗi xảy ra khi lưu tin nhắn."
 
-#: classes/Notice.php:1124
+#: classes/Notice.php:1115
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "Lỗi cơ sở dữ liệu khi chèn trả lời: %s"
 
+#: classes/User.php:347
+#, fuzzy, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr "%s chào mừng bạn "
+
 #: classes/User_group.php:380
 #, fuzzy
 msgid "Could not create group."
@@ -4122,11 +4127,6 @@ msgstr "Không thể tạo favorite."
 msgid "Could not set group membership."
 msgstr "Không thể tạo đăng nhận."
 
-#: classes/User.php:347
-#, fuzzy, php-format
-msgid "Welcome to %1$s, @%2$s!"
-msgstr "%s chào mừng bạn "
-
 #: lib/accountsettingsaction.php:108
 msgid "Change your profile settings"
 msgstr "Thay đổi các thiết lập trong hồ sơ cá nhân của bạn"
@@ -4455,7 +4455,7 @@ msgstr ""
 msgid "Notice with that id does not exist"
 msgstr ""
 
-#: lib/command.php:168 lib/command.php:416 lib/command.php:471
+#: lib/command.php:168 lib/command.php:416 lib/command.php:472
 #, fuzzy
 msgid "User has no last notice"
 msgstr "Người dùng không có thông tin."
@@ -4505,101 +4505,101 @@ msgstr "Thư bạn đã gửi"
 msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr ""
 
-#: lib/command.php:439
+#: lib/command.php:440
 #, fuzzy, php-format
 msgid "Reply to %s sent"
 msgstr "Trả lời tin nhắn này"
 
-#: lib/command.php:441
+#: lib/command.php:442
 #, fuzzy
 msgid "Error saving notice."
 msgstr "Có lỗi xảy ra khi lưu tin nhắn."
 
-#: lib/command.php:495
+#: lib/command.php:496
 msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: lib/command.php:502
+#: lib/command.php:503
 #, fuzzy, php-format
 msgid "Subscribed to %s"
 msgstr "Theo nhóm này"
 
-#: lib/command.php:523
+#: lib/command.php:524
 msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: lib/command.php:530
+#: lib/command.php:531
 #, fuzzy, php-format
 msgid "Unsubscribed from %s"
 msgstr "Hết theo"
 
-#: lib/command.php:548 lib/command.php:571
+#: lib/command.php:549 lib/command.php:572
 msgid "Command not yet implemented."
 msgstr ""
 
-#: lib/command.php:551
+#: lib/command.php:552
 #, fuzzy
 msgid "Notification off."
 msgstr "Không có mã số xác nhận."
 
-#: lib/command.php:553
+#: lib/command.php:554
 msgid "Can't turn off notification."
 msgstr ""
 
-#: lib/command.php:574
+#: lib/command.php:575
 #, fuzzy
 msgid "Notification on."
 msgstr "Không có mã số xác nhận."
 
-#: lib/command.php:576
+#: lib/command.php:577
 msgid "Can't turn on notification."
 msgstr ""
 
-#: lib/command.php:588
+#: lib/command.php:590
 msgid "Login command is disabled"
 msgstr ""
 
-#: lib/command.php:602
+#: lib/command.php:604
 #, fuzzy, php-format
 msgid "Could not create login token for %s"
 msgstr "Không thể tạo favorite."
 
-#: lib/command.php:607
+#: lib/command.php:609
 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:623
+#: lib/command.php:625
 #, fuzzy
 msgid "You are not subscribed to anyone."
 msgstr "Bạn chưa cập nhật thông tin riêng"
 
-#: lib/command.php:625
+#: lib/command.php:627
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Bạn đã theo những người này:"
 
-#: lib/command.php:645
+#: lib/command.php:647
 #, fuzzy
 msgid "No one is subscribed to you."
 msgstr "Không thể tạo favorite."
 
-#: lib/command.php:647
+#: lib/command.php:649
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Không thể tạo favorite."
 
-#: lib/command.php:667
+#: lib/command.php:669
 #, fuzzy
 msgid "You are not a member of any groups."
 msgstr "Bạn chưa cập nhật thông tin riêng"
 
-#: lib/command.php:669
+#: lib/command.php:671
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Bạn chưa cập nhật thông tin riêng"
 
-#: lib/command.php:683
+#: lib/command.php:685
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -4703,10 +4703,6 @@ msgstr "Bạn muốn cảnh báo tin nhắn này?"
 msgid "Favor"
 msgstr "Ưa thích"
 
-#: lib/feedlist.php:64
-msgid "Export data"
-msgstr ""
-
 #: lib/feed.php:85
 msgid "RSS 1.0"
 msgstr ""
@@ -4723,6 +4719,10 @@ msgstr ""
 msgid "FOAF"
 msgstr ""
 
+#: lib/feedlist.php:64
+msgid "Export data"
+msgstr ""
+
 #: lib/galleryaction.php:121
 msgid "Filter tags"
 msgstr ""
@@ -4897,21 +4897,6 @@ msgstr "Sai tên đăng nhập hoặc mật khẩu."
 msgid "Sign up for a new account"
 msgstr "Tạo tài khoản mới"
 
-#: lib/mailbox.php:89
-msgid "Only the user can read their own mailboxes."
-msgstr ""
-
-#: lib/mailbox.php:139
-msgid ""
-"You have no private messages. You can send private message to engage other "
-"users in conversation. People can send you messages for your eyes only."
-msgstr ""
-
-#: lib/mailbox.php:227 lib/noticelist.php:452
-#, fuzzy
-msgid "from"
-msgstr " từ "
-
 #: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "Xac nhan dia chi email"
@@ -5144,6 +5129,21 @@ msgid ""
 "\n"
 msgstr ""
 
+#: lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
+msgstr ""
+
+#: lib/mailbox.php:139
+msgid ""
+"You have no private messages. You can send private message to engage other "
+"users in conversation. People can send you messages for your eyes only."
+msgstr ""
+
+#: lib/mailbox.php:227 lib/noticelist.php:452
+#, fuzzy
+msgid "from"
+msgstr " từ "
+
 #: lib/mediafile.php:98 lib/mediafile.php:123
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
@@ -5205,7 +5205,7 @@ msgstr "Xóa tin nhắn"
 msgid "To"
 msgstr ""
 
-#: lib/messageform.php:161 lib/noticeform.php:185
+#: lib/messageform.php:159 lib/noticeform.php:183
 #, fuzzy
 msgid "Available characters"
 msgstr "Nhiều hơn 6 ký tự"
@@ -5220,11 +5220,11 @@ msgstr "Thông báo mới"
 msgid "What's up, %s?"
 msgstr "Bạn đang làm gì thế, %s?"
 
-#: lib/noticeform.php:192
+#: lib/noticeform.php:190
 msgid "Attach"
 msgstr ""
 
-#: lib/noticeform.php:196
+#: lib/noticeform.php:194
 msgid "Attach a file"
 msgstr ""
 
@@ -5300,11 +5300,11 @@ msgstr "Lỗi xảy ra khi thêm mới hồ sơ cá nhân"
 msgid "Duplicate notice"
 msgstr "Xóa tin nhắn"
 
-#: lib/oauthstore.php:467 lib/subs.php:48
+#: lib/oauthstore.php:466 lib/subs.php:48
 msgid "You have been banned from subscribing."
 msgstr ""
 
-#: lib/oauthstore.php:492
+#: lib/oauthstore.php:491
 msgid "Couldn't insert new subscription."
 msgstr "Không thể chèn thêm vào đăng nhận."
 
@@ -5477,20 +5477,6 @@ msgstr "Theo nhóm này"
 msgid "Groups %s is a member of"
 msgstr ""
 
-#: lib/subscriberspeopleselftagcloudsection.php:48
-#: lib/subscriptionspeopleselftagcloudsection.php:48
-msgid "People Tagcloud as self-tagged"
-msgstr ""
-
-#: lib/subscriberspeopletagcloudsection.php:48
-#: lib/subscriptionspeopletagcloudsection.php:48
-msgid "People Tagcloud as tagged"
-msgstr ""
-
-#: lib/subscriptionlist.php:126
-msgid "(none)"
-msgstr ""
-
 #: lib/subs.php:52
 msgid "Already subscribed!"
 msgstr ""
@@ -5524,6 +5510,20 @@ msgstr "Không thể xóa đăng nhận."
 msgid "Couldn't delete subscription."
 msgstr "Không thể xóa đăng nhận."
 
+#: 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/subscriptionlist.php:126
+msgid "(none)"
+msgstr ""
+
 #: lib/tagcloudsection.php:56
 #, fuzzy
 msgid "None"
diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po
index 4e306a76bb..f55e49e885 100644
--- a/locale/zh_CN/LC_MESSAGES/statusnet.po
+++ b/locale/zh_CN/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 21:25+0000\n"
-"PO-Revision-Date: 2009-12-07 21:27:39+0000\n"
+"POT-Creation-Date: 2009-12-12 17:09+0000\n"
+"PO-Revision-Date: 2009-12-12 17:10:42+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(r59800); Translate extension (2009-12-06)\n"
+"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: out-statusnet\n"
@@ -28,11 +28,11 @@ msgstr "未找到此消息。"
 
 #: actions/all.php:74 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofile.php:105
 #: actions/apiaccountupdateprofilebackgroundimage.php:116
-#: actions/apiaccountupdateprofileimage.php:105
-#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
-#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
-#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
+#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90
 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
@@ -45,7 +45,7 @@ msgstr "未找到此消息。"
 #: actions/repliesrss.php:38 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38
 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
-#: lib/command.php:364 lib/command.php:411 lib/command.php:466
+#: lib/command.php:364 lib/command.php:411 lib/command.php:467
 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
 #: lib/subs.php:34 lib/subs.php:116
 msgid "No such user."
@@ -57,7 +57,7 @@ msgid "%s and friends, page %d"
 msgstr "%s 及好友"
 
 #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
-#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100
+#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s 及好友"
@@ -109,25 +109,25 @@ msgstr ""
 msgid "You and friends"
 msgstr "%s 及好友"
 
-#: actions/allrss.php:119 actions/apitimelinefriends.php:121
+#: actions/allrss.php:119 actions/apitimelinefriends.php:122
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "%2$s 上 %1$s 和好友的更新！"
 
 #: actions/apiaccountratelimitstatus.php:70
 #: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofile.php:97
 #: actions/apiaccountupdateprofilebackgroundimage.php:94
 #: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apiaccountupdateprofile.php:97
 #, fuzzy
 msgid "API method not found."
 msgstr "API 方法未实现！"
 
 #: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofile.php:89
 #: actions/apiaccountupdateprofilebackgroundimage.php:86
 #: actions/apiaccountupdateprofilecolors.php:110
-#: actions/apiaccountupdateprofileimage.php:84
-#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
+#: actions/apiaccountupdateprofileimage.php:84 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
@@ -147,9 +147,23 @@ msgstr ""
 msgid "Could not update user."
 msgstr "无法更新用户。"
 
+#: actions/apiaccountupdateprofile.php:112
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+msgid "User has no profile."
+msgstr "用户没有个人信息。"
+
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "无法保存个人信息。"
+
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257
 #: actions/designadminpanel.php:122 actions/newnotice.php:94
 #: lib/designsettings.php:283
 #, php-format
@@ -172,20 +186,6 @@ msgstr "无法保存 Twitter 设置！"
 msgid "Could not update your design."
 msgstr "无法更新用户。"
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
-#: actions/apiaccountupdateprofileimage.php:130
-#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
-#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
-msgid "User has no profile."
-msgstr "用户没有个人信息。"
-
-#: actions/apiaccountupdateprofile.php:147
-#, fuzzy
-msgid "Could not save profile."
-msgstr "无法保存个人信息。"
-
 #: actions/apiblockcreate.php:105
 #, fuzzy
 msgid "You cannot block yourself!"
@@ -199,23 +199,6 @@ msgstr "阻止用户失败。"
 msgid "Unblock user failed."
 msgstr "取消阻止用户失败。"
 
-#: actions/apidirectmessagenew.php:126
-msgid "No message text!"
-msgstr "消息没有正文！"
-
-#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
-#, fuzzy, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr "超出长度限制。不能超过 140 个字符。"
-
-#: actions/apidirectmessagenew.php:146
-msgid "Recipient user not found."
-msgstr "未找到收件人。"
-
-#: actions/apidirectmessagenew.php:150
-msgid "Can't send direct messages to users who aren't your friend."
-msgstr "无法向并非好友的用户发送直接消息。"
-
 #: actions/apidirectmessage.php:89
 #, fuzzy, php-format
 msgid "Direct messages from %s"
@@ -241,18 +224,35 @@ msgstr "发给 %s 的直接消息"
 #: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
-#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
-#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149
-#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
-#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156
+#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151
+#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141
+#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
 msgid "API method not found!"
 msgstr "API 方法未实现！"
 
+#: actions/apidirectmessagenew.php:126
+msgid "No message text!"
+msgstr "消息没有正文！"
+
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, fuzzy, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "超出长度限制。不能超过 140 个字符。"
+
+#: actions/apidirectmessagenew.php:146
+msgid "Recipient user not found."
+msgstr "未找到收件人。"
+
+#: actions/apidirectmessagenew.php:150
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr "无法向并非好友的用户发送直接消息。"
+
 #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
 #: actions/apistatusesdestroy.php:113
 msgid "No status found with that ID."
@@ -403,16 +403,6 @@ msgstr "您未告知此个人信息"
 msgid "Could not remove user %s to group %s."
 msgstr "无法订阅用户：未找到。"
 
-#: actions/apigrouplistall.php:90 actions/usergroups.php:62
-#, php-format
-msgid "%s groups"
-msgstr "%s 群组"
-
-#: actions/apigrouplistall.php:94
-#, fuzzy, php-format
-msgid "groups on %s"
-msgstr "组动作"
-
 #: actions/apigrouplist.php:95
 #, fuzzy, php-format
 msgid "%s's groups"
@@ -423,6 +413,16 @@ msgstr "%s 群组"
 msgid "Groups %s is a member of on %s."
 msgstr "%s 组是成员组成了"
 
+#: actions/apigrouplistall.php:90 actions/usergroups.php:62
+#, php-format
+msgid "%s groups"
+msgstr "%s 群组"
+
+#: actions/apigrouplistall.php:94
+#, fuzzy, php-format
+msgid "groups on %s"
+msgstr "组动作"
+
 #: actions/apistatusesdestroy.php:107
 msgid "This method requires a POST or DELETE."
 msgstr "此方法接受POST或DELETE请求。"
@@ -460,54 +460,54 @@ msgstr ""
 msgid "Unsupported format."
 msgstr "不支持这种图像格式。"
 
-#: actions/apitimelinefavorites.php:107
+#: actions/apitimelinefavorites.php:108
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr "%s 的收藏 / %s"
 
-#: actions/apitimelinefavorites.php:119
+#: actions/apitimelinefavorites.php:120
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr "%s 收藏了 %s 的 %s 通告。"
 
-#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117
+#: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118
 #: actions/grouprss.php:131 actions/userrss.php:90
 #, php-format
 msgid "%s timeline"
 msgstr "%s 时间表"
 
-#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125
+#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
 #: actions/userrss.php:92
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "%2$s 上 %1$s 的更新！"
 
-#: actions/apitimelinementions.php:116
+#: actions/apitimelinementions.php:117
 #, fuzzy, php-format
 msgid "%1$s / Updates mentioning %2$s"
 msgstr "%1$s / 回复 %2$s 的消息"
 
-#: actions/apitimelinementions.php:126
+#: actions/apitimelinementions.php:127
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr "回复 %2$s / %3$s 的 %1$s 更新。"
 
-#: actions/apitimelinepublic.php:106 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s 公众时间表"
 
-#: actions/apitimelinepublic.php:110 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "来自所有人的 %s 消息！"
 
-#: actions/apitimelinetag.php:101 actions/tag.php:66
+#: actions/apitimelinetag.php:102 actions/tag.php:66
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "带 %s 标签的通告"
 
-#: actions/apitimelinetag.php:107 actions/tagrss.php:64
+#: actions/apitimelinetag.php:108 actions/tagrss.php:64
 #, fuzzy, php-format
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr "%2$s 上 %1$s 的更新！"
@@ -544,46 +544,46 @@ msgstr "头像"
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr "您可以在这里上传个人头像。"
 
-#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:185
 #: actions/grouplogo.php:178 actions/remotesubscribe.php:191
 #: actions/userauthorization.php:72 actions/userrss.php:103
 msgid "User without matching profile"
 msgstr "找不到匹配的用户。"
 
-#: actions/avatarsettings.php:119 actions/avatarsettings.php:194
+#: actions/avatarsettings.php:119 actions/avatarsettings.php:197
 #: actions/grouplogo.php:251
 msgid "Avatar settings"
 msgstr "头像设置"
 
-#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/avatarsettings.php:127 actions/avatarsettings.php:205
 #: actions/grouplogo.php:199 actions/grouplogo.php:259
 msgid "Original"
 msgstr "原来的"
 
-#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/avatarsettings.php:142 actions/avatarsettings.php:217
 #: actions/grouplogo.php:210 actions/grouplogo.php:271
 msgid "Preview"
 msgstr "预览"
 
-#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
+#: actions/avatarsettings.php:149 lib/deleteuserform.php:66
 #: lib/noticelist.php:550
 #, fuzzy
 msgid "Delete"
 msgstr "删除"
 
-#: actions/avatarsettings.php:165 actions/grouplogo.php:233
+#: actions/avatarsettings.php:166 actions/grouplogo.php:233
 msgid "Upload"
 msgstr "上传"
 
-#: actions/avatarsettings.php:228 actions/grouplogo.php:286
+#: actions/avatarsettings.php:231 actions/grouplogo.php:286
 msgid "Crop"
 msgstr "剪裁"
 
-#: actions/avatarsettings.php:265 actions/disfavor.php:74
+#: actions/avatarsettings.php:268 actions/disfavor.php:74
 #: actions/emailsettings.php:238 actions/favor.php:75
 #: actions/groupblock.php:66 actions/grouplogo.php:309
 #: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -594,34 +594,75 @@ msgstr "剪裁"
 msgid "There was a problem with your session token. Try again, please."
 msgstr "会话标识有问题，请重试。"
 
-#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
+#: actions/avatarsettings.php:281 actions/designadminpanel.php:103
 #: actions/emailsettings.php:256 actions/grouplogo.php:319
 #: actions/imsettings.php:220 actions/recoverpassword.php:44
 #: actions/smssettings.php:248 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "未预料的表单提交。"
 
-#: actions/avatarsettings.php:322
+#: actions/avatarsettings.php:328
 msgid "Pick a square area of the image to be your avatar"
 msgstr "请选择一块方形区域作为你的头像"
 
-#: actions/avatarsettings.php:337 actions/grouplogo.php:377
+#: actions/avatarsettings.php:343 actions/grouplogo.php:377
 msgid "Lost our file data."
 msgstr "文件数据丢失"
 
-#: actions/avatarsettings.php:360
+#: actions/avatarsettings.php:366
 msgid "Avatar updated."
 msgstr "头像已更新。"
 
-#: actions/avatarsettings.php:363
+#: actions/avatarsettings.php:369
 msgid "Failed updating avatar."
 msgstr "更新头像失败。"
 
-#: actions/avatarsettings.php:387
+#: actions/avatarsettings.php:393
 #, fuzzy
 msgid "Avatar deleted."
 msgstr "头像已更新。"
 
+#: actions/block.php:69
+#, fuzzy
+msgid "You already blocked that user."
+msgstr "您已成功阻止该用户："
+
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
+#, fuzzy
+msgid "Block user"
+msgstr "阻止用户"
+
+#: actions/block.php:130
+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/block.php:143 actions/deletenotice.php:145
+#: actions/deleteuser.php:147 actions/groupblock.php:178
+msgid "No"
+msgstr "否"
+
+#: actions/block.php:143 actions/deleteuser.php:147
+#, fuzzy
+msgid "Do not block this user"
+msgstr "取消阻止次用户"
+
+#: actions/block.php:144 actions/deletenotice.php:146
+#: actions/deleteuser.php:148 actions/groupblock.php:179
+msgid "Yes"
+msgstr "是"
+
+#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
+#, fuzzy
+msgid "Block this user"
+msgstr "阻止该用户"
+
+#: actions/block.php:162
+msgid "Failed to save block information."
+msgstr "保存阻止信息失败。"
+
 #: actions/blockedfromgroup.php:73 actions/editgroup.php:84
 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
 #: actions/groupmembers.php:76 actions/grouprss.php:91
@@ -666,47 +707,6 @@ msgstr "取消阻止"
 msgid "Unblock this user"
 msgstr "取消阻止次用户"
 
-#: actions/block.php:69
-#, fuzzy
-msgid "You already blocked that user."
-msgstr "您已成功阻止该用户："
-
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
-#, fuzzy
-msgid "Block user"
-msgstr "阻止用户"
-
-#: actions/block.php:130
-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/block.php:143 actions/deletenotice.php:145
-#: actions/deleteuser.php:147 actions/groupblock.php:178
-msgid "No"
-msgstr "否"
-
-#: actions/block.php:143 actions/deleteuser.php:147
-#, fuzzy
-msgid "Do not block this user"
-msgstr "取消阻止次用户"
-
-#: actions/block.php:144 actions/deletenotice.php:146
-#: actions/deleteuser.php:148 actions/groupblock.php:179
-msgid "Yes"
-msgstr "是"
-
-#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
-#, fuzzy
-msgid "Block this user"
-msgstr "阻止该用户"
-
-#: actions/block.php:162
-msgid "Failed to save block information."
-msgstr "保存阻止信息失败。"
-
 #: actions/bookmarklet.php:50
 #, fuzzy
 msgid "Post to "
@@ -1190,6 +1190,15 @@ msgstr "发布用的电子邮件被移除。"
 msgid "New incoming email address added."
 msgstr "已添加新的发布用的电子邮件地址。"
 
+#: actions/favor.php:79
+msgid "This notice is already a favorite!"
+msgstr "已收藏此通告！"
+
+#: actions/favor.php:92 lib/disfavorform.php:140
+#, fuzzy
+msgid "Disfavor favorite"
+msgstr "取消收藏"
+
 #: actions/favorited.php:65 lib/popularnoticesection.php:88
 #: lib/publicgroupnav.php:93
 #, fuzzy
@@ -1234,15 +1243,6 @@ msgstr "%s 收藏的通告"
 msgid "Updates favored by %1$s on %2$s!"
 msgstr "%2$s 上 %1$s 的更新！"
 
-#: actions/favor.php:79
-msgid "This notice is already a favorite!"
-msgstr "已收藏此通告！"
-
-#: actions/favor.php:92 lib/disfavorform.php:140
-#, fuzzy
-msgid "Disfavor favorite"
-msgstr "取消收藏"
-
 #: actions/featured.php:69 lib/featureduserssection.php:87
 #: lib/publicgroupnav.php:89
 msgid "Featured users"
@@ -1492,6 +1492,31 @@ msgstr ""
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "%2$s 上 %1$s 的更新！"
 
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+msgid "Groups"
+msgstr "组"
+
+#: actions/groups.php:64
+#, php-format
+msgid "Groups, page %d"
+msgstr "组，第 %d 页"
+
+#: actions/groups.php:90
+#, php-format
+msgid ""
+"%%%%site.name%%%% groups let you find and talk with people of similar "
+"interests. After you join a group you can send messages to all other members "
+"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
+"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
+"%%%%)"
+msgstr ""
+
+#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
+#, fuzzy
+msgid "Create a new group"
+msgstr "创建新组"
+
 #: actions/groupsearch.php:52
 #, fuzzy, php-format
 msgid ""
@@ -1525,31 +1550,6 @@ msgid ""
 "action.newgroup%%) yourself!"
 msgstr ""
 
-#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
-msgid "Groups"
-msgstr "组"
-
-#: actions/groups.php:64
-#, php-format
-msgid "Groups, page %d"
-msgstr "组，第 %d 页"
-
-#: actions/groups.php:90
-#, php-format
-msgid ""
-"%%%%site.name%%%% groups let you find and talk with people of similar "
-"interests. After you join a group you can send messages to all other members "
-"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
-"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
-"%%%%)"
-msgstr ""
-
-#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
-#, fuzzy
-msgid "Create a new group"
-msgstr "创建新组"
-
 #: actions/groupunblock.php:91
 msgid "Only an admin can unblock group members."
 msgstr ""
@@ -1736,7 +1736,7 @@ msgstr "个人消息"
 msgid "Optionally add a personal message to the invitation."
 msgstr "在邀请中加几句话(可选)。"
 
-#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:222
 msgid "Send"
 msgstr "发送"
 
@@ -1840,63 +1840,63 @@ msgstr "无法订阅用户：未找到。"
 msgid "%s left group %s"
 msgstr "%s 离开群 %s"
 
-#: actions/login.php:82 actions/register.php:137
+#: actions/login.php:83 actions/register.php:137
 msgid "Already logged in."
 msgstr "已登录。"
 
-#: actions/login.php:113 actions/login.php:123
+#: actions/login.php:114 actions/login.php:124
 #, fuzzy
 msgid "Invalid or expired token."
 msgstr "通告内容不正确"
 
-#: actions/login.php:146
+#: actions/login.php:147
 msgid "Incorrect username or password."
 msgstr "用户名或密码不正确。"
 
-#: actions/login.php:152
+#: actions/login.php:153
 #, fuzzy
 msgid "Error setting user. You are probably not authorized."
 msgstr "未认证。"
 
-#: actions/login.php:207 actions/login.php:260 lib/action.php:458
+#: actions/login.php:208 actions/login.php:261 lib/action.php:458
 #: lib/logingroupnav.php:79
 msgid "Login"
 msgstr "登录"
 
-#: actions/login.php:246
+#: actions/login.php:247
 msgid "Login to site"
 msgstr "登录"
 
-#: actions/login.php:249 actions/profilesettings.php:106
+#: actions/login.php:250 actions/profilesettings.php:106
 #: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
 #: lib/groupeditform.php:152 lib/userprofile.php:131
 msgid "Nickname"
 msgstr "昵称"
 
-#: actions/login.php:252 actions/register.php:428
+#: actions/login.php:253 actions/register.php:428
 #: lib/accountsettingsaction.php:116
 msgid "Password"
 msgstr "密码"
 
-#: actions/login.php:255 actions/register.php:477
+#: actions/login.php:256 actions/register.php:477
 msgid "Remember me"
 msgstr "记住登录状态"
 
-#: actions/login.php:256 actions/register.php:479
+#: actions/login.php:257 actions/register.php:479
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "保持这台机器上的登录状态。不要在共用的机器上保持登录！"
 
-#: actions/login.php:266
+#: actions/login.php:267
 msgid "Lost or forgotten password?"
 msgstr "忘记了密码？"
 
-#: actions/login.php:285
+#: actions/login.php:286
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 msgstr "由于安全原因，修改设置前需要输入用户名和密码。"
 
-#: actions/login.php:289
+#: actions/login.php:290
 #, fuzzy, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -1968,7 +1968,7 @@ msgstr "新消息"
 msgid "Direct message to %s sent"
 msgstr "已向 %s 发送消息"
 
-#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:242 lib/channel.php:170
 msgid "Ajax Error"
 msgstr "Ajax错误"
 
@@ -1976,7 +1976,7 @@ msgstr "Ajax错误"
 msgid "New notice"
 msgstr "新通告"
 
-#: actions/newnotice.php:206
+#: actions/newnotice.php:208
 msgid "Notice posted"
 msgstr "消息已发布。"
 
@@ -2053,8 +2053,8 @@ msgstr "连接"
 msgid "Only "
 msgstr ""
 
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996
-#: lib/api.php:1024 lib/api.php:1134
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011
+#: lib/api.php:1039 lib/api.php:1149
 msgid "Not a supported data format."
 msgstr "不支持的数据格式。"
 
@@ -3611,6 +3611,26 @@ msgstr "没有 Jabber ID。"
 msgid "SMS"
 msgstr "SMS短信"
 
+#: actions/tag.php:68
+#, fuzzy, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr "带 %s 标签的通告"
+
+#: actions/tag.php:86
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "%s 的通告聚合"
+
+#: actions/tag.php:92
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "%s 的通告聚合"
+
+#: actions/tag.php:98
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "%s 的通告聚合"
+
 #: actions/tagother.php:33
 #, fuzzy
 msgid "Not logged in"
@@ -3661,26 +3681,6 @@ msgstr "无法保存头像"
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr "使用这个表格给你的关注者或你的订阅加注标签。"
 
-#: actions/tag.php:68
-#, fuzzy, php-format
-msgid "Notices tagged with %s, page %d"
-msgstr "带 %s 标签的通告"
-
-#: actions/tag.php:86
-#, fuzzy, php-format
-msgid "Notice feed for tag %s (RSS 1.0)"
-msgstr "%s 的通告聚合"
-
-#: actions/tag.php:92
-#, fuzzy, php-format
-msgid "Notice feed for tag %s (RSS 2.0)"
-msgstr "%s 的通告聚合"
-
-#: actions/tag.php:98
-#, fuzzy, php-format
-msgid "Notice feed for tag %s (Atom)"
-msgstr "%s 的通告聚合"
-
 #: actions/tagrss.php:35
 #, fuzzy
 msgid "No such tag."
@@ -3993,41 +3993,46 @@ msgstr "无法添加新URI的信息。"
 msgid "DB error inserting hashtag: %s"
 msgstr "添加标签时数据库出错：%s"
 
-#: classes/Notice.php:179
+#: classes/Notice.php:188
 #, fuzzy
 msgid "Problem saving notice. Too long."
 msgstr "保存通告时出错。"
 
-#: classes/Notice.php:183
+#: classes/Notice.php:192
 #, fuzzy
 msgid "Problem saving notice. Unknown user."
 msgstr "保存通告时出错。"
 
-#: classes/Notice.php:188
+#: classes/Notice.php:197
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr "你在短时间里发布了过多的消息，请深呼吸，过几分钟再发消息。"
 
-#: classes/Notice.php:194
+#: classes/Notice.php:203
 #, fuzzy
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
 msgstr "你在短时间里发布了过多的消息，请深呼吸，过几分钟再发消息。"
 
-#: classes/Notice.php:200
+#: classes/Notice.php:209
 msgid "You are banned from posting notices on this site."
 msgstr "在这个网站你被禁止发布消息。"
 
-#: classes/Notice.php:265 classes/Notice.php:290
+#: classes/Notice.php:274 classes/Notice.php:299
 msgid "Problem saving notice."
 msgstr "保存通告时出错。"
 
-#: classes/Notice.php:1124
+#: classes/Notice.php:1115
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "添加回复时数据库出错：%s"
 
+#: classes/User.php:347
+#, fuzzy, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr "发送给 %1$s 的 %2$s 消息"
+
 #: classes/User_group.php:380
 msgid "Could not create group."
 msgstr "无法创建组。"
@@ -4037,11 +4042,6 @@ msgstr "无法创建组。"
 msgid "Could not set group membership."
 msgstr "无法删除订阅。"
 
-#: classes/User.php:347
-#, fuzzy, php-format
-msgid "Welcome to %1$s, @%2$s!"
-msgstr "发送给 %1$s 的 %2$s 消息"
-
 #: lib/accountsettingsaction.php:108
 msgid "Change your profile settings"
 msgstr "修改您的个人信息"
@@ -4365,7 +4365,7 @@ msgstr ""
 msgid "Notice with that id does not exist"
 msgstr ""
 
-#: lib/command.php:168 lib/command.php:416 lib/command.php:471
+#: lib/command.php:168 lib/command.php:416 lib/command.php:472
 msgid "User has no last notice"
 msgstr "用户没有通告。"
 
@@ -4412,99 +4412,99 @@ msgstr "发送消息出错。"
 msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr "您的消息包含 %d 个字符，超出长度限制 - 不能超过 140 个字符。"
 
-#: lib/command.php:439
+#: lib/command.php:440
 #, fuzzy, php-format
 msgid "Reply to %s sent"
 msgstr "无法删除通告。"
 
-#: lib/command.php:441
+#: lib/command.php:442
 #, fuzzy
 msgid "Error saving notice."
 msgstr "保存通告时出错。"
 
-#: lib/command.php:495
+#: lib/command.php:496
 msgid "Specify the name of the user to subscribe to"
 msgstr "指定要订阅的用户名"
 
-#: lib/command.php:502
+#: lib/command.php:503
 #, php-format
 msgid "Subscribed to %s"
 msgstr "订阅 %s"
 
-#: lib/command.php:523
+#: lib/command.php:524
 msgid "Specify the name of the user to unsubscribe from"
 msgstr "指定要取消订阅的用户名"
 
-#: lib/command.php:530
+#: lib/command.php:531
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr "取消订阅 %s"
 
-#: lib/command.php:548 lib/command.php:571
+#: lib/command.php:549 lib/command.php:572
 msgid "Command not yet implemented."
 msgstr "命令尚未实现。"
 
-#: lib/command.php:551
+#: lib/command.php:552
 msgid "Notification off."
 msgstr "通告关闭。"
 
-#: lib/command.php:553
+#: lib/command.php:554
 msgid "Can't turn off notification."
 msgstr "无法关闭通告。"
 
-#: lib/command.php:574
+#: lib/command.php:575
 msgid "Notification on."
 msgstr "通告开启。"
 
-#: lib/command.php:576
+#: lib/command.php:577
 msgid "Can't turn on notification."
 msgstr "无法开启通告。"
 
-#: lib/command.php:588
+#: lib/command.php:590
 msgid "Login command is disabled"
 msgstr ""
 
-#: lib/command.php:602
+#: lib/command.php:604
 #, fuzzy, php-format
 msgid "Could not create login token for %s"
 msgstr "无法创建收藏。"
 
-#: lib/command.php:607
+#: lib/command.php:609
 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:623
+#: lib/command.php:625
 #, fuzzy
 msgid "You are not subscribed to anyone."
 msgstr "您未告知此个人信息"
 
-#: lib/command.php:625
+#: lib/command.php:627
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "您已订阅这些用户："
 
-#: lib/command.php:645
+#: lib/command.php:647
 #, fuzzy
 msgid "No one is subscribed to you."
 msgstr "无法订阅他人更新。"
 
-#: lib/command.php:647
+#: lib/command.php:649
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "无法订阅他人更新。"
 
-#: lib/command.php:667
+#: lib/command.php:669
 #, fuzzy
 msgid "You are not a member of any groups."
 msgstr "您未告知此个人信息"
 
-#: lib/command.php:669
+#: lib/command.php:671
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "您未告知此个人信息"
 
-#: lib/command.php:683
+#: lib/command.php:685
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -4606,10 +4606,6 @@ msgstr "%s 收藏的通告"
 msgid "Favor"
 msgstr "收藏"
 
-#: lib/feedlist.php:64
-msgid "Export data"
-msgstr "导出数据"
-
 #: lib/feed.php:85
 msgid "RSS 1.0"
 msgstr ""
@@ -4626,6 +4622,10 @@ msgstr ""
 msgid "FOAF"
 msgstr ""
 
+#: lib/feedlist.php:64
+msgid "Export data"
+msgstr "导出数据"
+
 #: lib/galleryaction.php:121
 #, fuzzy
 msgid "Filter tags"
@@ -4798,21 +4798,6 @@ msgstr "输入用户名和密码以登录。"
 msgid "Sign up for a new account"
 msgstr "创建新帐号"
 
-#: lib/mailbox.php:89
-msgid "Only the user can read their own mailboxes."
-msgstr "只有用户自己可以访问邮箱。"
-
-#: lib/mailbox.php:139
-msgid ""
-"You have no private messages. You can send private message to engage other "
-"users in conversation. People can send you messages for your eyes only."
-msgstr ""
-
-#: lib/mailbox.php:227 lib/noticelist.php:452
-#, fuzzy
-msgid "from"
-msgstr " 从 "
-
 #: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "电子邮件地址确认"
@@ -5003,6 +4988,21 @@ msgid ""
 "\n"
 msgstr ""
 
+#: lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
+msgstr "只有用户自己可以访问邮箱。"
+
+#: lib/mailbox.php:139
+msgid ""
+"You have no private messages. You can send private message to engage other "
+"users in conversation. People can send you messages for your eyes only."
+msgstr ""
+
+#: lib/mailbox.php:227 lib/noticelist.php:452
+#, fuzzy
+msgid "from"
+msgstr " 从 "
+
 #: lib/mediafile.php:98 lib/mediafile.php:123
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
@@ -5064,7 +5064,7 @@ msgstr "删除通告"
 msgid "To"
 msgstr "到"
 
-#: lib/messageform.php:161 lib/noticeform.php:185
+#: lib/messageform.php:159 lib/noticeform.php:183
 #, fuzzy
 msgid "Available characters"
 msgstr "6 个或更多字符"
@@ -5079,11 +5079,11 @@ msgstr "发送消息"
 msgid "What's up, %s?"
 msgstr "怎么样，%s？"
 
-#: lib/noticeform.php:192
+#: lib/noticeform.php:190
 msgid "Attach"
 msgstr ""
 
-#: lib/noticeform.php:196
+#: lib/noticeform.php:194
 msgid "Attach a file"
 msgstr ""
 
@@ -5158,12 +5158,12 @@ msgstr "添加远程的个人信息出错"
 msgid "Duplicate notice"
 msgstr "删除通告"
 
-#: lib/oauthstore.php:467 lib/subs.php:48
+#: lib/oauthstore.php:466 lib/subs.php:48
 #, fuzzy
 msgid "You have been banned from subscribing."
 msgstr "那个用户阻止了你的订阅。"
 
-#: lib/oauthstore.php:492
+#: lib/oauthstore.php:491
 msgid "Couldn't insert new subscription."
 msgstr "无法添加新的订阅。"
 
@@ -5335,20 +5335,6 @@ msgstr "订阅 %s"
 msgid "Groups %s is a member of"
 msgstr "%s 组是成员组成了"
 
-#: lib/subscriberspeopleselftagcloudsection.php:48
-#: lib/subscriptionspeopleselftagcloudsection.php:48
-msgid "People Tagcloud as self-tagged"
-msgstr ""
-
-#: lib/subscriberspeopletagcloudsection.php:48
-#: lib/subscriptionspeopletagcloudsection.php:48
-msgid "People Tagcloud as tagged"
-msgstr ""
-
-#: lib/subscriptionlist.php:126
-msgid "(none)"
-msgstr "(none 没有)"
-
 #: lib/subs.php:52
 msgid "Already subscribed!"
 msgstr ""
@@ -5380,6 +5366,20 @@ msgstr "无法删除订阅。"
 msgid "Couldn't delete subscription."
 msgstr "无法删除订阅。"
 
+#: lib/subscriberspeopleselftagcloudsection.php:48
+#: lib/subscriptionspeopleselftagcloudsection.php:48
+msgid "People Tagcloud as self-tagged"
+msgstr ""
+
+#: lib/subscriberspeopletagcloudsection.php:48
+#: lib/subscriptionspeopletagcloudsection.php:48
+msgid "People Tagcloud as tagged"
+msgstr ""
+
+#: lib/subscriptionlist.php:126
+msgid "(none)"
+msgstr "(none 没有)"
+
 #: lib/tagcloudsection.php:56
 #, fuzzy
 msgid "None"
diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.po b/locale/zh_TW/LC_MESSAGES/statusnet.po
index ad7d1fbaea..3d041c4869 100644
--- a/locale/zh_TW/LC_MESSAGES/statusnet.po
+++ b/locale/zh_TW/LC_MESSAGES/statusnet.po
@@ -7,12 +7,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 21:25+0000\n"
-"PO-Revision-Date: 2009-12-07 21:27:42+0000\n"
+"POT-Creation-Date: 2009-12-12 17:09+0000\n"
+"PO-Revision-Date: 2009-12-12 17:10:45+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(r59800); Translate extension (2009-12-06)\n"
+"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hant\n"
 "X-Message-Group: out-statusnet\n"
@@ -26,11 +26,11 @@ msgstr "無此通知"
 
 #: actions/all.php:74 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofile.php:105
 #: actions/apiaccountupdateprofilebackgroundimage.php:116
-#: actions/apiaccountupdateprofileimage.php:105
-#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
-#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
-#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
+#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90
 #: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
@@ -43,7 +43,7 @@ msgstr "無此通知"
 #: actions/repliesrss.php:38 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38
 #: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
-#: lib/command.php:364 lib/command.php:411 lib/command.php:466
+#: lib/command.php:364 lib/command.php:411 lib/command.php:467
 #: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
 #: lib/subs.php:34 lib/subs.php:116
 msgid "No such user."
@@ -55,7 +55,7 @@ msgid "%s and friends, page %d"
 msgstr "%s與好友"
 
 #: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
-#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100
+#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 msgstr "%s與好友"
@@ -107,25 +107,25 @@ msgstr ""
 msgid "You and friends"
 msgstr "%s與好友"
 
-#: actions/allrss.php:119 actions/apitimelinefriends.php:121
+#: actions/allrss.php:119 actions/apitimelinefriends.php:122
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr ""
 
 #: actions/apiaccountratelimitstatus.php:70
 #: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofile.php:97
 #: actions/apiaccountupdateprofilebackgroundimage.php:94
 #: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apiaccountupdateprofile.php:97
 #, fuzzy
 msgid "API method not found."
 msgstr "確認碼遺失"
 
 #: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofile.php:89
 #: actions/apiaccountupdateprofilebackgroundimage.php:86
 #: actions/apiaccountupdateprofilecolors.php:110
-#: actions/apiaccountupdateprofileimage.php:84
-#: actions/apiaccountupdateprofile.php:89 actions/apiblockcreate.php:89
+#: actions/apiaccountupdateprofileimage.php:84 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
@@ -145,9 +145,23 @@ msgstr ""
 msgid "Could not update user."
 msgstr "無法更新使用者"
 
+#: actions/apiaccountupdateprofile.php:112
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+msgid "User has no profile."
+msgstr ""
+
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "無法儲存個人資料"
+
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257
 #: actions/designadminpanel.php:122 actions/newnotice.php:94
 #: lib/designsettings.php:283
 #, php-format
@@ -169,20 +183,6 @@ msgstr ""
 msgid "Could not update your design."
 msgstr "無法更新使用者"
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
-#: actions/apiaccountupdateprofileimage.php:130
-#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
-#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
-msgid "User has no profile."
-msgstr ""
-
-#: actions/apiaccountupdateprofile.php:147
-#, fuzzy
-msgid "Could not save profile."
-msgstr "無法儲存個人資料"
-
 #: actions/apiblockcreate.php:105
 #, fuzzy
 msgid "You cannot block yourself!"
@@ -196,23 +196,6 @@ msgstr ""
 msgid "Unblock user failed."
 msgstr ""
 
-#: actions/apidirectmessagenew.php:126
-msgid "No message text!"
-msgstr ""
-
-#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
-#, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr ""
-
-#: actions/apidirectmessagenew.php:146
-msgid "Recipient user not found."
-msgstr ""
-
-#: actions/apidirectmessagenew.php:150
-msgid "Can't send direct messages to users who aren't your friend."
-msgstr ""
-
 #: actions/apidirectmessage.php:89
 #, php-format
 msgid "Direct messages from %s"
@@ -238,18 +221,35 @@ msgstr ""
 #: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
 #: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
 #: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
-#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
 #: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
 #: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
 #: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
 #: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
-#: actions/apitimelinegroup.php:147 actions/apitimelinementions.php:149
-#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
-#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156
+#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151
+#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141
+#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
 msgid "API method not found!"
 msgstr ""
 
+#: actions/apidirectmessagenew.php:126
+msgid "No message text!"
+msgstr ""
+
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr ""
+
+#: actions/apidirectmessagenew.php:146
+msgid "Recipient user not found."
+msgstr ""
+
+#: actions/apidirectmessagenew.php:150
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr ""
+
 #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
 #: actions/apistatusesdestroy.php:113
 msgid "No status found with that ID."
@@ -397,16 +397,6 @@ msgstr "無法連結到伺服器:%s"
 msgid "Could not remove user %s to group %s."
 msgstr "無法從 %s 建立OpenID"
 
-#: actions/apigrouplistall.php:90 actions/usergroups.php:62
-#, php-format
-msgid "%s groups"
-msgstr ""
-
-#: actions/apigrouplistall.php:94
-#, php-format
-msgid "groups on %s"
-msgstr ""
-
 #: actions/apigrouplist.php:95
 #, fuzzy, php-format
 msgid "%s's groups"
@@ -417,6 +407,16 @@ msgstr "無此通知"
 msgid "Groups %s is a member of on %s."
 msgstr ""
 
+#: actions/apigrouplistall.php:90 actions/usergroups.php:62
+#, php-format
+msgid "%s groups"
+msgstr ""
+
+#: actions/apigrouplistall.php:94
+#, php-format
+msgid "groups on %s"
+msgstr ""
+
 #: actions/apistatusesdestroy.php:107
 msgid "This method requires a POST or DELETE."
 msgstr ""
@@ -453,54 +453,54 @@ msgstr ""
 msgid "Unsupported format."
 msgstr ""
 
-#: actions/apitimelinefavorites.php:107
+#: actions/apitimelinefavorites.php:108
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr ""
 
-#: actions/apitimelinefavorites.php:119
+#: actions/apitimelinefavorites.php:120
 #, php-format
 msgid "%s updates favorited by %s / %s."
 msgstr ""
 
-#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117
+#: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118
 #: actions/grouprss.php:131 actions/userrss.php:90
 #, php-format
 msgid "%s timeline"
 msgstr ""
 
-#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125
+#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
 #: actions/userrss.php:92
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr ""
 
-#: actions/apitimelinementions.php:116
+#: actions/apitimelinementions.php:117
 #, fuzzy, php-format
 msgid "%1$s / Updates mentioning %2$s"
 msgstr "%1$s的狀態是%2$s"
 
-#: actions/apitimelinementions.php:126
+#: actions/apitimelinementions.php:127
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr ""
 
-#: actions/apitimelinepublic.php:106 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr ""
 
-#: actions/apitimelinepublic.php:110 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr ""
 
-#: actions/apitimelinetag.php:101 actions/tag.php:66
+#: actions/apitimelinetag.php:102 actions/tag.php:66
 #, php-format
 msgid "Notices tagged with %s"
 msgstr ""
 
-#: actions/apitimelinetag.php:107 actions/tagrss.php:64
+#: actions/apitimelinetag.php:108 actions/tagrss.php:64
 #, fuzzy, php-format
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr "&s的微型部落格"
@@ -537,46 +537,46 @@ msgstr "個人圖像"
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr ""
 
-#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:185
 #: actions/grouplogo.php:178 actions/remotesubscribe.php:191
 #: actions/userauthorization.php:72 actions/userrss.php:103
 msgid "User without matching profile"
 msgstr ""
 
-#: actions/avatarsettings.php:119 actions/avatarsettings.php:194
+#: actions/avatarsettings.php:119 actions/avatarsettings.php:197
 #: actions/grouplogo.php:251
 #, fuzzy
 msgid "Avatar settings"
 msgstr "線上即時通設定"
 
-#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/avatarsettings.php:127 actions/avatarsettings.php:205
 #: actions/grouplogo.php:199 actions/grouplogo.php:259
 msgid "Original"
 msgstr ""
 
-#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/avatarsettings.php:142 actions/avatarsettings.php:217
 #: actions/grouplogo.php:210 actions/grouplogo.php:271
 msgid "Preview"
 msgstr ""
 
-#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
+#: actions/avatarsettings.php:149 lib/deleteuserform.php:66
 #: lib/noticelist.php:550
 msgid "Delete"
 msgstr ""
 
-#: actions/avatarsettings.php:165 actions/grouplogo.php:233
+#: actions/avatarsettings.php:166 actions/grouplogo.php:233
 msgid "Upload"
 msgstr ""
 
-#: actions/avatarsettings.php:228 actions/grouplogo.php:286
+#: actions/avatarsettings.php:231 actions/grouplogo.php:286
 msgid "Crop"
 msgstr ""
 
-#: actions/avatarsettings.php:265 actions/disfavor.php:74
+#: actions/avatarsettings.php:268 actions/disfavor.php:74
 #: actions/emailsettings.php:238 actions/favor.php:75
 #: actions/groupblock.php:66 actions/grouplogo.php:309
 #: actions/groupunblock.php:66 actions/imsettings.php:206
-#: actions/invite.php:56 actions/login.php:134 actions/makeadmin.php:66
+#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:187 actions/recoverpassword.php:337
@@ -587,34 +587,75 @@ msgstr ""
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
-#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
+#: actions/avatarsettings.php:281 actions/designadminpanel.php:103
 #: actions/emailsettings.php:256 actions/grouplogo.php:319
 #: actions/imsettings.php:220 actions/recoverpassword.php:44
 #: actions/smssettings.php:248 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr ""
 
-#: actions/avatarsettings.php:322
+#: actions/avatarsettings.php:328
 msgid "Pick a square area of the image to be your avatar"
 msgstr ""
 
-#: actions/avatarsettings.php:337 actions/grouplogo.php:377
+#: actions/avatarsettings.php:343 actions/grouplogo.php:377
 msgid "Lost our file data."
 msgstr ""
 
-#: actions/avatarsettings.php:360
+#: actions/avatarsettings.php:366
 msgid "Avatar updated."
 msgstr "更新個人圖像"
 
-#: actions/avatarsettings.php:363
+#: actions/avatarsettings.php:369
 msgid "Failed updating avatar."
 msgstr "無法上傳個人圖像"
 
-#: actions/avatarsettings.php:387
+#: actions/avatarsettings.php:393
 #, fuzzy
 msgid "Avatar deleted."
 msgstr "更新個人圖像"
 
+#: actions/block.php:69
+#, fuzzy
+msgid "You already blocked that user."
+msgstr "無此使用者"
+
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
+#, fuzzy
+msgid "Block user"
+msgstr "無此使用者"
+
+#: actions/block.php:130
+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/block.php:143 actions/deletenotice.php:145
+#: actions/deleteuser.php:147 actions/groupblock.php:178
+msgid "No"
+msgstr ""
+
+#: actions/block.php:143 actions/deleteuser.php:147
+#, fuzzy
+msgid "Do not block this user"
+msgstr "無此使用者"
+
+#: actions/block.php:144 actions/deletenotice.php:146
+#: actions/deleteuser.php:148 actions/groupblock.php:179
+msgid "Yes"
+msgstr ""
+
+#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
+#, fuzzy
+msgid "Block this user"
+msgstr "無此使用者"
+
+#: actions/block.php:162
+msgid "Failed to save block information."
+msgstr ""
+
 #: actions/blockedfromgroup.php:73 actions/editgroup.php:84
 #: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
 #: actions/groupmembers.php:76 actions/grouprss.php:91
@@ -659,47 +700,6 @@ msgstr ""
 msgid "Unblock this user"
 msgstr "無此使用者"
 
-#: actions/block.php:69
-#, fuzzy
-msgid "You already blocked that user."
-msgstr "無此使用者"
-
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
-#, fuzzy
-msgid "Block user"
-msgstr "無此使用者"
-
-#: actions/block.php:130
-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/block.php:143 actions/deletenotice.php:145
-#: actions/deleteuser.php:147 actions/groupblock.php:178
-msgid "No"
-msgstr ""
-
-#: actions/block.php:143 actions/deleteuser.php:147
-#, fuzzy
-msgid "Do not block this user"
-msgstr "無此使用者"
-
-#: actions/block.php:144 actions/deletenotice.php:146
-#: actions/deleteuser.php:148 actions/groupblock.php:179
-msgid "Yes"
-msgstr ""
-
-#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
-#, fuzzy
-msgid "Block this user"
-msgstr "無此使用者"
-
-#: actions/block.php:162
-msgid "Failed to save block information."
-msgstr ""
-
 #: actions/bookmarklet.php:50
 msgid "Post to "
 msgstr ""
@@ -1172,6 +1172,14 @@ msgstr ""
 msgid "New incoming email address added."
 msgstr ""
 
+#: actions/favor.php:79
+msgid "This notice is already a favorite!"
+msgstr ""
+
+#: actions/favor.php:92 lib/disfavorform.php:140
+msgid "Disfavor favorite"
+msgstr ""
+
 #: actions/favorited.php:65 lib/popularnoticesection.php:88
 #: lib/publicgroupnav.php:93
 #, fuzzy
@@ -1215,14 +1223,6 @@ msgstr ""
 msgid "Updates favored by %1$s on %2$s!"
 msgstr "&s的微型部落格"
 
-#: actions/favor.php:79
-msgid "This notice is already a favorite!"
-msgstr ""
-
-#: actions/favor.php:92 lib/disfavorform.php:140
-msgid "Disfavor favorite"
-msgstr ""
-
 #: actions/featured.php:69 lib/featureduserssection.php:87
 #: lib/publicgroupnav.php:89
 msgid "Featured users"
@@ -1459,6 +1459,31 @@ msgstr ""
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "&s的微型部落格"
 
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 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 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/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
+#, fuzzy
+msgid "Create a new group"
+msgstr "新增帳號"
+
 #: actions/groupsearch.php:52
 #, php-format
 msgid ""
@@ -1490,31 +1515,6 @@ msgid ""
 "action.newgroup%%) yourself!"
 msgstr ""
 
-#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 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 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/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
-#, fuzzy
-msgid "Create a new group"
-msgstr "新增帳號"
-
 #: actions/groupunblock.php:91
 msgid "Only an admin can unblock group members."
 msgstr ""
@@ -1696,7 +1696,7 @@ msgstr ""
 msgid "Optionally add a personal message to the invitation."
 msgstr ""
 
-#: actions/invite.php:197 lib/messageform.php:180 lib/noticeform.php:224
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:222
 msgid "Send"
 msgstr ""
 
@@ -1776,61 +1776,61 @@ msgstr "無法從 %s 建立OpenID"
 msgid "%s left group %s"
 msgstr ""
 
-#: actions/login.php:82 actions/register.php:137
+#: actions/login.php:83 actions/register.php:137
 msgid "Already logged in."
 msgstr "已登入"
 
-#: actions/login.php:113 actions/login.php:123
+#: actions/login.php:114 actions/login.php:124
 msgid "Invalid or expired token."
 msgstr ""
 
-#: actions/login.php:146
+#: actions/login.php:147
 msgid "Incorrect username or password."
 msgstr "使用者名稱或密碼錯誤"
 
-#: actions/login.php:152
+#: actions/login.php:153
 msgid "Error setting user. You are probably not authorized."
 msgstr ""
 
-#: actions/login.php:207 actions/login.php:260 lib/action.php:458
+#: actions/login.php:208 actions/login.php:261 lib/action.php:458
 #: lib/logingroupnav.php:79
 msgid "Login"
 msgstr "登入"
 
-#: actions/login.php:246
+#: actions/login.php:247
 msgid "Login to site"
 msgstr ""
 
-#: actions/login.php:249 actions/profilesettings.php:106
+#: actions/login.php:250 actions/profilesettings.php:106
 #: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
 #: lib/groupeditform.php:152 lib/userprofile.php:131
 msgid "Nickname"
 msgstr "暱稱"
 
-#: actions/login.php:252 actions/register.php:428
+#: actions/login.php:253 actions/register.php:428
 #: lib/accountsettingsaction.php:116
 msgid "Password"
 msgstr ""
 
-#: actions/login.php:255 actions/register.php:477
+#: actions/login.php:256 actions/register.php:477
 msgid "Remember me"
 msgstr ""
 
-#: actions/login.php:256 actions/register.php:479
+#: actions/login.php:257 actions/register.php:479
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "未來在同一部電腦自動登入"
 
-#: actions/login.php:266
+#: actions/login.php:267
 msgid "Lost or forgotten password?"
 msgstr "遺失或忘記密碼了嗎？"
 
-#: actions/login.php:285
+#: actions/login.php:286
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 msgstr "為安全起見，請先重新輸入你的使用者名稱與密碼再更改設定。"
 
-#: actions/login.php:289
+#: actions/login.php:290
 #, php-format
 msgid ""
 "Login with your username and password. Don't have a username yet? [Register]"
@@ -1899,7 +1899,7 @@ msgstr ""
 msgid "Direct message to %s sent"
 msgstr ""
 
-#: actions/newmessage.php:210 actions/newnotice.php:240 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:242 lib/channel.php:170
 msgid "Ajax Error"
 msgstr ""
 
@@ -1907,7 +1907,7 @@ msgstr ""
 msgid "New notice"
 msgstr "新訊息"
 
-#: actions/newnotice.php:206
+#: actions/newnotice.php:208
 msgid "Notice posted"
 msgstr ""
 
@@ -1982,8 +1982,8 @@ msgstr "連結"
 msgid "Only "
 msgstr ""
 
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:996
-#: lib/api.php:1024 lib/api.php:1134
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011
+#: lib/api.php:1039 lib/api.php:1149
 msgid "Not a supported data format."
 msgstr ""
 
@@ -3487,6 +3487,26 @@ msgstr "查無此Jabber ID"
 msgid "SMS"
 msgstr ""
 
+#: actions/tag.php:68
+#, fuzzy, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr "&s的微型部落格"
+
+#: actions/tag.php:86
+#, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr ""
+
+#: actions/tag.php:92
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "發送給%s好友的訂閱"
+
+#: actions/tag.php:98
+#, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr ""
+
 #: actions/tagother.php:33
 #, fuzzy
 msgid "Not logged in"
@@ -3535,26 +3555,6 @@ msgstr "無法存取個人圖像資料"
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 
-#: actions/tag.php:68
-#, fuzzy, php-format
-msgid "Notices tagged with %s, page %d"
-msgstr "&s的微型部落格"
-
-#: actions/tag.php:86
-#, php-format
-msgid "Notice feed for tag %s (RSS 1.0)"
-msgstr ""
-
-#: actions/tag.php:92
-#, fuzzy, php-format
-msgid "Notice feed for tag %s (RSS 2.0)"
-msgstr "發送給%s好友的訂閱"
-
-#: actions/tag.php:98
-#, php-format
-msgid "Notice feed for tag %s (Atom)"
-msgstr ""
-
 #: actions/tagrss.php:35
 #, fuzzy
 msgid "No such tag."
@@ -3850,40 +3850,45 @@ msgstr ""
 msgid "DB error inserting hashtag: %s"
 msgstr ""
 
-#: classes/Notice.php:179
+#: classes/Notice.php:188
 #, fuzzy
 msgid "Problem saving notice. Too long."
 msgstr "儲存使用者發生錯誤"
 
-#: classes/Notice.php:183
+#: classes/Notice.php:192
 #, fuzzy
 msgid "Problem saving notice. Unknown user."
 msgstr "儲存使用者發生錯誤"
 
-#: classes/Notice.php:188
+#: classes/Notice.php:197
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
-#: classes/Notice.php:194
+#: classes/Notice.php:203
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
 msgstr ""
 
-#: classes/Notice.php:200
+#: classes/Notice.php:209
 msgid "You are banned from posting notices on this site."
 msgstr ""
 
-#: classes/Notice.php:265 classes/Notice.php:290
+#: classes/Notice.php:274 classes/Notice.php:299
 msgid "Problem saving notice."
 msgstr ""
 
-#: classes/Notice.php:1124
+#: classes/Notice.php:1115
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "增加回覆時,資料庫發生錯誤: %s"
 
+#: classes/User.php:347
+#, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr ""
+
 #: classes/User_group.php:380
 #, fuzzy
 msgid "Could not create group."
@@ -3894,11 +3899,6 @@ msgstr "無法存取個人圖像資料"
 msgid "Could not set group membership."
 msgstr "註冊失敗"
 
-#: classes/User.php:347
-#, php-format
-msgid "Welcome to %1$s, @%2$s!"
-msgstr ""
-
 #: lib/accountsettingsaction.php:108
 msgid "Change your profile settings"
 msgstr ""
@@ -4210,7 +4210,7 @@ msgstr ""
 msgid "Notice with that id does not exist"
 msgstr ""
 
-#: lib/command.php:168 lib/command.php:416 lib/command.php:471
+#: lib/command.php:168 lib/command.php:416 lib/command.php:472
 msgid "User has no last notice"
 msgstr ""
 
@@ -4257,98 +4257,98 @@ msgstr ""
 msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr ""
 
-#: lib/command.php:439
+#: lib/command.php:440
 #, php-format
 msgid "Reply to %s sent"
 msgstr ""
 
-#: lib/command.php:441
+#: lib/command.php:442
 msgid "Error saving notice."
 msgstr "儲存使用者發生錯誤"
 
-#: lib/command.php:495
+#: lib/command.php:496
 msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: lib/command.php:502
+#: lib/command.php:503
 #, php-format
 msgid "Subscribed to %s"
 msgstr ""
 
-#: lib/command.php:523
+#: lib/command.php:524
 msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: lib/command.php:530
+#: lib/command.php:531
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr ""
 
-#: lib/command.php:548 lib/command.php:571
+#: lib/command.php:549 lib/command.php:572
 msgid "Command not yet implemented."
 msgstr ""
 
-#: lib/command.php:551
+#: lib/command.php:552
 msgid "Notification off."
 msgstr ""
 
-#: lib/command.php:553
+#: lib/command.php:554
 msgid "Can't turn off notification."
 msgstr ""
 
-#: lib/command.php:574
+#: lib/command.php:575
 msgid "Notification on."
 msgstr ""
 
-#: lib/command.php:576
+#: lib/command.php:577
 msgid "Can't turn on notification."
 msgstr ""
 
-#: lib/command.php:588
+#: lib/command.php:590
 msgid "Login command is disabled"
 msgstr ""
 
-#: lib/command.php:602
+#: lib/command.php:604
 #, fuzzy, php-format
 msgid "Could not create login token for %s"
 msgstr "無法存取個人圖像資料"
 
-#: lib/command.php:607
+#: lib/command.php:609
 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:623
+#: lib/command.php:625
 #, fuzzy
 msgid "You are not subscribed to anyone."
 msgstr "此帳號已註冊"
 
-#: lib/command.php:625
+#: lib/command.php:627
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "此帳號已註冊"
 
-#: lib/command.php:645
+#: lib/command.php:647
 #, fuzzy
 msgid "No one is subscribed to you."
 msgstr "無此訂閱"
 
-#: lib/command.php:647
+#: lib/command.php:649
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "無此訂閱"
 
-#: lib/command.php:667
+#: lib/command.php:669
 #, fuzzy
 msgid "You are not a member of any groups."
 msgstr "無法連結到伺服器:%s"
 
-#: lib/command.php:669
+#: lib/command.php:671
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "無法連結到伺服器:%s"
 
-#: lib/command.php:683
+#: lib/command.php:685
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -4447,10 +4447,6 @@ msgstr "無此通知"
 msgid "Favor"
 msgstr ""
 
-#: lib/feedlist.php:64
-msgid "Export data"
-msgstr ""
-
 #: lib/feed.php:85
 msgid "RSS 1.0"
 msgstr ""
@@ -4467,6 +4463,10 @@ msgstr ""
 msgid "FOAF"
 msgstr ""
 
+#: lib/feedlist.php:64
+msgid "Export data"
+msgstr ""
+
 #: lib/galleryaction.php:121
 msgid "Filter tags"
 msgstr ""
@@ -4633,20 +4633,6 @@ msgstr "使用者名稱或密碼無效"
 msgid "Sign up for a new account"
 msgstr "新增帳號"
 
-#: lib/mailbox.php:89
-msgid "Only the user can read their own mailboxes."
-msgstr ""
-
-#: lib/mailbox.php:139
-msgid ""
-"You have no private messages. You can send private message to engage other "
-"users in conversation. People can send you messages for your eyes only."
-msgstr ""
-
-#: lib/mailbox.php:227 lib/noticelist.php:452
-msgid "from"
-msgstr ""
-
 #: lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "確認信箱"
@@ -4830,6 +4816,20 @@ msgid ""
 "\n"
 msgstr ""
 
+#: lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
+msgstr ""
+
+#: lib/mailbox.php:139
+msgid ""
+"You have no private messages. You can send private message to engage other "
+"users in conversation. People can send you messages for your eyes only."
+msgstr ""
+
+#: lib/mailbox.php:227 lib/noticelist.php:452
+msgid "from"
+msgstr ""
+
 #: lib/mediafile.php:98 lib/mediafile.php:123
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
@@ -4891,7 +4891,7 @@ msgstr ""
 msgid "To"
 msgstr ""
 
-#: lib/messageform.php:161 lib/noticeform.php:185
+#: lib/messageform.php:159 lib/noticeform.php:183
 #, fuzzy
 msgid "Available characters"
 msgstr "6個以上字元"
@@ -4906,11 +4906,11 @@ msgstr "新訊息"
 msgid "What's up, %s?"
 msgstr ""
 
-#: lib/noticeform.php:192
+#: lib/noticeform.php:190
 msgid "Attach"
 msgstr ""
 
-#: lib/noticeform.php:196
+#: lib/noticeform.php:194
 msgid "Attach a file"
 msgstr ""
 
@@ -4981,11 +4981,11 @@ msgstr "新增外部個人資料發生錯誤(Error inserting remote profile)"
 msgid "Duplicate notice"
 msgstr "新訊息"
 
-#: lib/oauthstore.php:467 lib/subs.php:48
+#: lib/oauthstore.php:466 lib/subs.php:48
 msgid "You have been banned from subscribing."
 msgstr ""
 
-#: lib/oauthstore.php:492
+#: lib/oauthstore.php:491
 msgid "Couldn't insert new subscription."
 msgstr "無法新增訂閱"
 
@@ -5150,20 +5150,6 @@ msgstr "此帳號已註冊"
 msgid "Groups %s is a member of"
 msgstr ""
 
-#: lib/subscriberspeopleselftagcloudsection.php:48
-#: lib/subscriptionspeopleselftagcloudsection.php:48
-msgid "People Tagcloud as self-tagged"
-msgstr ""
-
-#: lib/subscriberspeopletagcloudsection.php:48
-#: lib/subscriptionspeopletagcloudsection.php:48
-msgid "People Tagcloud as tagged"
-msgstr ""
-
-#: lib/subscriptionlist.php:126
-msgid "(none)"
-msgstr ""
-
 #: lib/subs.php:52
 msgid "Already subscribed!"
 msgstr ""
@@ -5194,6 +5180,20 @@ msgstr "無法刪除帳號"
 msgid "Couldn't delete subscription."
 msgstr "無法刪除帳號"
 
+#: lib/subscriberspeopleselftagcloudsection.php:48
+#: lib/subscriptionspeopleselftagcloudsection.php:48
+msgid "People Tagcloud as self-tagged"
+msgstr ""
+
+#: lib/subscriberspeopletagcloudsection.php:48
+#: lib/subscriptionspeopletagcloudsection.php:48
+msgid "People Tagcloud as tagged"
+msgstr ""
+
+#: lib/subscriptionlist.php:126
+msgid "(none)"
+msgstr ""
+
 #: lib/tagcloudsection.php:56
 msgid "None"
 msgstr ""

From 78a649ca0af3ffbf1fd23d5ae9e84def7befa79e Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Sat, 12 Dec 2009 18:21:57 +0100
Subject: [PATCH 54/62] Localisation updates for !StatusNet from
 !translatewiki.net !sntrans * add Egyptian Spoken Arabic (arz)

---
 lib/language.php                    |    1 +
 locale/arz/LC_MESSAGES/statusnet.po | 5214 +++++++++++++++++++++++++++
 2 files changed, 5215 insertions(+)
 create mode 100644 locale/arz/LC_MESSAGES/statusnet.po

diff --git a/lib/language.php b/lib/language.php
index 916cee7ed4..c037d30c3e 100644
--- a/lib/language.php
+++ b/lib/language.php
@@ -272,6 +272,7 @@ function get_nice_language_list()
 function get_all_languages() {
     return array(
         'ar'      => array('q' => 0.8, 'lang' => 'ar', 'name' => 'Arabic', 'direction' => 'rtl'),
+        'arz'     => array('q' => 0.8, 'lang' => 'arz', 'name' => 'Egyptian Spoken Arabic', 'direction' => 'rtl'),
         'bg'      => array('q' => 0.8, 'lang' => 'bg', 'name' => 'Bulgarian', 'direction' => 'ltr'),
         'ca'      => array('q' => 0.5, 'lang' => 'ca', 'name' => 'Catalan', 'direction' => 'ltr'),
         'cs'      => array('q' => 0.5, 'lang' => 'cs', 'name' => 'Czech', 'direction' => 'ltr'),
diff --git a/locale/arz/LC_MESSAGES/statusnet.po b/locale/arz/LC_MESSAGES/statusnet.po
new file mode 100644
index 0000000000..6a2ccdf617
--- /dev/null
+++ b/locale/arz/LC_MESSAGES/statusnet.po
@@ -0,0 +1,5214 @@
+# Translation of StatusNet to Egyptian Spoken Arabic
+#
+# Author@translatewiki.net: Meno25
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-12-12 17:09+0000\n"
+"PO-Revision-Date: 2009-12-12 17:09:12+0000\n"
+"Language-Team: Arabic\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: MediaWiki 1.16alpha (r59992); Translate extension (2009-12-06)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: arz\n"
+"X-Message-Group: out-statusnet\n"
+"Plural-Forms: nplurals=6; plural= n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
+"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+
+#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
+#: actions/showfavorites.php:137 actions/tag.php:51
+msgid "No such page"
+msgstr "لا صفحه كهذه"
+
+#: actions/all.php:74 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofile.php:105
+#: actions/apiaccountupdateprofilebackgroundimage.php:116
+#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
+#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
+#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74
+#: actions/foaf.php:40 actions/foaf.php:58 actions/microsummary.php:62
+#: actions/newmessage.php:116 actions/remotesubscribe.php:145
+#: actions/remotesubscribe.php:154 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/showfavorites.php:105
+#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38
+#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
+#: lib/command.php:364 lib/command.php:411 lib/command.php:467
+#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
+#: lib/subs.php:34 lib/subs.php:116
+msgid "No such user."
+msgstr "لا مستخدم كهذا."
+
+#: actions/all.php:84
+#, php-format
+msgid "%s and friends, page %d"
+msgstr ""
+
+#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
+#: actions/apitimelinefriends.php:115 lib/personalgroupnav.php:100
+#, php-format
+msgid "%s and friends"
+msgstr "%s والأصدقاء"
+
+#: actions/all.php:99
+#, php-format
+msgid "Feed for friends of %s (RSS 1.0)"
+msgstr ""
+
+#: actions/all.php:107
+#, php-format
+msgid "Feed for friends of %s (RSS 2.0)"
+msgstr ""
+
+#: actions/all.php:115
+#, php-format
+msgid "Feed for friends of %s (Atom)"
+msgstr ""
+
+#: 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:132
+#, php-format
+msgid ""
+"Try subscribing to more people, [join a group](%%action.groups%%) or post "
+"something yourself."
+msgstr ""
+
+#: 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:137 actions/replies.php:209 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/all.php:165
+msgid "You and friends"
+msgstr "أنت والأصدقاء"
+
+#: actions/allrss.php:119 actions/apitimelinefriends.php:122
+#, php-format
+msgid "Updates from %1$s and friends on %2$s!"
+msgstr ""
+
+#: actions/apiaccountratelimitstatus.php:70
+#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofile.php:97
+#: actions/apiaccountupdateprofilebackgroundimage.php:94
+#: actions/apiaccountupdateprofilecolors.php:118
+#, fuzzy
+msgid "API method not found."
+msgstr "لم يوجد رمز التأكيد."
+
+#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofile.php:89
+#: actions/apiaccountupdateprofilebackgroundimage.php:86
+#: actions/apiaccountupdateprofilecolors.php:110
+#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
+#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php: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:114
+msgid "This method requires a POST."
+msgstr "تتطلب هذه الطريقه POST."
+
+#: actions/apiaccountupdatedeliverydevice.php:105
+msgid ""
+"You must specify a parameter named 'device' with a value of one of: sms, im, "
+"none"
+msgstr ""
+
+#: actions/apiaccountupdatedeliverydevice.php:132
+msgid "Could not update user."
+msgstr "تعذّر تحديث المستخدم."
+
+#: actions/apiaccountupdateprofile.php:112
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+msgid "User has no profile."
+msgstr "ليس للمستخدم ملف شخصى."
+
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "تعذّر حفظ الملف الشخصى."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:108
+#: actions/apiaccountupdateprofileimage.php:97
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257
+#: actions/designadminpanel.php:122 actions/newnotice.php:94
+#: lib/designsettings.php:283
+#, php-format
+msgid ""
+"The server was unable to handle that much POST data (%s bytes) due to its "
+"current configuration."
+msgstr ""
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:136
+#: actions/apiaccountupdateprofilebackgroundimage.php:146
+#: actions/apiaccountupdateprofilecolors.php:164
+#: actions/apiaccountupdateprofilecolors.php:174
+msgid "Unable to save your design settings."
+msgstr ""
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:187
+#: actions/apiaccountupdateprofilecolors.php:142
+msgid "Could not update your design."
+msgstr "تعذّر تحديث تصميمك."
+
+#: actions/apiblockcreate.php:105
+#, fuzzy
+msgid "You cannot block yourself!"
+msgstr "لا يمكنك حذف المستخدمين."
+
+#: actions/apiblockcreate.php:119
+msgid "Block user failed."
+msgstr "فشل منع المستخدم."
+
+#: actions/apiblockdestroy.php:107
+msgid "Unblock user failed."
+msgstr "فشل إلغاء منع المستخدم."
+
+#: actions/apidirectmessage.php:89
+#, php-format
+msgid "Direct messages from %s"
+msgstr "رسائل مباشره من %s"
+
+#: actions/apidirectmessage.php:93
+#, php-format
+msgid "All the direct messages sent from %s"
+msgstr ""
+
+#: actions/apidirectmessage.php:101
+#, php-format
+msgid "Direct messages to %s"
+msgstr "رساله مباشره %s"
+
+#: actions/apidirectmessage.php:105
+#, php-format
+msgid "All the direct messages sent to %s"
+msgstr ""
+
+#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
+#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
+#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
+#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
+#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
+#: actions/apigroupmembership.php:106 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:146 actions/apitimelinefriends.php:156
+#: actions/apitimelinegroup.php:150 actions/apitimelinementions.php:151
+#: actions/apitimelinepublic.php:131 actions/apitimelinetag.php:141
+#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
+msgid "API method not found!"
+msgstr ""
+
+#: actions/apidirectmessagenew.php:126
+msgid "No message text!"
+msgstr "لا نص فى الرسالة!"
+
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr ""
+
+#: actions/apidirectmessagenew.php:146
+msgid "Recipient user not found."
+msgstr "لم يُعثر على المستخدم المستلم."
+
+#: actions/apidirectmessagenew.php:150
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr ""
+
+#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
+#: actions/apistatusesdestroy.php:113
+msgid "No status found with that ID."
+msgstr ""
+
+#: actions/apifavoritecreate.php:119
+msgid "This status is already a favorite!"
+msgstr ""
+
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176
+msgid "Could not create favorite."
+msgstr "تعذّر إنشاء مفضله."
+
+#: actions/apifavoritedestroy.php:122
+msgid "That status is not a favorite!"
+msgstr "تلك الحاله ليست مفضلة!"
+
+#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
+msgid "Could not delete favorite."
+msgstr "تعذّر حذف المفضله."
+
+#: actions/apifriendshipscreate.php:109
+msgid "Could not follow user: User not found."
+msgstr ""
+
+#: actions/apifriendshipscreate.php:118
+#, php-format
+msgid "Could not follow user: %s is already on your list."
+msgstr ""
+
+#: actions/apifriendshipsdestroy.php:109
+msgid "Could not unfollow user: User not found."
+msgstr ""
+
+#: actions/apifriendshipsdestroy.php:120
+msgid "You cannot unfollow yourself!"
+msgstr ""
+
+#: actions/apifriendshipsexists.php:94
+msgid "Two user ids or screen_names must be supplied."
+msgstr ""
+
+#: actions/apifriendshipsshow.php:135
+msgid "Could not determine source user."
+msgstr ""
+
+#: actions/apifriendshipsshow.php:143
+msgid "Could not find target user."
+msgstr "تعذّر إيجاد المستخدم الهدف."
+
+#: actions/apigroupcreate.php:164 actions/editgroup.php:182
+#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/register.php:205
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr ""
+
+#: actions/apigroupcreate.php:173 actions/editgroup.php:186
+#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/register.php:208
+msgid "Nickname already in use. Try another one."
+msgstr ""
+
+#: actions/apigroupcreate.php:180 actions/editgroup.php:189
+#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/register.php:210
+msgid "Not a valid nickname."
+msgstr "ليس اسمًا مستعارًا صحيحًا."
+
+#: actions/apigroupcreate.php:196 actions/editgroup.php:195
+#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/register.php:217
+msgid "Homepage is not a valid URL."
+msgstr "الصفحه الرئيسيه ليست عنونًا صالحًا."
+
+#: actions/apigroupcreate.php:205 actions/editgroup.php:198
+#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/register.php:220
+msgid "Full name is too long (max 255 chars)."
+msgstr "الاسم الكامل طويل جدا (الأقصى 255 حرفًا)"
+
+#: actions/apigroupcreate.php:213
+#, php-format
+msgid "Description is too long (max %d chars)."
+msgstr ""
+
+#: actions/apigroupcreate.php:224 actions/editgroup.php:204
+#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/register.php:227
+msgid "Location is too long (max 255 chars)."
+msgstr ""
+
+#: actions/apigroupcreate.php:243 actions/editgroup.php:215
+#: actions/newgroup.php:159
+#, php-format
+msgid "Too many aliases! Maximum %d."
+msgstr ""
+
+#: actions/apigroupcreate.php:264 actions/editgroup.php:224
+#: actions/newgroup.php:168
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "كنيه غير صالحة: \"%s\""
+
+#: actions/apigroupcreate.php:273 actions/editgroup.php:228
+#: actions/newgroup.php:172
+#, php-format
+msgid "Alias \"%s\" already in use. Try another one."
+msgstr ""
+
+#: actions/apigroupcreate.php:286 actions/editgroup.php:234
+#: actions/newgroup.php:178
+msgid "Alias can't be the same as nickname."
+msgstr ""
+
+#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
+#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
+#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
+msgid "Group not found!"
+msgstr "لم توجد المجموعة!"
+
+#: actions/apigroupjoin.php:110
+msgid "You are already a member of that group."
+msgstr ""
+
+#: 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/apigroupjoin.php:138
+#, php-format
+msgid "Could not join user %s to group %s."
+msgstr ""
+
+#: actions/apigroupleave.php:114
+msgid "You are not a member of this group."
+msgstr ""
+
+#: actions/apigroupleave.php:124
+#, php-format
+msgid "Could not remove user %s to group %s."
+msgstr ""
+
+#: actions/apigrouplist.php:95
+#, php-format
+msgid "%s's groups"
+msgstr "مجموعات %s"
+
+#: actions/apigrouplist.php:103
+#, php-format
+msgid "Groups %s is a member of on %s."
+msgstr ""
+
+#: actions/apigrouplistall.php:90 actions/usergroups.php:62
+#, php-format
+msgid "%s groups"
+msgstr "مجموعات %s"
+
+#: actions/apigrouplistall.php:94
+#, php-format
+msgid "groups on %s"
+msgstr "مجموعات %s"
+
+#: actions/apistatusesdestroy.php:107
+msgid "This method requires a POST or DELETE."
+msgstr ""
+
+#: actions/apistatusesdestroy.php:130
+msgid "You may not delete another user's status."
+msgstr ""
+
+#: actions/apistatusesshow.php:138
+msgid "Status deleted."
+msgstr "حُذِفت الحاله."
+
+#: actions/apistatusesshow.php:144
+msgid "No status with that ID found."
+msgstr ""
+
+#: actions/apistatusesupdate.php:157 actions/newnotice.php:155
+#: scripts/maildaemon.php:71
+#, php-format
+msgid "That's too long. Max notice size is %d chars."
+msgstr ""
+
+#: actions/apistatusesupdate.php:198
+msgid "Not found"
+msgstr "لم يوجد"
+
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:183
+#, 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/apitimelinefavorites.php:108
+#, php-format
+msgid "%s / Favorites from %s"
+msgstr ""
+
+#: actions/apitimelinefavorites.php:120
+#, php-format
+msgid "%s updates favorited by %s / %s."
+msgstr ""
+
+#: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118
+#: actions/grouprss.php:131 actions/userrss.php:90
+#, php-format
+msgid "%s timeline"
+msgstr "مسار %s الزمني"
+
+#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
+#: actions/userrss.php:92
+#, php-format
+msgid "Updates from %1$s on %2$s!"
+msgstr ""
+
+#: actions/apitimelinementions.php:117
+#, php-format
+msgid "%1$s / Updates mentioning %2$s"
+msgstr ""
+
+#: actions/apitimelinementions.php:127
+#, php-format
+msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgstr ""
+
+#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#, php-format
+msgid "%s public timeline"
+msgstr "مسار %s الزمنى العام"
+
+#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#, php-format
+msgid "%s updates from everyone!"
+msgstr ""
+
+#: actions/apitimelinetag.php:102 actions/tag.php:66
+#, php-format
+msgid "Notices tagged with %s"
+msgstr "الإشعارات الموسومه ب%s"
+
+#: actions/apitimelinetag.php:108 actions/tagrss.php:64
+#, php-format
+msgid "Updates tagged with %1$s on %2$s!"
+msgstr ""
+
+#: actions/apiusershow.php:96
+msgid "Not found."
+msgstr "لم يوجد."
+
+#: actions/attachment.php:73
+msgid "No such attachment."
+msgstr "لا مرفق كهذا."
+
+#: actions/avatarbynickname.php:59 actions/leavegroup.php:76
+msgid "No nickname."
+msgstr "لا اسم مستعار."
+
+#: actions/avatarbynickname.php:64
+msgid "No size."
+msgstr "لا حجم."
+
+#: actions/avatarbynickname.php:69
+msgid "Invalid size."
+msgstr "حجم غير صالح."
+
+#: actions/avatarsettings.php:67 actions/showgroup.php:221
+#: lib/accountsettingsaction.php:112
+msgid "Avatar"
+msgstr "أفتار"
+
+#: actions/avatarsettings.php:78
+#, php-format
+msgid "You can upload your personal avatar. The maximum file size is %s."
+msgstr ""
+
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:185
+#: actions/grouplogo.php:178 actions/remotesubscribe.php:191
+#: actions/userauthorization.php:72 actions/userrss.php:103
+msgid "User without matching profile"
+msgstr ""
+
+#: actions/avatarsettings.php:119 actions/avatarsettings.php:197
+#: actions/grouplogo.php:251
+msgid "Avatar settings"
+msgstr "إعدادات الأفتار"
+
+#: actions/avatarsettings.php:127 actions/avatarsettings.php:205
+#: actions/grouplogo.php:199 actions/grouplogo.php:259
+msgid "Original"
+msgstr "الأصلي"
+
+#: actions/avatarsettings.php:142 actions/avatarsettings.php:217
+#: actions/grouplogo.php:210 actions/grouplogo.php:271
+msgid "Preview"
+msgstr "عاين"
+
+#: actions/avatarsettings.php:149 lib/deleteuserform.php:66
+#: lib/noticelist.php:550
+msgid "Delete"
+msgstr "احذف"
+
+#: actions/avatarsettings.php:166 actions/grouplogo.php:233
+msgid "Upload"
+msgstr "ارفع"
+
+#: actions/avatarsettings.php:231 actions/grouplogo.php:286
+msgid "Crop"
+msgstr ""
+
+#: actions/avatarsettings.php:268 actions/disfavor.php:74
+#: actions/emailsettings.php:238 actions/favor.php:75
+#: actions/groupblock.php:66 actions/grouplogo.php:309
+#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
+#: actions/tagother.php:166 actions/unsubscribe.php:69
+#: actions/userauthorization.php:52 lib/designsettings.php:294
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+#: actions/avatarsettings.php:281 actions/designadminpanel.php:103
+#: actions/emailsettings.php:256 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/recoverpassword.php:44
+#: actions/smssettings.php:248 lib/designsettings.php:304
+msgid "Unexpected form submission."
+msgstr ""
+
+#: actions/avatarsettings.php:328
+msgid "Pick a square area of the image to be your avatar"
+msgstr ""
+
+#: actions/avatarsettings.php:343 actions/grouplogo.php:377
+msgid "Lost our file data."
+msgstr ""
+
+#: actions/avatarsettings.php:366
+msgid "Avatar updated."
+msgstr "رُفع الأفتار."
+
+#: actions/avatarsettings.php:369
+msgid "Failed updating avatar."
+msgstr "فشل تحديث الأفتار."
+
+#: actions/avatarsettings.php:393
+msgid "Avatar deleted."
+msgstr "حُذف الأفتار."
+
+#: actions/block.php:69
+msgid "You already blocked that user."
+msgstr "لقد منعت مسبقا هذا المستخدم."
+
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
+msgid "Block user"
+msgstr "امنع المستخدم"
+
+#: actions/block.php:130
+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/block.php:143 actions/deletenotice.php:145
+#: actions/deleteuser.php:147 actions/groupblock.php:178
+msgid "No"
+msgstr "لا"
+
+#: actions/block.php:143 actions/deleteuser.php:147
+msgid "Do not block this user"
+msgstr "لا تمنع هذا المستخدم"
+
+#: actions/block.php:144 actions/deletenotice.php:146
+#: actions/deleteuser.php:148 actions/groupblock.php:179
+msgid "Yes"
+msgstr "نعم"
+
+#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
+msgid "Block this user"
+msgstr "امنع هذا المستخدم"
+
+#: actions/block.php:162
+msgid "Failed to save block information."
+msgstr "فشل حفظ معلومات المنع."
+
+#: actions/blockedfromgroup.php:73 actions/editgroup.php:84
+#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
+#: actions/groupmembers.php:76 actions/grouprss.php:91
+#: actions/joingroup.php:76 actions/showgroup.php:121
+msgid "No nickname"
+msgstr "لا اسم مستعار"
+
+#: actions/blockedfromgroup.php:80 actions/editgroup.php:96
+#: actions/groupbyid.php:83 actions/groupdesignsettings.php:97
+#: actions/grouplogo.php:99 actions/groupmembers.php:83
+#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
+msgid "No such group"
+msgstr "لا مجموعه كهذه"
+
+#: actions/blockedfromgroup.php:90
+#, php-format
+msgid "%s blocked profiles"
+msgstr ""
+
+#: actions/blockedfromgroup.php:93
+#, php-format
+msgid "%s blocked profiles, page %d"
+msgstr ""
+
+#: actions/blockedfromgroup.php:108
+msgid "A list of the users blocked from joining this group."
+msgstr ""
+
+#: actions/blockedfromgroup.php:281
+msgid "Unblock user from group"
+msgstr "ألغ منع المستخدم من المجموعة"
+
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:69
+msgid "Unblock"
+msgstr "ألغِ المنع"
+
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:80
+msgid "Unblock this user"
+msgstr "ألغِ منع هذا المستخدم"
+
+#: actions/bookmarklet.php:50
+msgid "Post to "
+msgstr ""
+
+#: actions/confirmaddress.php:75
+msgid "No confirmation code."
+msgstr "لا رمز تأكيد."
+
+#: actions/confirmaddress.php:80
+msgid "Confirmation code not found."
+msgstr "لم يوجد رمز التأكيد."
+
+#: actions/confirmaddress.php:85
+msgid "That confirmation code is not for you!"
+msgstr "رمز التأكيد ليس لك!"
+
+#: actions/confirmaddress.php:90
+#, php-format
+msgid "Unrecognized address type %s"
+msgstr ""
+
+#: actions/confirmaddress.php:94
+msgid "That address has already been confirmed."
+msgstr ""
+
+#: actions/confirmaddress.php:114 actions/emailsettings.php:296
+#: actions/emailsettings.php:427 actions/imsettings.php:258
+#: actions/imsettings.php:401 actions/othersettings.php:174
+#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/smssettings.php:420
+msgid "Couldn't update user."
+msgstr "تعذّر تحديث المستخدم."
+
+#: actions/confirmaddress.php:126 actions/emailsettings.php:391
+#: actions/imsettings.php:363 actions/smssettings.php:382
+msgid "Couldn't delete email confirmation."
+msgstr "تعذّر حذف تأكيد البريد الإلكترونى."
+
+#: actions/confirmaddress.php:144
+msgid "Confirm Address"
+msgstr "عنوان التأكيد"
+
+#: actions/confirmaddress.php:159
+#, php-format
+msgid "The address \"%s\" has been confirmed for your account."
+msgstr ""
+
+#: actions/conversation.php:99
+msgid "Conversation"
+msgstr "محادثة"
+
+#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
+#: lib/profileaction.php:216 lib/searchgroupnav.php:82
+msgid "Notices"
+msgstr "الإشعارات"
+
+#: actions/deletenotice.php:52 actions/shownotice.php:92
+msgid "No such notice."
+msgstr "لا إشعار كهذا."
+
+#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
+#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
+#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/unsubscribe.php:52 lib/adminpanelaction.php:72
+#: lib/profileformaction.php:63 lib/settingsaction.php:72
+msgid "Not logged in."
+msgstr "لست والجًا."
+
+#: actions/deletenotice.php:71
+msgid "Can't delete this notice."
+msgstr "تعذّر حذف هذا الإشعار."
+
+#: 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:109 actions/deletenotice.php:141
+msgid "Delete notice"
+msgstr "احذف الإشعار"
+
+#: actions/deletenotice.php:144
+msgid "Are you sure you want to delete this notice?"
+msgstr "أمتأكد من أنك تريد حذف هذا الإشعار؟"
+
+#: actions/deletenotice.php:145
+msgid "Do not delete this notice"
+msgstr "لا تحذف هذا الإشعار"
+
+#: actions/deletenotice.php:146 lib/noticelist.php:550
+msgid "Delete this notice"
+msgstr "احذف هذا الإشعار"
+
+#: actions/deletenotice.php:157
+msgid "There was a problem with your session token.  Try again, please."
+msgstr ""
+
+#: actions/deleteuser.php:67
+msgid "You cannot delete users."
+msgstr "لا يمكنك حذف المستخدمين."
+
+#: actions/deleteuser.php:74
+msgid "You can only delete local users."
+msgstr "يمكنك حذف المستخدمين المحليين فقط."
+
+#: actions/deleteuser.php:110 actions/deleteuser.php:133
+msgid "Delete user"
+msgstr "احذف المستخدم"
+
+#: actions/deleteuser.php:135
+msgid ""
+"Are you sure you want to delete this user? This will clear all data about "
+"the user from the database, without a backup."
+msgstr ""
+
+#: actions/deleteuser.php:148 lib/deleteuserform.php:77
+msgid "Delete this user"
+msgstr "احذف هذا المستخدم"
+
+#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
+#: lib/adminpanelaction.php:302 lib/groupnav.php:119
+msgid "Design"
+msgstr "التصميم"
+
+#: actions/designadminpanel.php:73
+msgid "Design settings for this StatusNet site."
+msgstr ""
+
+#: actions/designadminpanel.php:275
+msgid "Invalid logo URL."
+msgstr "مسار شعار غير صالح."
+
+#: actions/designadminpanel.php:279
+#, php-format
+msgid "Theme not available: %s"
+msgstr "السمه غير متوفرة: %s"
+
+#: actions/designadminpanel.php:375
+msgid "Change logo"
+msgstr "غيّر الشعار"
+
+#: actions/designadminpanel.php:380
+msgid "Site logo"
+msgstr "شعار الموقع"
+
+#: actions/designadminpanel.php:387
+msgid "Change theme"
+msgstr "غيّر السمة"
+
+#: actions/designadminpanel.php:404
+msgid "Site theme"
+msgstr "سمه الموقع"
+
+#: actions/designadminpanel.php:405
+msgid "Theme for the site."
+msgstr "سمه الموقع."
+
+#: actions/designadminpanel.php:417 lib/designsettings.php:101
+msgid "Change background image"
+msgstr "تغيير صوره الخلفية"
+
+#: actions/designadminpanel.php:422 actions/designadminpanel.php:497
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr "الخلفية"
+
+#: actions/designadminpanel.php:427
+#, php-format
+msgid ""
+"You can upload a background image for the site. The maximum file size is %1"
+"$s."
+msgstr ""
+
+#: actions/designadminpanel.php:457 lib/designsettings.php:139
+msgid "On"
+msgstr "مكّن"
+
+#: actions/designadminpanel.php:473 lib/designsettings.php:155
+msgid "Off"
+msgstr "عطّل"
+
+#: actions/designadminpanel.php:474 lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr "مكّن صوره الخلفيه أو عطّلها."
+
+#: actions/designadminpanel.php:479 lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
+
+#: actions/designadminpanel.php:488 lib/designsettings.php:170
+msgid "Change colours"
+msgstr "تغيير الألوان"
+
+#: actions/designadminpanel.php:510 lib/designsettings.php:191
+msgid "Content"
+msgstr "المحتوى"
+
+#: actions/designadminpanel.php:523 lib/designsettings.php:204
+msgid "Sidebar"
+msgstr "الشريط الجانبي"
+
+#: actions/designadminpanel.php:536 lib/designsettings.php:217
+msgid "Text"
+msgstr "النص"
+
+#: actions/designadminpanel.php:549 lib/designsettings.php:230
+msgid "Links"
+msgstr "وصلات"
+
+#: actions/designadminpanel.php:577 lib/designsettings.php:247
+msgid "Use defaults"
+msgstr "استخدم المبدئيات"
+
+#: actions/designadminpanel.php:578 lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr "استعد التصميمات المبدئية"
+
+#: actions/designadminpanel.php:584 lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr "ارجع إلى المبدئي"
+
+#: actions/designadminpanel.php:586 actions/emailsettings.php:195
+#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/pathsadminpanel.php:296 actions/profilesettings.php:167
+#: actions/siteadminpanel.php:421 actions/smssettings.php:181
+#: actions/subscriptions.php:203 actions/tagother.php:154
+#: actions/useradminpanel.php:313 lib/designsettings.php:256
+#: lib/groupeditform.php:202
+msgid "Save"
+msgstr "أرسل"
+
+#: actions/designadminpanel.php:587 lib/designsettings.php:257
+msgid "Save design"
+msgstr "احفظ التصميم"
+
+#: actions/disfavor.php:81
+msgid "This notice is not a favorite!"
+msgstr "هذا الشعار ليس مفضلًا!"
+
+#: actions/disfavor.php:94
+msgid "Add to favorites"
+msgstr "أضف إلى المفضلات"
+
+#: actions/doc.php:69
+msgid "No such document."
+msgstr "لا مستند كهذا."
+
+#: actions/editgroup.php:56
+#, php-format
+msgid "Edit %s group"
+msgstr "عدّل مجموعه %s"
+
+#: 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: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:154
+msgid "Use this form to edit the group."
+msgstr "استخدم هذا النموذج لتعديل المجموعه."
+
+#: actions/editgroup.php:201 actions/newgroup.php:145
+#, php-format
+msgid "description is too long (max %d chars)."
+msgstr ""
+
+#: actions/editgroup.php:253
+msgid "Could not update group."
+msgstr "تعذر تحديث المجموعه."
+
+#: actions/editgroup.php:259 classes/User_group.php:390
+msgid "Could not create aliases."
+msgstr "تعذّر إنشاء الكنى."
+
+#: actions/editgroup.php:269
+msgid "Options saved."
+msgstr "حُفظت الخيارات."
+
+#: actions/emailsettings.php:60
+msgid "Email Settings"
+msgstr "إعدادات البريد الإلكتروني"
+
+#: actions/emailsettings.php:71
+#, php-format
+msgid "Manage how you get email from %%site.name%%."
+msgstr "أدر كيف تستلم البريد الإلكترونى من %%site.name%%."
+
+#: actions/emailsettings.php:100 actions/imsettings.php:100
+#: actions/smssettings.php:104
+msgid "Address"
+msgstr "العنوان"
+
+#: actions/emailsettings.php:105
+msgid "Current confirmed email address."
+msgstr "عنوان البريد الإلكترونى المُؤكد الحالى."
+
+#: actions/emailsettings.php:107 actions/emailsettings.php:140
+#: actions/imsettings.php:108 actions/smssettings.php:115
+#: actions/smssettings.php:158
+msgid "Remove"
+msgstr "أزل"
+
+#: actions/emailsettings.php:113
+msgid ""
+"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
+"a message with further instructions."
+msgstr ""
+
+#: actions/emailsettings.php:117 actions/imsettings.php:120
+#: actions/smssettings.php:126
+msgid "Cancel"
+msgstr "ألغِ"
+
+#: actions/emailsettings.php:121
+msgid "Email Address"
+msgstr "عنوان البريد الإلكتروني"
+
+#: actions/emailsettings.php:123
+msgid "Email address, like \"UserName@example.org\""
+msgstr "عنوان البريد الإلكترونى، مثل \"UserName@example.org\""
+
+#: actions/emailsettings.php:126 actions/imsettings.php:133
+#: actions/smssettings.php:145
+msgid "Add"
+msgstr "أضف"
+
+#: actions/emailsettings.php:133 actions/smssettings.php:152
+msgid "Incoming email"
+msgstr "البريد الإلكترونى الوارد"
+
+#: actions/emailsettings.php:138 actions/smssettings.php:157
+msgid "Send email to this address to post new notices."
+msgstr "أرسل بريدًا إلكترونيًا إلى هذا العنوان لترسل إشعارات جديده."
+
+#: 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:148 actions/smssettings.php:164
+msgid "New"
+msgstr "جديد"
+
+#: actions/emailsettings.php:153 actions/imsettings.php:139
+#: actions/smssettings.php:169
+msgid "Preferences"
+msgstr "التفضيلات"
+
+#: actions/emailsettings.php:158
+msgid "Send me notices of new subscriptions through email."
+msgstr "أرسل لى إشعارات بالاشتراكات الجديده عبر البريد الإلكترونى."
+
+#: actions/emailsettings.php:163
+msgid "Send me email when someone adds my notice as a favorite."
+msgstr "أرسل لى بريدًا إلكرتونيًا عندما يضيف أحدهم إشعارى مفضله."
+
+#: actions/emailsettings.php:169
+msgid "Send me email when someone sends me a private message."
+msgstr ""
+
+#: actions/emailsettings.php:174
+msgid "Send me email when someone sends me an \"@-reply\"."
+msgstr "أرسل لى بريدًا إلكترونيًا عندما يرسل لى أحدهم \"@-رد\"."
+
+#: actions/emailsettings.php:179
+msgid "Allow friends to nudge me and send me an email."
+msgstr ""
+
+#: actions/emailsettings.php:185
+msgid "I want to post notices by email."
+msgstr "أريد أن أرسل الملاحظات عبر البريد الإلكترونى."
+
+#: actions/emailsettings.php:191
+msgid "Publish a MicroID for my email address."
+msgstr ""
+
+#: actions/emailsettings.php:302 actions/imsettings.php:264
+#: actions/othersettings.php:180 actions/smssettings.php:284
+msgid "Preferences saved."
+msgstr "حُفِظت التفضيلات."
+
+#: actions/emailsettings.php:320
+msgid "No email address."
+msgstr "لا عنوان بريد إلكترونى."
+
+#: actions/emailsettings.php:327
+msgid "Cannot normalize that email address"
+msgstr ""
+
+#: actions/emailsettings.php:331 actions/siteadminpanel.php:158
+msgid "Not a valid email address"
+msgstr "ليس عنوان بريد صالح"
+
+#: actions/emailsettings.php:334
+msgid "That is already your email address."
+msgstr "هذا هو عنوان بريدك الإكترونى سابقًا."
+
+#: actions/emailsettings.php:337
+msgid "That email address already belongs to another user."
+msgstr "هذا البريد الإلكترونى ملك مستخدم آخر بالفعل."
+
+#: actions/emailsettings.php:353 actions/imsettings.php:317
+#: actions/smssettings.php:337
+msgid "Couldn't insert confirmation code."
+msgstr "تعذّر إدراج رمز التأكيد."
+
+#: actions/emailsettings.php:359
+msgid ""
+"A confirmation code was sent to the email address you added. Check your "
+"inbox (and spam box!) for the code and instructions on how to use it."
+msgstr ""
+
+#: actions/emailsettings.php:379 actions/imsettings.php:351
+#: actions/smssettings.php:370
+msgid "No pending confirmation to cancel."
+msgstr ""
+
+#: actions/emailsettings.php:383 actions/imsettings.php:355
+msgid "That is the wrong IM address."
+msgstr "هذا عنوان محادثه فوريه خاطئ."
+
+#: actions/emailsettings.php:395 actions/imsettings.php:367
+#: actions/smssettings.php:386
+msgid "Confirmation cancelled."
+msgstr "أُلغى التأكيد."
+
+#: actions/emailsettings.php:413
+msgid "That is not your email address."
+msgstr "هذا ليس عنوان بريدك الإلكترونى."
+
+#: actions/emailsettings.php:432 actions/imsettings.php:408
+#: actions/smssettings.php:425
+msgid "The address was removed."
+msgstr "أزيل هذا العنوان."
+
+#: actions/emailsettings.php:446 actions/smssettings.php:518
+msgid "No incoming email address."
+msgstr ""
+
+#: actions/emailsettings.php:456 actions/emailsettings.php:478
+#: actions/smssettings.php:528 actions/smssettings.php:552
+msgid "Couldn't update user record."
+msgstr ""
+
+#: actions/emailsettings.php:459 actions/smssettings.php:531
+msgid "Incoming email address removed."
+msgstr ""
+
+#: actions/emailsettings.php:481 actions/smssettings.php:555
+msgid "New incoming email address added."
+msgstr ""
+
+#: actions/favor.php:79
+msgid "This notice is already a favorite!"
+msgstr "هذا الإشعار مفضله مسبقًا!"
+
+#: actions/favor.php:92 lib/disfavorform.php:140
+msgid "Disfavor favorite"
+msgstr "ألغِ تفضيل المفضلة"
+
+#: actions/favorited.php:65 lib/popularnoticesection.php:88
+#: lib/publicgroupnav.php:93
+msgid "Popular notices"
+msgstr "إشعارات مشهورة"
+
+#: actions/favorited.php:67
+#, php-format
+msgid "Popular notices, page %d"
+msgstr "إشعارات مشهوره، الصفحه %d"
+
+#: actions/favorited.php:79
+msgid "The most popular notices on the site right now."
+msgstr "أشهر الإشعارات على الموقع حاليًا."
+
+#: actions/favorited.php:150
+msgid "Favorite notices appear on this page but no one has favorited one yet."
+msgstr ""
+
+#: actions/favorited.php:153
+msgid ""
+"Be the first to add a notice to your favorites by clicking the fave button "
+"next to any notice you like."
+msgstr ""
+
+#: actions/favorited.php:156
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to add a "
+"notice to your favorites!"
+msgstr ""
+
+#: actions/favoritesrss.php:111 actions/showfavorites.php:77
+#: lib/personalgroupnav.php:115
+#, php-format
+msgid "%s's favorite notices"
+msgstr "إشعارات %s المُفضلة"
+
+#: actions/favoritesrss.php:115
+#, php-format
+msgid "Updates favored by %1$s on %2$s!"
+msgstr ""
+
+#: actions/featured.php:69 lib/featureduserssection.php:87
+#: lib/publicgroupnav.php:89
+msgid "Featured users"
+msgstr "مستخدمون مختارون"
+
+#: actions/featured.php:71
+#, php-format
+msgid "Featured users, page %d"
+msgstr "مستخدمون مختارون، صفحه %d"
+
+#: actions/featured.php:99
+#, php-format
+msgid "A selection of some of the great users on %s"
+msgstr "قسم للمستخدمين المتميزين على %s"
+
+#: actions/file.php:34
+msgid "No notice id"
+msgstr "لا هويه إشعار"
+
+#: actions/file.php:38
+msgid "No notice"
+msgstr "لا إشعار"
+
+#: actions/file.php:42
+msgid "No attachments"
+msgstr "لا مرفقات"
+
+#: actions/file.php:51
+msgid "No uploaded attachments"
+msgstr "لا مرفقات مرفوعة"
+
+#: actions/finishremotesubscribe.php:69
+msgid "Not expecting this response!"
+msgstr "لم أتوقع هذا الرد!"
+
+#: actions/finishremotesubscribe.php:80
+msgid "User being listened to does not exist."
+msgstr "المستخدم الذى تستمع إليه غير موجود."
+
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+msgid "You can use the local subscription!"
+msgstr ""
+
+#: actions/finishremotesubscribe.php:99
+msgid "That user has blocked you from subscribing."
+msgstr ""
+
+#: actions/finishremotesubscribe.php:110
+msgid "You are not authorized."
+msgstr "لا تملك تصريحًا."
+
+#: actions/finishremotesubscribe.php:113
+msgid "Could not convert request token to access token."
+msgstr ""
+
+#: actions/finishremotesubscribe.php:118
+msgid "Remote service uses unknown version of OMB protocol."
+msgstr ""
+
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
+msgid "Error updating remote profile"
+msgstr "خطأ أثناء تحديث الملف الشخصى البعيد"
+
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86
+#: actions/groupunblock.php:86 actions/leavegroup.php:83
+#: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263
+msgid "No such group."
+msgstr "لا مجموعه كهذه."
+
+#: actions/getfile.php:75
+msgid "No such file."
+msgstr "لا ملف كهذا."
+
+#: actions/getfile.php:79
+msgid "Cannot read file."
+msgstr "تعذّرت قراءه الملف."
+
+#: actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71 actions/subedit.php:46
+#: lib/profileformaction.php:70
+msgid "No profile specified."
+msgstr "لا ملف شخصى مُحدّد."
+
+#: actions/groupblock.php:76 actions/groupunblock.php:76
+#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
+#: lib/profileformaction.php:77
+msgid "No profile with that ID."
+msgstr "لا ملف شخصى بهذه الهويه."
+
+#: actions/groupblock.php:81 actions/groupunblock.php:81
+#: actions/makeadmin.php:81
+msgid "No group specified."
+msgstr "لا مجموعه مُحدّده."
+
+#: actions/groupblock.php:91
+msgid "Only an admin can block group members."
+msgstr ""
+
+#: actions/groupblock.php:95
+msgid "User is already blocked from group."
+msgstr ""
+
+#: actions/groupblock.php:100
+msgid "User is not a member of group."
+msgstr "المستخدم ليس عضوًا فى المجموعه."
+
+#: actions/groupblock.php:136 actions/groupmembers.php:314
+msgid "Block user from group"
+msgstr "امنع المستخدم من المجموعة"
+
+#: actions/groupblock.php:162
+#, 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:178
+msgid "Do not block this user from this group"
+msgstr "لا تمنع هذا المستخدم من هذه المجموعة"
+
+#: actions/groupblock.php:179
+msgid "Block this user from this group"
+msgstr "امنع هذا المستخدم من هذه المجموعة"
+
+#: actions/groupblock.php:196
+msgid "Database error blocking user from group."
+msgstr "خطأ فى قاعده البيانات أثناء منع المستخدم من المجموعه."
+
+#: actions/groupbyid.php:74
+msgid "No ID"
+msgstr "لا هوية"
+
+#: actions/groupdesignsettings.php:68
+msgid "You must be logged in to edit a group."
+msgstr "يجب أن تلج لتُعدّل المجموعات."
+
+#: actions/groupdesignsettings.php:141
+msgid "Group design"
+msgstr "تصميم المجموعة"
+
+#: 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:263 actions/userdesignsettings.php:186
+#: lib/designsettings.php:391 lib/designsettings.php:413
+msgid "Couldn't update your design."
+msgstr "تعذّر تحديث تصميمك."
+
+#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297
+#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
+#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+msgid "Unable to save your design settings!"
+msgstr ""
+
+#: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231
+msgid "Design preferences saved."
+msgstr ""
+
+#: actions/grouplogo.php:139 actions/grouplogo.php:192
+msgid "Group logo"
+msgstr "شعار المجموعة"
+
+#: 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:362
+msgid "Pick a square area of the image to be the logo."
+msgstr ""
+
+#: actions/grouplogo.php:396
+msgid "Logo updated."
+msgstr "حُدّث الشعار."
+
+#: actions/grouplogo.php:398
+msgid "Failed updating logo."
+msgstr "فشل رفع الشعار."
+
+#: actions/groupmembers.php:93 lib/groupnav.php:92
+#, php-format
+msgid "%s group members"
+msgstr "أعضاء مجموعه %s"
+
+#: 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/groupmembers.php:175 lib/action.php:440 lib/groupnav.php:107
+msgid "Admin"
+msgstr "إداري"
+
+#: actions/groupmembers.php:346 lib/blockform.php:69
+msgid "Block"
+msgstr "امنع"
+
+#: actions/groupmembers.php:441
+msgid "Make user an admin of the group"
+msgstr ""
+
+#: actions/groupmembers.php:473
+msgid "Make Admin"
+msgstr ""
+
+#: actions/groupmembers.php:473
+msgid "Make this user an admin"
+msgstr "اجعل هذا المستخدم إداريًا"
+
+#: actions/grouprss.php:133
+#, php-format
+msgid "Updates from members of %1$s on %2$s!"
+msgstr ""
+
+#: actions/groups.php:62 lib/profileaction.php:210 lib/profileaction.php:230
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+msgid "Groups"
+msgstr "مجموعات"
+
+#: actions/groups.php:64
+#, php-format
+msgid "Groups, page %d"
+msgstr "المجموعات، صفحه %d"
+
+#: actions/groups.php:90
+#, php-format
+msgid ""
+"%%%%site.name%%%% groups let you find and talk with people of similar "
+"interests. After you join a group you can send messages to all other members "
+"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
+"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
+"%%%%)"
+msgstr ""
+
+#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
+msgid "Create a new group"
+msgstr "أنشئ مجموعه جديدة"
+
+#: 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/groupsearch.php:58
+msgid "Group search"
+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/groupunblock.php:128 actions/unblock.php:77
+msgid "Error removing the block."
+msgstr "خطأ أثناء منع الحجب."
+
+#: actions/imsettings.php:59
+msgid "IM Settings"
+msgstr "إعدادات المراسله الفورية"
+
+#: 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/imsettings.php:89
+msgid "IM is not available."
+msgstr "المراسله الفوريه غير متوفره."
+
+#: actions/imsettings.php:106
+msgid "Current confirmed Jabber/GTalk address."
+msgstr ""
+
+#: 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 ""
+
+#: actions/imsettings.php:124
+msgid "IM Address"
+msgstr "عنوان المراسله الفورية"
+
+#: 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/imsettings.php:143
+msgid "Send me notices through Jabber/GTalk."
+msgstr ""
+
+#: actions/imsettings.php:148
+msgid "Post a notice when my Jabber/GTalk status changes."
+msgstr ""
+
+#: actions/imsettings.php:153
+msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+msgstr ""
+
+#: actions/imsettings.php:159
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr ""
+
+#: actions/imsettings.php:285
+msgid "No Jabber ID."
+msgstr "لا هويه جابر."
+
+#: actions/imsettings.php:292
+msgid "Cannot normalize that Jabber ID"
+msgstr ""
+
+#: actions/imsettings.php:296
+msgid "Not a valid Jabber ID"
+msgstr "ليست هويه جابر صالحة"
+
+#: actions/imsettings.php:299
+msgid "That is already your Jabber ID."
+msgstr ""
+
+#: actions/imsettings.php:302
+msgid "Jabber ID already belongs to another user."
+msgstr ""
+
+#: 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 ""
+
+#: actions/imsettings.php:387
+msgid "That is not your Jabber ID."
+msgstr "هذه ليست هويتك فى جابر."
+
+#: actions/inbox.php:59
+#, php-format
+msgid "Inbox for %s - page %d"
+msgstr ""
+
+#: actions/inbox.php:62
+#, php-format
+msgid "Inbox for %s"
+msgstr ""
+
+#: actions/inbox.php:115
+msgid "This is your inbox, which lists your incoming private messages."
+msgstr ""
+
+#: actions/invite.php:39
+msgid "Invites have been disabled."
+msgstr ""
+
+#: actions/invite.php:41
+#, php-format
+msgid "You must be logged in to invite other users to use %s"
+msgstr ""
+
+#: actions/invite.php:72
+#, php-format
+msgid "Invalid email address: %s"
+msgstr "عنوان بريد إلكترونى غير صالح: %s"
+
+#: actions/invite.php:110
+msgid "Invitation(s) sent"
+msgstr "أُرسلت الدعوة"
+
+#: actions/invite.php:112
+msgid "Invite new users"
+msgstr "دعوه مستخدمين جدد"
+
+#: actions/invite.php:128
+msgid "You are already subscribed to these users:"
+msgstr ""
+
+#: actions/invite.php:131 actions/invite.php:139
+#, php-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: actions/invite.php:136
+msgid ""
+"These people are already users and you were automatically subscribed to them:"
+msgstr ""
+
+#: actions/invite.php:144
+msgid "Invitation(s) sent to the following people:"
+msgstr ""
+
+#: 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/invite.php:162
+msgid ""
+"Use this form to invite your friends and colleagues to use this service."
+msgstr ""
+
+#: actions/invite.php:187
+msgid "Email addresses"
+msgstr "عناوين البريد الإلكتروني"
+
+#: actions/invite.php:189
+msgid "Addresses of friends to invite (one per line)"
+msgstr ""
+
+#: actions/invite.php:192
+msgid "Personal message"
+msgstr "رساله شخصية"
+
+#: actions/invite.php:194
+msgid "Optionally add a personal message to the invitation."
+msgstr ""
+
+#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:222
+msgid "Send"
+msgstr "أرسل"
+
+#: actions/invite.php:226
+#, php-format
+msgid "%1$s has invited you to join them on %2$s"
+msgstr ""
+
+#: actions/invite.php:228
+#, php-format
+msgid ""
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
+"%2$s is a micro-blogging service that lets you keep up-to-date with people "
+"you know and people who interest you.\n"
+"\n"
+"You can also share news about yourself, your thoughts, or your life online "
+"with people who know about you. It's also great for meeting new people who "
+"share your interests.\n"
+"\n"
+"%1$s said:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see %1$s's profile page on %2$s here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"If you'd like to try the service, click on the link below to accept the "
+"invitation.\n"
+"\n"
+"%6$s\n"
+"\n"
+"If not, you can ignore this message. Thanks for your patience and your "
+"time.\n"
+"\n"
+"Sincerely, %2$s\n"
+msgstr ""
+
+#: actions/joingroup.php:60
+msgid "You must be logged in to join a group."
+msgstr ""
+
+#: actions/joingroup.php:90 lib/command.php:217
+msgid "You are already a member of that group"
+msgstr ""
+
+#: actions/joingroup.php:128 lib/command.php:234
+#, php-format
+msgid "Could not join user %s to group %s"
+msgstr ""
+
+#: actions/joingroup.php:135 lib/command.php:239
+#, php-format
+msgid "%s joined group %s"
+msgstr "%s انضم إلى مجموعه %s"
+
+#: actions/leavegroup.php:60
+msgid "You must be logged in to leave a group."
+msgstr ""
+
+#: actions/leavegroup.php:90 lib/command.php:268
+msgid "You are not a member of that group."
+msgstr "لست عضوا فى تلك المجموعه."
+
+#: actions/leavegroup.php:119 lib/command.php:278
+msgid "Could not find membership record."
+msgstr ""
+
+#: actions/leavegroup.php:127 lib/command.php:284
+#, php-format
+msgid "Could not remove user %s to group %s"
+msgstr ""
+
+#: actions/leavegroup.php:134 lib/command.php:289
+#, php-format
+msgid "%s left group %s"
+msgstr ""
+
+#: actions/login.php:83 actions/register.php:137
+msgid "Already logged in."
+msgstr "والج بالفعل."
+
+#: actions/login.php:114 actions/login.php:124
+msgid "Invalid or expired token."
+msgstr ""
+
+#: actions/login.php:147
+msgid "Incorrect username or password."
+msgstr "اسم المستخدم أو كلمه السر غير صحيحان."
+
+#: actions/login.php:153
+msgid "Error setting user. You are probably not authorized."
+msgstr "خطأ أثناء ضبط المستخدم. لست مُصرحًا على الأرجح."
+
+#: actions/login.php:208 actions/login.php:261 lib/action.php:458
+#: lib/logingroupnav.php:79
+msgid "Login"
+msgstr "لُج"
+
+#: actions/login.php:247
+msgid "Login to site"
+msgstr "لُج إلى الموقع"
+
+#: actions/login.php:250 actions/profilesettings.php:106
+#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
+#: lib/groupeditform.php:152 lib/userprofile.php:131
+msgid "Nickname"
+msgstr "الاسم المستعار"
+
+#: actions/login.php:253 actions/register.php:428
+#: lib/accountsettingsaction.php:116
+msgid "Password"
+msgstr "كلمه السر"
+
+#: actions/login.php:256 actions/register.php:477
+msgid "Remember me"
+msgstr "تذكّرني"
+
+#: actions/login.php:257 actions/register.php:479
+msgid "Automatically login in the future; not for shared computers!"
+msgstr ""
+
+#: actions/login.php:267
+msgid "Lost or forgotten password?"
+msgstr "أنسيت كلمه السر؟"
+
+#: actions/login.php:286
+msgid ""
+"For security reasons, please re-enter your user name and password before "
+"changing your settings."
+msgstr ""
+
+#: actions/login.php:290
+#, php-format
+msgid ""
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account."
+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/microsummary.php:69
+msgid "No current status"
+msgstr "لا حاله حالية"
+
+#: actions/newgroup.php:53
+msgid "New group"
+msgstr "مجموعه جديدة"
+
+#: actions/newgroup.php:110
+msgid "Use this form to create a new group."
+msgstr "استخدم هذا النموذج لإنشاء مجموعه جديده."
+
+#: actions/newmessage.php:71 actions/newmessage.php:231
+msgid "New message"
+msgstr "رساله جديدة"
+
+#: 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:144 actions/newnotice.php:136 lib/command.php:351
+#: lib/command.php:424
+msgid "No content!"
+msgstr "لا محتوى!"
+
+#: actions/newmessage.php:158
+msgid "No recipient specified."
+msgstr "لا مستلم حُدّد."
+
+#: 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:181
+msgid "Message sent"
+msgstr "أُرسلت الرسالة"
+
+#: actions/newmessage.php:185 lib/command.php:375
+#, php-format
+msgid "Direct message to %s sent"
+msgstr ""
+
+#: actions/newmessage.php:210 actions/newnotice.php:242 lib/channel.php:170
+msgid "Ajax Error"
+msgstr "خطأ أجاكس"
+
+#: actions/newnotice.php:69
+msgid "New notice"
+msgstr "إشعار جديد"
+
+#: actions/newnotice.php:208
+msgid "Notice posted"
+msgstr "أُرسل الإشعار"
+
+#: 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/noticesearch.php:78
+msgid "Text search"
+msgstr "بحث فى النصوص"
+
+#: actions/noticesearch.php:91
+#, php-format
+msgid "Search results for \"%s\" on %s"
+msgstr "نتائج البحث عن \"%s\"  فى %s"
+
+#: 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/noticesearchrss.php:96
+#, php-format
+msgid "Updates with \"%s\""
+msgstr ""
+
+#: actions/noticesearchrss.php:98
+#, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s!"
+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/oembed.php:79 actions/shownotice.php:100
+msgid "Notice has no profile"
+msgstr ""
+
+#: actions/oembed.php:86 actions/shownotice.php:180
+#, php-format
+msgid "%1$s's status on %2$s"
+msgstr ""
+
+#: actions/oembed.php:157
+msgid "content type "
+msgstr "نوع المحتوى "
+
+#: actions/oembed.php:160
+msgid "Only "
+msgstr ""
+
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1011
+#: lib/api.php:1039 lib/api.php:1149
+msgid "Not a supported data format."
+msgstr "ليس نسق بيانات مدعوم."
+
+#: actions/opensearch.php:64
+msgid "People Search"
+msgstr "بحث فى الأشخاص"
+
+#: actions/opensearch.php:67
+msgid "Notice Search"
+msgstr "بحث الإشعارات"
+
+#: actions/othersettings.php:60
+msgid "Other Settings"
+msgstr "إعدادات أخرى"
+
+#: actions/othersettings.php:71
+msgid "Manage various other options."
+msgstr "أدر خيارات أخرى عديده."
+
+#: actions/othersettings.php:108
+msgid " (free service)"
+msgstr " (خدمه حرة)"
+
+#: actions/othersettings.php:116
+msgid "Shorten URLs with"
+msgstr "قصّر المسارات بـ"
+
+#: actions/othersettings.php:117
+msgid "Automatic shortening service to use."
+msgstr "خدمه التقصير المطلوب استخدامها."
+
+#: actions/othersettings.php:122
+msgid "View profile designs"
+msgstr "اعرض تصاميم الملف الشخصي"
+
+#: actions/othersettings.php:123
+msgid "Show or hide profile designs."
+msgstr "أظهر أو أخفِ تصاميم الملفات الشخصيه."
+
+#: actions/othersettings.php:153
+msgid "URL shortening service is too long (max 50 chars)."
+msgstr ""
+
+#: actions/outbox.php:58
+#, php-format
+msgid "Outbox for %s - page %d"
+msgstr ""
+
+#: actions/outbox.php:61
+#, php-format
+msgid "Outbox for %s"
+msgstr ""
+
+#: actions/outbox.php:116
+msgid "This is your outbox, which lists private messages you have sent."
+msgstr ""
+
+#: actions/passwordsettings.php:58
+msgid "Change password"
+msgstr "غيّر كلمه السر"
+
+#: actions/passwordsettings.php:69
+msgid "Change your password."
+msgstr "غيّر كلمه سرك."
+
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+msgid "Password change"
+msgstr "تغيير كلمه السر"
+
+#: actions/passwordsettings.php:104
+msgid "Old password"
+msgstr "كلمه السر القديمة"
+
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+msgid "New password"
+msgstr "كلمه سر جديدة"
+
+#: actions/passwordsettings.php:109
+msgid "6 or more characters"
+msgstr ""
+
+#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
+#: actions/register.php:432 actions/smssettings.php:134
+msgid "Confirm"
+msgstr "أكّد"
+
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "نفس كلمه السر أعلاه"
+
+#: actions/passwordsettings.php:117
+msgid "Change"
+msgstr "غيّر"
+
+#: actions/passwordsettings.php:154 actions/register.php:230
+msgid "Password must be 6 or more characters."
+msgstr "يجب أن تكون كلمه السر 6 حروف أو أكثر."
+
+#: actions/passwordsettings.php:157 actions/register.php:233
+msgid "Passwords don't match."
+msgstr "كلمتا السر غير متطابقتين."
+
+#: actions/passwordsettings.php:165
+msgid "Incorrect old password"
+msgstr "كلمه السر القديمه غير صحيحة"
+
+#: actions/passwordsettings.php:181
+msgid "Error saving user; invalid."
+msgstr "خطأ أثناء حفظ المستخدم؛ غير صالح."
+
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
+msgid "Can't save new password."
+msgstr "تعذّر حفظ كلمه السر الجديده."
+
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+msgid "Password saved."
+msgstr "حُفظت كلمه السر."
+
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:308
+msgid "Paths"
+msgstr "المسارات"
+
+#: actions/pathsadminpanel.php:70
+msgid "Path and server settings for this StatusNet site."
+msgstr ""
+
+#: actions/pathsadminpanel.php:140
+#, php-format
+msgid "Theme directory not readable: %s"
+msgstr "لا يمكن قراءه دليل السمات: %s"
+
+#: actions/pathsadminpanel.php:146
+#, php-format
+msgid "Avatar directory not writable: %s"
+msgstr "لا يمكن الكتابه فى دليل الأفتارات: %s"
+
+#: actions/pathsadminpanel.php:152
+#, php-format
+msgid "Background directory not writable: %s"
+msgstr "لا يمكن الكتابه فى دليل الخلفيات: %s"
+
+#: actions/pathsadminpanel.php:160
+#, php-format
+msgid "Locales directory not readable: %s"
+msgstr "لا يمكن قراءه دليل المحليات: %s"
+
+#: actions/pathsadminpanel.php:212 actions/siteadminpanel.php:58
+#: lib/adminpanelaction.php:299
+msgid "Site"
+msgstr "الموقع"
+
+#: actions/pathsadminpanel.php:216
+msgid "Path"
+msgstr "المسار"
+
+#: actions/pathsadminpanel.php:216
+msgid "Site path"
+msgstr "مسار الموقع"
+
+#: actions/pathsadminpanel.php:220
+msgid "Path to locales"
+msgstr "مسار المحليات"
+
+#: actions/pathsadminpanel.php:220
+msgid "Directory path to locales"
+msgstr "مسار دليل المحليات"
+
+#: actions/pathsadminpanel.php:227
+msgid "Theme"
+msgstr "السمة"
+
+#: actions/pathsadminpanel.php:232
+msgid "Theme server"
+msgstr "خادوم السمات"
+
+#: actions/pathsadminpanel.php:236
+msgid "Theme path"
+msgstr "مسار السمات"
+
+#: actions/pathsadminpanel.php:240
+msgid "Theme directory"
+msgstr "دليل السمات"
+
+#: actions/pathsadminpanel.php:247
+msgid "Avatars"
+msgstr "أفتارات"
+
+#: actions/pathsadminpanel.php:252
+msgid "Avatar server"
+msgstr "خادوم الأفتارات"
+
+#: actions/pathsadminpanel.php:256
+msgid "Avatar path"
+msgstr "مسار الأفتارات"
+
+#: actions/pathsadminpanel.php:260
+msgid "Avatar directory"
+msgstr "دليل الأفتار."
+
+#: actions/pathsadminpanel.php:269
+msgid "Backgrounds"
+msgstr "خلفيات"
+
+#: actions/pathsadminpanel.php:273
+msgid "Background server"
+msgstr "خادوم الخلفيات"
+
+#: actions/pathsadminpanel.php:277
+msgid "Background path"
+msgstr "مسار الخلفيات"
+
+#: actions/pathsadminpanel.php:281
+msgid "Background directory"
+msgstr "دليل الخلفيات"
+
+#: actions/pathsadminpanel.php:297
+msgid "Save paths"
+msgstr "احفظ المسارات"
+
+#: 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/peoplesearch.php:58
+msgid "People search"
+msgstr "بحث فى الأشخاص"
+
+#: actions/peopletag.php:70
+#, php-format
+msgid "Not a valid people tag: %s"
+msgstr "ليس وسم أشخاص صالح: %s"
+
+#: actions/peopletag.php:144
+#, php-format
+msgid "Users self-tagged with %s - page %d"
+msgstr ""
+
+#: actions/postnotice.php:84
+msgid "Invalid notice content"
+msgstr "محتوى إشعار غير صالح"
+
+#: actions/postnotice.php:90
+#, php-format
+msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
+msgstr ""
+
+#: actions/profilesettings.php:60
+msgid "Profile settings"
+msgstr "إعدادات الملف الشخصي"
+
+#: actions/profilesettings.php:71
+msgid ""
+"You can update your personal profile info here so people know more about you."
+msgstr ""
+
+#: actions/profilesettings.php:99
+msgid "Profile information"
+msgstr "معلومات الملف الشخصي"
+
+#: actions/profilesettings.php:108 lib/groupeditform.php:154
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+msgstr ""
+
+#: actions/profilesettings.php:111 actions/register.php:447
+#: actions/showgroup.php:247 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:149
+msgid "Full name"
+msgstr "الاسم الكامل"
+
+#: actions/profilesettings.php:115 actions/register.php:452
+#: lib/groupeditform.php:161
+msgid "Homepage"
+msgstr "الصفحه الرئيسية"
+
+#: actions/profilesettings.php:117 actions/register.php:454
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr ""
+
+#: actions/profilesettings.php:122 actions/register.php:460
+#, php-format
+msgid "Describe yourself and your interests in %d chars"
+msgstr ""
+
+#: actions/profilesettings.php:125 actions/register.php:463
+msgid "Describe yourself and your interests"
+msgstr "صِف نفسك واهتماماتك"
+
+#: actions/profilesettings.php:127 actions/register.php:465
+msgid "Bio"
+msgstr "السيرة"
+
+#: actions/profilesettings.php:132 actions/register.php:470
+#: actions/showgroup.php:256 actions/tagother.php:112
+#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: lib/userprofile.php:164
+msgid "Location"
+msgstr "الموقع"
+
+#: actions/profilesettings.php:134 actions/register.php:472
+msgid "Where you are, like \"City, State (or Region), Country\""
+msgstr ""
+
+#: actions/profilesettings.php:138 actions/tagother.php:149
+#: actions/tagother.php:209 lib/subscriptionlist.php:106
+#: lib/subscriptionlist.php:108 lib/userprofile.php:209
+msgid "Tags"
+msgstr "الوسوم"
+
+#: actions/profilesettings.php:140
+msgid ""
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+msgstr ""
+
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:307
+msgid "Language"
+msgstr "اللغة"
+
+#: actions/profilesettings.php:145
+msgid "Preferred language"
+msgstr "اللغه المفضلة"
+
+#: actions/profilesettings.php:154
+msgid "Timezone"
+msgstr "المنطقه الزمنية"
+
+#: actions/profilesettings.php:155
+msgid "What timezone are you normally in?"
+msgstr "ما المنطقه الزمنيه التى تتواجد فيها عادة؟"
+
+#: actions/profilesettings.php:160
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+msgstr ""
+
+#: actions/profilesettings.php:221 actions/register.php:223
+#, php-format
+msgid "Bio is too long (max %d chars)."
+msgstr ""
+
+#: actions/profilesettings.php:228 actions/siteadminpanel.php:165
+msgid "Timezone not selected."
+msgstr "لم تُختر المنطقه الزمنيه."
+
+#: actions/profilesettings.php:234
+msgid "Language is too long (max 50 chars)."
+msgstr ""
+
+#: actions/profilesettings.php:246 actions/tagother.php:178
+#, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "وسم غير صالح: \"%s\""
+
+#: actions/profilesettings.php:295
+msgid "Couldn't update user for autosubscribe."
+msgstr ""
+
+#: actions/profilesettings.php:328
+msgid "Couldn't save profile."
+msgstr "تعذّر حفظ الملف الشخصى."
+
+#: actions/profilesettings.php:336
+msgid "Couldn't save tags."
+msgstr "تعذّر حفظ الوسوم."
+
+#: actions/profilesettings.php:344 lib/adminpanelaction.php:126
+msgid "Settings saved."
+msgstr "حُفظت الإعدادات."
+
+#: actions/public.php:83
+#, php-format
+msgid "Beyond the page limit (%s)"
+msgstr "وراء حد الصفحه (%s)"
+
+#: actions/public.php:92
+msgid "Could not retrieve public stream."
+msgstr ""
+
+#: actions/public.php:129
+#, php-format
+msgid "Public timeline, page %d"
+msgstr "المسار الزمنى العام، صفحه %d"
+
+#: actions/public.php:131 lib/publicgroupnav.php:79
+msgid "Public timeline"
+msgstr "المسار الزمنى العام"
+
+#: actions/public.php:151
+msgid "Public Stream Feed (RSS 1.0)"
+msgstr ""
+
+#: actions/public.php:155
+msgid "Public Stream Feed (RSS 2.0)"
+msgstr ""
+
+#: actions/public.php:159
+msgid "Public Stream Feed (Atom)"
+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:233
+#, php-format
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool. [Join now](%%action.register%%) to share notices about yourself with "
+"friends, family, and colleagues! ([Read more](%%doc.help%%))"
+msgstr ""
+"هنا %%site.name%%، خدمه [التدوين المُصغّر](http://en.wikipedia.org/wiki/Micro-"
+"blogging) المبنيه على البرنامج الحر [StatusNet](http://status.net/).  [انضم "
+"الآن](%%action.register%%) لتشارك اشعاراتك مع أصدقائك وعائلتك وزملائك! "
+"([اقرأ المزيد](%%doc.help%%))"
+
+#: actions/public.php:238
+#, php-format
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool."
+msgstr ""
+"هنا %%site.name%%، خدمه [التدوين المُصغّر](http://en.wikipedia.org/wiki/Micro-"
+"blogging) المبنيه على البرنامج الحر [StatusNet](http://status.net/)."
+
+#: 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 "هذه هى أكثر الوسوم شهره على %s "
+
+#: 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/publictagcloud.php:135
+msgid "Tag cloud"
+msgstr "سحابه الوسوم"
+
+#: actions/recoverpassword.php:36
+msgid "You are already logged in!"
+msgstr "أنت والج بالفعل!"
+
+#: actions/recoverpassword.php:62
+msgid "No such recovery code."
+msgstr "لا رمز استعاده كهذا."
+
+#: actions/recoverpassword.php:66
+msgid "Not a recovery code."
+msgstr "ليس رمز استعاده."
+
+#: actions/recoverpassword.php:73
+msgid "Recovery code for unknown user."
+msgstr "رمز استعاده لمستخدم غير معروف."
+
+#: actions/recoverpassword.php:86
+msgid "Error with confirmation code."
+msgstr "خطأ فى رمز التأكيد."
+
+#: actions/recoverpassword.php:97
+msgid "This confirmation code is too old. Please start again."
+msgstr "رمز التأكيد هذا قديم جدًا. من فضلك ابدأ من جديد."
+
+#: actions/recoverpassword.php:111
+msgid "Could not update user with confirmed email address."
+msgstr ""
+
+#: actions/recoverpassword.php:152
+msgid ""
+"If you have forgotten or lost your password, you can get a new one sent to "
+"the email address you have stored in your account."
+msgstr ""
+
+#: actions/recoverpassword.php:158
+msgid "You have been identified. Enter a new password below. "
+msgstr ""
+
+#: actions/recoverpassword.php:188
+msgid "Password recovery"
+msgstr "استعاده كلمه السر"
+
+#: actions/recoverpassword.php:191
+msgid "Nickname or email address"
+msgstr "الاسم المستعار أو البريد الإلكتروني"
+
+#: actions/recoverpassword.php:193
+msgid "Your nickname on this server, or your registered email address."
+msgstr ""
+
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+msgid "Recover"
+msgstr "استرجع"
+
+#: actions/recoverpassword.php:208
+msgid "Reset password"
+msgstr "أعد ضبط كلمه السر"
+
+#: actions/recoverpassword.php:209
+msgid "Recover password"
+msgstr "استعد كلمه السر"
+
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
+msgid "Password recovery requested"
+msgstr "طُلبت استعاده كلمه السر"
+
+#: actions/recoverpassword.php:213
+msgid "Unknown action"
+msgstr "إجراء غير معروف"
+
+#: actions/recoverpassword.php:236
+msgid "6 or more characters, and don't forget it!"
+msgstr ""
+
+#: actions/recoverpassword.php:243
+msgid "Reset"
+msgstr "أعد الضبط"
+
+#: actions/recoverpassword.php:252
+msgid "Enter a nickname or email address."
+msgstr "أدخل اسمًا مستعارًا أو عنوان بريد إلكترونى."
+
+#: actions/recoverpassword.php:272
+msgid "No user with that email address or username."
+msgstr ""
+
+#: actions/recoverpassword.php:287
+msgid "No registered email address for that user."
+msgstr ""
+
+#: actions/recoverpassword.php:301
+msgid "Error saving address confirmation."
+msgstr "خطأ أثناء حفظ تأكيد العنوان."
+
+#: actions/recoverpassword.php:325
+msgid ""
+"Instructions for recovering your password have been sent to the email "
+"address registered to your account."
+msgstr ""
+
+#: actions/recoverpassword.php:344
+msgid "Unexpected password reset."
+msgstr ""
+
+#: actions/recoverpassword.php:352
+msgid "Password must be 6 chars or more."
+msgstr "يجب أن تكون كلمه السر 6 محارف أو أكثر."
+
+#: actions/recoverpassword.php:356
+msgid "Password and confirmation do not match."
+msgstr ""
+
+#: actions/recoverpassword.php:375 actions/register.php:248
+msgid "Error setting user."
+msgstr "خطأ أثناء ضبط المستخدم."
+
+#: actions/recoverpassword.php:382
+msgid "New password successfully saved. You are now logged in."
+msgstr ""
+
+#: actions/register.php:85 actions/register.php:189 actions/register.php:404
+msgid "Sorry, only invited people can register."
+msgstr "عذرًا، الأشخاص المدعوون وحدهم يستطيعون التسجيل."
+
+#: actions/register.php:92
+msgid "Sorry, invalid invitation code."
+msgstr "عذرا، رمز دعوه غير صالح."
+
+#: actions/register.php:112
+msgid "Registration successful"
+msgstr "نجح التسجيل"
+
+#: actions/register.php:114 actions/register.php:502 lib/action.php:455
+#: lib/logingroupnav.php:85
+msgid "Register"
+msgstr "سجّل"
+
+#: actions/register.php:135
+msgid "Registration not allowed."
+msgstr "لا يُسمح بالتسجيل."
+
+#: actions/register.php:198
+msgid "You can't register if you don't agree to the license."
+msgstr ""
+
+#: actions/register.php:201
+msgid "Not a valid email address."
+msgstr "ليس عنوان بريد صالح."
+
+#: actions/register.php:212
+msgid "Email address already exists."
+msgstr "عنوان البريد الإلكترونى موجود مسبقًا."
+
+#: actions/register.php:243 actions/register.php:264
+msgid "Invalid username or password."
+msgstr "اسم مستخدم أو كلمه سر غير صالحه."
+
+#: 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/register.php:424
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+msgstr ""
+
+#: actions/register.php:429
+msgid "6 or more characters. Required."
+msgstr "6 حروف أو أكثر. مطلوب."
+
+#: actions/register.php:433
+msgid "Same as password above. Required."
+msgstr "نفس كلمه السر أعلاه. مطلوب."
+
+#: actions/register.php:437 actions/register.php:441
+#: actions/siteadminpanel.php:283 lib/accountsettingsaction.php:120
+msgid "Email"
+msgstr "البريد الإلكتروني"
+
+#: actions/register.php:438 actions/register.php:442
+msgid "Used only for updates, announcements, and password recovery"
+msgstr ""
+
+#: actions/register.php:449
+msgid "Longer name, preferably your \"real\" name"
+msgstr ""
+
+#: actions/register.php:493
+msgid "My text and files are available under "
+msgstr "نصوصى وملفاتى متاحه تحت رخصه "
+
+#: actions/register.php:495
+msgid "Creative Commons Attribution 3.0"
+msgstr "المشاع المبدع نسبه المنصف إلى مؤلفه 3.0"
+
+#: actions/register.php:496
+msgid ""
+" except this private data: password, email address, IM address, and phone "
+"number."
+msgstr ""
+
+#: 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"
+"\n"
+"Thanks for signing up and we hope you enjoy using this service."
+msgstr ""
+
+#: actions/register.php:561
+msgid ""
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
+msgstr ""
+
+#: actions/remotesubscribe.php:98
+#, php-format
+msgid ""
+"To subscribe, you can [login](%%action.login%%), or [register](%%action."
+"register%%) a new  account. If you already have an account  on a [compatible "
+"microblogging site](%%doc.openmublog%%),  enter your profile URL below."
+msgstr ""
+
+#: actions/remotesubscribe.php:112
+msgid "Remote subscribe"
+msgstr "اشتراك بعيد"
+
+#: actions/remotesubscribe.php:124
+msgid "Subscribe to a remote user"
+msgstr "اشترك بمستخدم بعيد"
+
+#: actions/remotesubscribe.php:129
+msgid "User nickname"
+msgstr "اسم المستخدم المستعار"
+
+#: actions/remotesubscribe.php:130
+msgid "Nickname of the user you want to follow"
+msgstr ""
+
+#: actions/remotesubscribe.php:133
+msgid "Profile URL"
+msgstr "مسار الملف الشخصي"
+
+#: actions/remotesubscribe.php:134
+msgid "URL of your profile on another compatible microblogging service"
+msgstr ""
+
+#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
+#: lib/userprofile.php:365
+msgid "Subscribe"
+msgstr "اشترك"
+
+#: actions/remotesubscribe.php:159
+msgid "Invalid profile URL (bad format)"
+msgstr ""
+
+#: actions/remotesubscribe.php:168
+msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
+msgstr ""
+
+#: actions/remotesubscribe.php:176
+msgid "That’s a local profile! Login to subscribe."
+msgstr ""
+
+#: actions/remotesubscribe.php:183
+msgid "Couldn’t get a request token."
+msgstr ""
+
+#: actions/replies.php:125 actions/repliesrss.php:68
+#: lib/personalgroupnav.php:105
+#, php-format
+msgid "Replies to %s"
+msgstr "الردود على %s"
+
+#: actions/replies.php:127
+#, php-format
+msgid "Replies to %s, page %d"
+msgstr "الردود على %s، الصفحه %d"
+
+#: actions/replies.php:144
+#, php-format
+msgid "Replies feed for %s (RSS 1.0)"
+msgstr ""
+
+#: actions/replies.php:151
+#, php-format
+msgid "Replies feed for %s (RSS 2.0)"
+msgstr ""
+
+#: actions/replies.php:158
+#, php-format
+msgid "Replies feed for %s (Atom)"
+msgstr ""
+
+#: actions/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: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: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/repliesrss.php:72
+#, php-format
+msgid "Replies to %1$s on %2$s!"
+msgstr ""
+
+#: actions/sandbox.php:65 actions/unsandbox.php:65
+msgid "You cannot sandbox users on this site."
+msgstr ""
+
+#: actions/sandbox.php:72
+msgid "User is already sandboxed."
+msgstr ""
+
+#: actions/showfavorites.php:79
+#, php-format
+msgid "%s's favorite notices, page %d"
+msgstr ""
+
+#: actions/showfavorites.php:132
+msgid "Could not retrieve favorite notices."
+msgstr ""
+
+#: actions/showfavorites.php:170
+#, php-format
+msgid "Feed for favorites of %s (RSS 1.0)"
+msgstr ""
+
+#: actions/showfavorites.php:177
+#, php-format
+msgid "Feed for favorites of %s (RSS 2.0)"
+msgstr ""
+
+#: actions/showfavorites.php:184
+#, php-format
+msgid "Feed for favorites of %s (Atom)"
+msgstr ""
+
+#: actions/showfavorites.php: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:207
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Post something interesting "
+"they would add to their favorites :)"
+msgstr ""
+"%s لم يضف أى إشعارات إلى مفضلته إلى الآن. أرسل شيئًا شيقًا ليضيفه إلى "
+"مفضلته. :)"
+
+#: actions/showfavorites.php:211
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to their favorites :)"
+msgstr ""
+"%s لم يضف أى إشعارات إلى مفضلته إلى الآن. لمّ لا [تسجل حسابًا](%%%%action."
+"register%%%%) وترسل شيئًا شيقًا ليضيفه إلى مفضلته. :)"
+
+#: actions/showfavorites.php:242
+msgid "This is a way to share what you like."
+msgstr "إنها إحدى وسائل مشاركه ما تحب."
+
+#: actions/showgroup.php:82 lib/groupnav.php:86
+#, php-format
+msgid "%s group"
+msgstr "مجموعه %s"
+
+#: actions/showgroup.php:84
+#, php-format
+msgid "%s group, page %d"
+msgstr ""
+
+#: actions/showgroup.php:218
+msgid "Group profile"
+msgstr "ملف المجموعه الشخصي"
+
+#: actions/showgroup.php:263 actions/tagother.php:118
+#: actions/userauthorization.php:167 lib/userprofile.php:177
+msgid "URL"
+msgstr "مسار"
+
+#: actions/showgroup.php:274 actions/tagother.php:128
+#: actions/userauthorization.php:179 lib/userprofile.php:194
+msgid "Note"
+msgstr "ملاحظة"
+
+#: actions/showgroup.php:284 lib/groupeditform.php:184
+msgid "Aliases"
+msgstr "الكنى"
+
+#: actions/showgroup.php:293
+msgid "Group actions"
+msgstr ""
+
+#: actions/showgroup.php:328
+#, php-format
+msgid "Notice feed for %s group (RSS 1.0)"
+msgstr ""
+
+#: actions/showgroup.php:334
+#, php-format
+msgid "Notice feed for %s group (RSS 2.0)"
+msgstr ""
+
+#: actions/showgroup.php:340
+#, php-format
+msgid "Notice feed for %s group (Atom)"
+msgstr ""
+
+#: actions/showgroup.php:345
+#, php-format
+msgid "FOAF for %s group"
+msgstr ""
+
+#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91
+msgid "Members"
+msgstr "الأعضاء"
+
+#: actions/showgroup.php:386 lib/profileaction.php:117
+#: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95
+#: lib/tagcloudsection.php:71
+msgid "(None)"
+msgstr "(لا شيء)"
+
+#: actions/showgroup.php:392
+msgid "All members"
+msgstr "جميع الأعضاء"
+
+#: actions/showgroup.php:429 lib/profileaction.php:174
+msgid "Statistics"
+msgstr "إحصاءات"
+
+#: actions/showgroup.php:432
+msgid "Created"
+msgstr "أنشئ"
+
+#: 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/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:482
+msgid "Admins"
+msgstr "الإداريون"
+
+#: actions/showmessage.php:81
+msgid "No such message."
+msgstr "لا رساله كهذه."
+
+#: actions/showmessage.php:98
+msgid "Only the sender and recipient may read this message."
+msgstr "يحق للمُرسل والمستلم فقط قراءه هذه الرساله."
+
+#: actions/showmessage.php:108
+#, php-format
+msgid "Message to %1$s on %2$s"
+msgstr ""
+
+#: actions/showmessage.php:113
+#, php-format
+msgid "Message from %1$s on %2$s"
+msgstr ""
+
+#: actions/shownotice.php:90
+msgid "Notice deleted."
+msgstr "حُذف الإشعار."
+
+#: actions/showstream.php:73
+#, php-format
+msgid " tagged %s"
+msgstr ""
+
+#: actions/showstream.php:79
+#, php-format
+msgid "%s, page %d"
+msgstr ""
+
+#: actions/showstream.php:122
+#, php-format
+msgid "Notice feed for %s tagged %s (RSS 1.0)"
+msgstr ""
+
+#: actions/showstream.php:129
+#, php-format
+msgid "Notice feed for %s (RSS 1.0)"
+msgstr ""
+
+#: actions/showstream.php:136
+#, php-format
+msgid "Notice feed for %s (RSS 2.0)"
+msgstr ""
+
+#: actions/showstream.php:143
+#, php-format
+msgid "Notice feed for %s (Atom)"
+msgstr ""
+
+#: actions/showstream.php:148
+#, php-format
+msgid "FOAF for %s"
+msgstr ""
+
+#: actions/showstream.php:191
+#, php-format
+msgid "This is the timeline for %s but %s hasn't posted anything yet."
+msgstr ""
+
+#: 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: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: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/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/silence.php:65 actions/unsilence.php:65
+msgid "You cannot silence users on this site."
+msgstr "لا يمكنك إسكات المستخدمين على هذا الموقع."
+
+#: actions/silence.php:72
+msgid "User is already silenced."
+msgstr "المستخدم مسكت من قبل."
+
+#: actions/siteadminpanel.php:69
+msgid "Basic settings for this StatusNet site."
+msgstr "الإعدادات الأساسيه لموقع StatusNet هذا."
+
+#: actions/siteadminpanel.php:147
+msgid "Site name must have non-zero length."
+msgstr "يجب ألا يكون طول اسم الموقع صفرًا."
+
+#: actions/siteadminpanel.php:155
+msgid "You must have a valid contact email address"
+msgstr "يجب أن تملك عنوان بريد إلكترونى صالح للاتصال"
+
+#: actions/siteadminpanel.php:173
+#, php-format
+msgid "Unknown language \"%s\""
+msgstr "لغه غير معروفه \"%s\""
+
+#: actions/siteadminpanel.php:180
+msgid "Invalid snapshot report URL."
+msgstr ""
+
+#: actions/siteadminpanel.php:186
+msgid "Invalid snapshot run value."
+msgstr ""
+
+#: actions/siteadminpanel.php:192
+msgid "Snapshot frequency must be a number."
+msgstr ""
+
+#: actions/siteadminpanel.php:199
+msgid "You must set an SSL server when enabling SSL."
+msgstr ""
+
+#: actions/siteadminpanel.php:204
+msgid "Invalid SSL server. The maximum length is 255 characters."
+msgstr ""
+
+#: actions/siteadminpanel.php:210
+msgid "Minimum text limit is 140 characters."
+msgstr "حد النص الأدنى هو 140 حرفًا."
+
+#: actions/siteadminpanel.php:216
+msgid "Dupe limit must 1 or more seconds."
+msgstr ""
+
+#: actions/siteadminpanel.php:266
+msgid "General"
+msgstr "عام"
+
+#: actions/siteadminpanel.php:269
+msgid "Site name"
+msgstr "اسم الموقع"
+
+#: actions/siteadminpanel.php:270
+msgid "The name of your site, like \"Yourcompany Microblog\""
+msgstr "اسم موقعك، \"التدوين المصغر لشركتك\" مثلا"
+
+#: actions/siteadminpanel.php:274
+msgid "Brought by"
+msgstr ""
+
+#: actions/siteadminpanel.php:275
+msgid "Text used for credits link in footer of each page"
+msgstr ""
+
+#: actions/siteadminpanel.php:279
+msgid "Brought by URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:280
+msgid "URL used for credits link in footer of each page"
+msgstr ""
+
+#: actions/siteadminpanel.php:284
+msgid "Contact email address for your site"
+msgstr "عنوان البريد الإلكترونى للاتصال بموقعك"
+
+#: actions/siteadminpanel.php:290
+msgid "Local"
+msgstr "محلي"
+
+#: actions/siteadminpanel.php:301
+msgid "Default timezone"
+msgstr "المنطقه الزمنيه المبدئية"
+
+#: actions/siteadminpanel.php:302
+msgid "Default timezone for the site; usually UTC."
+msgstr "المنطقه الزمنيه المبدئيه للموقع؛ ت‌ع‌م عاده."
+
+#: actions/siteadminpanel.php:308
+msgid "Default site language"
+msgstr "لغه الموقع المبدئية"
+
+#: actions/siteadminpanel.php:316
+msgid "URLs"
+msgstr "مسارات"
+
+#: actions/siteadminpanel.php:319
+msgid "Server"
+msgstr "خادوم"
+
+#: actions/siteadminpanel.php:319
+msgid "Site's server hostname."
+msgstr "اسم مضيف خادوم الموقع."
+
+#: actions/siteadminpanel.php:323
+msgid "Fancy URLs"
+msgstr "مسارات فاخرة"
+
+#: actions/siteadminpanel.php:325
+msgid "Use fancy (more readable and memorable) URLs?"
+msgstr "أأستخدم مسارات فاخره (يمكن قراءتها وتذكرها بسهوله أكبر)؟"
+
+#: actions/siteadminpanel.php:331
+msgid "Access"
+msgstr "نفاذ"
+
+#: actions/siteadminpanel.php:334
+msgid "Private"
+msgstr "خاص"
+
+#: actions/siteadminpanel.php:336
+msgid "Prohibit anonymous users (not logged in) from viewing site?"
+msgstr "أأمنع المستخدمين المجهولين (غير الوالجين) من عرض الموقع؟"
+
+#: actions/siteadminpanel.php:340
+#, fuzzy
+msgid "Invite only"
+msgstr "ادعُ"
+
+#: actions/siteadminpanel.php:342
+msgid "Make registration invitation only."
+msgstr ""
+
+#: actions/siteadminpanel.php:346
+msgid "Closed"
+msgstr "مُغلق"
+
+#: actions/siteadminpanel.php:348
+msgid "Disable new registrations."
+msgstr "عطّل التسجيل الجديد."
+
+#: actions/siteadminpanel.php:354
+msgid "Snapshots"
+msgstr ""
+
+#: actions/siteadminpanel.php:357
+msgid "Randomly during Web hit"
+msgstr ""
+
+#: actions/siteadminpanel.php:358
+msgid "In a scheduled job"
+msgstr "فى مهمه مُجدولة"
+
+#: actions/siteadminpanel.php:359 actions/siteadminpanel.php:383
+msgid "Never"
+msgstr "مطلقا"
+
+#: actions/siteadminpanel.php:360
+msgid "Data snapshots"
+msgstr ""
+
+#: actions/siteadminpanel.php:361
+msgid "When to send statistical data to status.net servers"
+msgstr ""
+
+#: actions/siteadminpanel.php:366
+msgid "Frequency"
+msgstr "التكرار"
+
+#: actions/siteadminpanel.php:367
+msgid "Snapshots will be sent once every N web hits"
+msgstr ""
+
+#: actions/siteadminpanel.php:372
+msgid "Report URL"
+msgstr "بلّغ عن المسار"
+
+#: actions/siteadminpanel.php:373
+msgid "Snapshots will be sent to this URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:380
+msgid "SSL"
+msgstr "SSL"
+
+#: actions/siteadminpanel.php:384
+msgid "Sometimes"
+msgstr "أحيانًا"
+
+#: actions/siteadminpanel.php:385
+msgid "Always"
+msgstr "دائمًا"
+
+#: actions/siteadminpanel.php:387
+msgid "Use SSL"
+msgstr "استخدم SSL"
+
+#: actions/siteadminpanel.php:388
+msgid "When to use SSL"
+msgstr ""
+
+#: actions/siteadminpanel.php:393
+msgid "SSL Server"
+msgstr "خادوم SSL"
+
+#: actions/siteadminpanel.php:394
+msgid "Server to direct SSL requests to"
+msgstr ""
+
+#: actions/siteadminpanel.php:400
+msgid "Limits"
+msgstr "الحدود"
+
+#: actions/siteadminpanel.php:403
+msgid "Text limit"
+msgstr "حد النص"
+
+#: actions/siteadminpanel.php:403
+msgid "Maximum number of characters for notices."
+msgstr "أقصى عدد للحروف فى الإشعارات."
+
+#: actions/siteadminpanel.php:407
+msgid "Dupe limit"
+msgstr ""
+
+#: actions/siteadminpanel.php:407
+msgid "How long users must wait (in seconds) to post the same thing again."
+msgstr ""
+
+#: actions/siteadminpanel.php:421 actions/useradminpanel.php:313
+msgid "Save site settings"
+msgstr "اذف إعدادت الموقع"
+
+#: actions/smssettings.php:58
+msgid "SMS Settings"
+msgstr "إعدادات الرسائل القصيرة"
+
+#: actions/smssettings.php:69
+#, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
+msgstr "لا يمكنك استلام رسائل قصيره عبر البريد الإلكرتونى من %%site.name%%."
+
+#: actions/smssettings.php:91
+msgid "SMS is not available."
+msgstr "الرسائل القصيره غير متوفره."
+
+#: actions/smssettings.php:112
+msgid "Current confirmed SMS-enabled phone number."
+msgstr ""
+
+#: actions/smssettings.php:123
+msgid "Awaiting confirmation on this phone number."
+msgstr ""
+
+#: actions/smssettings.php:130
+msgid "Confirmation code"
+msgstr "رمز التأكيد"
+
+#: actions/smssettings.php:131
+msgid "Enter the code you received on your phone."
+msgstr ""
+
+#: actions/smssettings.php:138
+msgid "SMS Phone number"
+msgstr ""
+
+#: actions/smssettings.php:140
+msgid "Phone number, no punctuation or spaces, with area code"
+msgstr ""
+
+#: actions/smssettings.php:174
+msgid ""
+"Send me notices through SMS; I understand I may incur exorbitant charges "
+"from my carrier."
+msgstr ""
+
+#: actions/smssettings.php:306
+msgid "No phone number."
+msgstr "لا رقم هاتف."
+
+#: actions/smssettings.php:311
+msgid "No carrier selected."
+msgstr ""
+
+#: actions/smssettings.php:318
+msgid "That is already your phone number."
+msgstr ""
+
+#: actions/smssettings.php:321
+msgid "That phone number already belongs to another user."
+msgstr ""
+
+#: actions/smssettings.php:347
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your phone "
+"for the code and instructions on how to use it."
+msgstr ""
+
+#: actions/smssettings.php:374
+msgid "That is the wrong confirmation number."
+msgstr ""
+
+#: actions/smssettings.php:405
+msgid "That is not your phone number."
+msgstr "هذا ليس رقم هاتفك."
+
+#: actions/smssettings.php:465
+msgid "Mobile carrier"
+msgstr ""
+
+#: actions/smssettings.php:469
+msgid "Select a carrier"
+msgstr ""
+
+#: 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/smssettings.php:498
+msgid "No code entered"
+msgstr ""
+
+#: actions/subedit.php:70
+msgid "You are not subscribed to that profile."
+msgstr ""
+
+#: actions/subedit.php:83
+msgid "Could not save subscription."
+msgstr "تعذّر حفظ الاشتراك."
+
+#: actions/subscribe.php:55
+msgid "Not a local user."
+msgstr "ليس مُستخدمًا محليًا."
+
+#: actions/subscribe.php:69
+msgid "Subscribed"
+msgstr "مُشترك"
+
+#: actions/subscribers.php:50
+#, php-format
+msgid "%s subscribers"
+msgstr "مشتركو %s"
+
+#: actions/subscribers.php:52
+#, php-format
+msgid "%s subscribers, page %d"
+msgstr "مشتركو %s، الصفحه %d"
+
+#: actions/subscribers.php:63
+msgid "These are the people who listen to your notices."
+msgstr "هؤلاء هم الأشخاص الذين يستمعون إلى إشعاراتك."
+
+#: actions/subscribers.php:67
+#, php-format
+msgid "These are the people who listen to %s's notices."
+msgstr ""
+
+#: actions/subscribers.php:108
+msgid ""
+"You have no subscribers. Try subscribing to people you know and they might "
+"return the favor"
+msgstr ""
+
+#: actions/subscribers.php:110
+#, php-format
+msgid "%s has no subscribers. Want to be the first?"
+msgstr ""
+
+#: actions/subscribers.php:114
+#, php-format
+msgid ""
+"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
+"%) and be the first?"
+msgstr ""
+
+#: actions/subscriptions.php:52
+#, php-format
+msgid "%s subscriptions"
+msgstr "اشتراكات %s"
+
+#: actions/subscriptions.php:54
+#, php-format
+msgid "%s subscriptions, page %d"
+msgstr "اشتراكات %s، الصفحه %d"
+
+#: actions/subscriptions.php:65
+msgid "These are the people whose notices you listen to."
+msgstr "هؤلاء الأشخاص الذى تستمع إليهم."
+
+#: actions/subscriptions.php:69
+#, php-format
+msgid "These are the people whose notices %s listens to."
+msgstr "هؤلاء الأشخاص الذى يستمع %s إليهم."
+
+#: 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:123 actions/subscriptions.php:127
+#, php-format
+msgid "%s is not listening to anyone."
+msgstr ""
+
+#: actions/subscriptions.php:194
+msgid "Jabber"
+msgstr "جابر"
+
+#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+msgid "SMS"
+msgstr "رسائل قصيرة"
+
+#: actions/tag.php:68
+#, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr ""
+
+#: actions/tag.php:86
+#, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr ""
+
+#: actions/tag.php:92
+#, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr ""
+
+#: actions/tag.php:98
+#, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr ""
+
+#: actions/tagother.php:33
+msgid "Not logged in"
+msgstr "لست والجًا"
+
+#: actions/tagother.php:39
+msgid "No id argument."
+msgstr "لا مُدخل هويه."
+
+#: actions/tagother.php:65
+#, php-format
+msgid "Tag %s"
+msgstr ""
+
+#: actions/tagother.php:77 lib/userprofile.php:75
+msgid "User profile"
+msgstr "ملف المستخدم الشخصي"
+
+#: actions/tagother.php:81 lib/userprofile.php:102
+msgid "Photo"
+msgstr "صورة"
+
+#: actions/tagother.php:141
+msgid "Tag user"
+msgstr ""
+
+#: actions/tagother.php:151
+msgid ""
+"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
+"separated"
+msgstr ""
+
+#: actions/tagother.php:193
+msgid ""
+"You can only tag people you are subscribed to or who are subscribed to you."
+msgstr ""
+
+#: actions/tagother.php:200
+msgid "Could not save tags."
+msgstr "تعذّر حفظ الوسوم."
+
+#: 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/twitapitrends.php:87
+msgid "API method under construction."
+msgstr ""
+
+#: actions/unblock.php:59
+msgid "You haven't blocked that user."
+msgstr "لم تمنع هذا المستخدم."
+
+#: actions/unsandbox.php:72
+#, fuzzy
+msgid "User is not sandboxed."
+msgstr "ليس للمستخدم إشعار أخير"
+
+#: actions/unsilence.php:72
+msgid "User is not silenced."
+msgstr "المستخدم ليس مُسكتًا."
+
+#: actions/unsubscribe.php:77
+msgid "No profile id in request."
+msgstr ""
+
+#: actions/unsubscribe.php:84
+msgid "No profile with that id."
+msgstr "لا ملف بهذه الهويه."
+
+#: actions/unsubscribe.php:98
+msgid "Unsubscribed"
+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/useradminpanel.php:58 lib/adminpanelaction.php:305
+#: lib/personalgroupnav.php:115
+msgid "User"
+msgstr "المستخدم"
+
+#: actions/useradminpanel.php:69
+msgid "User settings for this StatusNet site."
+msgstr ""
+
+#: actions/useradminpanel.php:149
+msgid "Invalid bio limit. Must be numeric."
+msgstr ""
+
+#: actions/useradminpanel.php:155
+msgid "Invalid welcome text. Max length is 255 characters."
+msgstr "رساله ترحيب غير صالحه. أقصى طول هو 255 حرف."
+
+#: actions/useradminpanel.php:165
+#, php-format
+msgid "Invalid default subscripton: '%1$s' is not user."
+msgstr ""
+
+#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
+#: lib/personalgroupnav.php:109
+msgid "Profile"
+msgstr "الملف الشخصي"
+
+#: actions/useradminpanel.php:222
+msgid "Bio Limit"
+msgstr "حد السيرة"
+
+#: actions/useradminpanel.php:223
+msgid "Maximum length of a profile bio in characters."
+msgstr ""
+
+#: actions/useradminpanel.php:231
+msgid "New users"
+msgstr "مستخدمون جدد"
+
+#: actions/useradminpanel.php:235
+msgid "New user welcome"
+msgstr "ترحيب المستخدمين الجدد"
+
+#: actions/useradminpanel.php:236
+msgid "Welcome text for new users (Max 255 chars)."
+msgstr "نص الترحيب بالمستخدمين الجدد (255 حرفًا كحد أقصى)."
+
+#: actions/useradminpanel.php:241
+msgid "Default subscription"
+msgstr "الاشتراك المبدئي"
+
+#: actions/useradminpanel.php:242
+msgid "Automatically subscribe new users to this user."
+msgstr "أشرك المستخدمين الجدد بهذا المستخدم تلقائيًا."
+
+#: actions/useradminpanel.php:251
+msgid "Invitations"
+msgstr "الدعوات"
+
+#: actions/useradminpanel.php:256
+msgid "Invitations enabled"
+msgstr "الدعوات مُفعلة"
+
+#: actions/useradminpanel.php:258
+msgid "Whether to allow users to invite new users."
+msgstr ""
+
+#: actions/useradminpanel.php:265
+msgid "Sessions"
+msgstr "الجلسات"
+
+#: actions/useradminpanel.php:270
+msgid "Handle sessions"
+msgstr ""
+
+#: actions/useradminpanel.php:272
+msgid "Whether to handle sessions ourselves."
+msgstr ""
+
+#: actions/useradminpanel.php:276
+msgid "Session debugging"
+msgstr "تنقيح الجلسة"
+
+#: actions/useradminpanel.php:278
+msgid "Turn on debugging output for sessions."
+msgstr "مكّن تنقيح مُخرجات الجلسه."
+
+#: actions/userauthorization.php:105
+msgid "Authorize subscription"
+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:188
+msgid "License"
+msgstr "الرخصة"
+
+#: actions/userauthorization.php:209
+msgid "Accept"
+msgstr "اقبل"
+
+#: actions/userauthorization.php:210 lib/subscribeform.php:115
+#: lib/subscribeform.php:139
+msgid "Subscribe to this user"
+msgstr "اشترك بهذا المستخدم"
+
+#: actions/userauthorization.php:211
+msgid "Reject"
+msgstr "ارفض"
+
+#: actions/userauthorization.php:212
+msgid "Reject this subscription"
+msgstr "ارفض هذا الاشتراك"
+
+#: actions/userauthorization.php:225
+msgid "No authorization request!"
+msgstr "لا طلب استيثاق!"
+
+#: actions/userauthorization.php:247
+msgid "Subscription authorized"
+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:259
+msgid "Subscription rejected"
+msgstr "رُفض الاشتراك"
+
+#: actions/userauthorization.php:261
+msgid ""
+"The subscription has been rejected, but no callback URL was passed. Check "
+"with the site’s instructions for details on how to fully reject the "
+"subscription."
+msgstr ""
+
+#: actions/userauthorization.php:296
+#, php-format
+msgid "Listener URI ‘%s’ not found here"
+msgstr ""
+
+#: actions/userauthorization.php:301
+#, php-format
+msgid "Listenee URI ‘%s’ is too long."
+msgstr ""
+
+#: actions/userauthorization.php:307
+#, php-format
+msgid "Listenee URI ‘%s’ is a local user."
+msgstr ""
+
+#: actions/userauthorization.php:322
+#, php-format
+msgid "Profile URL ‘%s’ is for a local user."
+msgstr ""
+
+#: actions/userauthorization.php:338
+#, php-format
+msgid "Avatar URL ‘%s’ is not valid."
+msgstr ""
+
+#: actions/userauthorization.php:343
+#, php-format
+msgid "Can’t read avatar URL ‘%s’."
+msgstr ""
+
+#: actions/userauthorization.php:348
+#, php-format
+msgid "Wrong image type for avatar URL ‘%s’."
+msgstr ""
+
+#: actions/userbyid.php:70
+msgid "No id."
+msgstr "لا هويه."
+
+#: actions/userdesignsettings.php:76 lib/designsettings.php:65
+msgid "Profile design"
+msgstr "تصميم الملف الشخصي"
+
+#: actions/userdesignsettings.php:87 lib/designsettings.php:76
+msgid ""
+"Customize the way your profile looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+
+#: actions/userdesignsettings.php:282
+msgid "Enjoy your hotdog!"
+msgstr "استمتع بالنقانق!"
+
+#: actions/usergroups.php:64
+#, php-format
+msgid "%s groups, page %d"
+msgstr "مجموعات %s، صفحه %d"
+
+#: actions/usergroups.php:130
+msgid "Search for more groups"
+msgstr ""
+
+#: actions/usergroups.php:153
+#, php-format
+msgid "%s is not a member of any group."
+msgstr ""
+
+#: actions/usergroups.php:158
+#, php-format
+msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
+msgstr ""
+
+#: classes/File.php: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:147
+#, php-format
+msgid "A file this large would exceed your user quota of %d bytes."
+msgstr ""
+
+#: classes/File.php:154
+#, php-format
+msgid "A file this large would exceed your monthly quota of %d bytes."
+msgstr ""
+
+#: classes/Message.php:45
+msgid "You are banned from sending direct messages."
+msgstr "أنت ممنوع من إرسال رسائل مباشره."
+
+#: classes/Message.php:61
+msgid "Could not insert message."
+msgstr "تعذّر إدراج الرساله."
+
+#: classes/Message.php:71
+msgid "Could not update message with new URI."
+msgstr ""
+
+#: classes/Notice.php:164
+#, php-format
+msgid "DB error inserting hashtag: %s"
+msgstr ""
+
+#: classes/Notice.php:188
+msgid "Problem saving notice. Too long."
+msgstr "مشكله فى حفظ الإشعار. طويل جدًا."
+
+#: classes/Notice.php:192
+msgid "Problem saving notice. Unknown user."
+msgstr "مشكله فى حفظ الإشعار. مستخدم غير معروف."
+
+#: classes/Notice.php:197
+msgid ""
+"Too many notices too fast; take a breather and post again in a few minutes."
+msgstr ""
+
+#: classes/Notice.php:203
+msgid ""
+"Too many duplicate messages too quickly; take a breather and post again in a "
+"few minutes."
+msgstr ""
+
+#: classes/Notice.php:209
+msgid "You are banned from posting notices on this site."
+msgstr ""
+
+#: classes/Notice.php:274 classes/Notice.php:299
+msgid "Problem saving notice."
+msgstr "مشكله أثناء حفظ الإشعار."
+
+#: classes/Notice.php:1115
+#, php-format
+msgid "DB error inserting reply: %s"
+msgstr ""
+
+#: classes/User.php:347
+#, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr "أهلا بكم فى %1$s يا @%2$s!"
+
+#: classes/User_group.php:380
+msgid "Could not create group."
+msgstr "تعذّر إنشاء المجموعه."
+
+#: classes/User_group.php:409
+msgid "Could not set group membership."
+msgstr "تعذّر ضبط عضويه المجموعه."
+
+#: lib/accountsettingsaction.php:108
+msgid "Change your profile settings"
+msgstr "غيّر إعدادات ملفك الشخصي"
+
+#: lib/accountsettingsaction.php:112
+msgid "Upload an avatar"
+msgstr "ارفع أفتارًا"
+
+#: lib/accountsettingsaction.php:116
+msgid "Change your password"
+msgstr "غير كلمه سرّك"
+
+#: lib/accountsettingsaction.php:120
+msgid "Change email handling"
+msgstr "غير أسلوب التعامل مع البريد الإلكتروني"
+
+#: lib/accountsettingsaction.php:124
+msgid "Design your profile"
+msgstr "صمّم ملفك الشخصي"
+
+#: lib/accountsettingsaction.php:128
+msgid "Other"
+msgstr "أخرى"
+
+#: lib/accountsettingsaction.php:128
+msgid "Other options"
+msgstr "خيارات أخرى"
+
+#: lib/action.php:144
+#, php-format
+msgid "%s - %s"
+msgstr "%s - %s"
+
+#: lib/action.php:159
+msgid "Untitled page"
+msgstr "صفحه غير مُعنونة"
+
+#: lib/action.php:425
+msgid "Primary site navigation"
+msgstr ""
+
+#: lib/action.php:431
+msgid "Home"
+msgstr "الرئيسية"
+
+#: lib/action.php:431
+msgid "Personal profile and friends timeline"
+msgstr "الملف الشخصى ومسار الأصدقاء الزمني"
+
+#: lib/action.php:433
+msgid "Account"
+msgstr "الحساب"
+
+#: lib/action.php:433
+msgid "Change your email, avatar, password, profile"
+msgstr ""
+
+#: lib/action.php:436
+msgid "Connect"
+msgstr "اتصل"
+
+#: lib/action.php:436
+msgid "Connect to services"
+msgstr ""
+
+#: lib/action.php:440
+msgid "Change site configuration"
+msgstr "غيّر ضبط الموقع"
+
+#: lib/action.php:444 lib/subgroupnav.php:105
+msgid "Invite"
+msgstr "ادعُ"
+
+#: lib/action.php:445 lib/subgroupnav.php:106
+#, php-format
+msgid "Invite friends and colleagues to join you on %s"
+msgstr ""
+
+#: lib/action.php:450
+msgid "Logout"
+msgstr "اخرج"
+
+#: lib/action.php:450
+msgid "Logout from the site"
+msgstr "اخرج من الموقع"
+
+#: lib/action.php:455
+msgid "Create an account"
+msgstr "أنشئ حسابًا"
+
+#: lib/action.php:458
+msgid "Login to the site"
+msgstr "لُج إلى الموقع"
+
+#: lib/action.php:461 lib/action.php:724
+msgid "Help"
+msgstr "مساعدة"
+
+#: lib/action.php:461
+msgid "Help me!"
+msgstr "ساعدني!"
+
+#: lib/action.php:464 lib/searchaction.php:127
+msgid "Search"
+msgstr "ابحث"
+
+#: lib/action.php:464
+msgid "Search for people or text"
+msgstr "ابحث عن أشخاص أو نص"
+
+#: lib/action.php:485
+msgid "Site notice"
+msgstr "إشعار الموقع"
+
+#: lib/action.php:551
+msgid "Local views"
+msgstr "المشاهدات المحلية"
+
+#: lib/action.php:617
+msgid "Page notice"
+msgstr "إشعار الصفحة"
+
+#: lib/action.php:719
+msgid "Secondary site navigation"
+msgstr ""
+
+#: lib/action.php:726
+msgid "About"
+msgstr "عن"
+
+#: lib/action.php:728
+msgid "FAQ"
+msgstr "الأسئله المكررة"
+
+#: lib/action.php:732
+msgid "TOS"
+msgstr "الشروط"
+
+#: lib/action.php:735
+msgid "Privacy"
+msgstr "خصوصية"
+
+#: lib/action.php:737
+msgid "Source"
+msgstr "المصدر"
+
+#: lib/action.php:739
+msgid "Contact"
+msgstr "اتصل"
+
+#: lib/action.php:741
+msgid "Badge"
+msgstr ""
+
+#: lib/action.php:769
+msgid "StatusNet software license"
+msgstr ""
+
+#: lib/action.php:772
+#, php-format
+msgid ""
+"**%%site.name%%** is a microblogging service brought to you by [%%site."
+"broughtby%%](%%site.broughtbyurl%%). "
+msgstr ""
+"**%%site.name%%** خدمه تدوين مصغر يقدمها لك [%%site.broughtby%%](%%site."
+"broughtbyurl%%). "
+
+#: lib/action.php:774
+#, php-format
+msgid "**%%site.name%%** is a microblogging service. "
+msgstr ""
+
+#: lib/action.php:776
+#, php-format
+msgid ""
+"It runs the [StatusNet](http://status.net/) microblogging software, version %"
+"s, available under the [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
+msgstr ""
+"يعمل على برنامج التدوين المُصغّر [StatusNet](http://status.net/) -النسخه %s- "
+"المتوفر تحت [رخصه غنو أفيرو العمومية](http://www.fsf.org/licensing/licenses/"
+"agpl-3.0.html)."
+
+#: lib/action.php:790
+msgid "Site content license"
+msgstr "رخصه محتوى الموقع"
+
+#: lib/action.php:799
+msgid "All "
+msgstr ""
+
+#: lib/action.php:804
+msgid "license."
+msgstr "الرخصه."
+
+#: lib/action.php:1068
+msgid "Pagination"
+msgstr ""
+
+#: lib/action.php:1077
+msgid "After"
+msgstr "بعد"
+
+#: lib/action.php:1085
+msgid "Before"
+msgstr "قبل"
+
+#: lib/action.php:1133
+msgid "There was a problem with your session token."
+msgstr ""
+
+#: lib/adminpanelaction.php:96
+msgid "You cannot make changes to this site."
+msgstr ""
+
+#: lib/adminpanelaction.php:195
+msgid "showForm() not implemented."
+msgstr ""
+
+#: lib/adminpanelaction.php:224
+msgid "saveSettings() not implemented."
+msgstr ""
+
+#: lib/adminpanelaction.php:247
+msgid "Unable to delete design setting."
+msgstr "تعذّر حذف إعدادات التصميم."
+
+#: lib/adminpanelaction.php:300
+msgid "Basic site configuration"
+msgstr "ضبط الموقع الأساسي"
+
+#: lib/adminpanelaction.php:303
+msgid "Design configuration"
+msgstr "ضبط التصميم"
+
+#: lib/adminpanelaction.php:306 lib/adminpanelaction.php:309
+msgid "Paths configuration"
+msgstr "ضبط المسارات"
+
+#: lib/attachmentlist.php:87
+msgid "Attachments"
+msgstr "مرفقات"
+
+#: lib/attachmentlist.php:265
+msgid "Author"
+msgstr "المؤلف"
+
+#: lib/attachmentlist.php:278
+msgid "Provider"
+msgstr "المزود"
+
+#: lib/attachmentnoticesection.php:67
+msgid "Notices where this attachment appears"
+msgstr ""
+
+#: lib/attachmenttagcloudsection.php:48
+msgid "Tags for this attachment"
+msgstr "وسوم هذا المرفق"
+
+#: lib/channel.php:138 lib/channel.php:158
+msgid "Command results"
+msgstr "نتائج الأمر"
+
+#: lib/channel.php:210
+msgid "Command complete"
+msgstr "اكتمل الأمر"
+
+#: lib/channel.php:221
+msgid "Command failed"
+msgstr "فشل الأمر"
+
+#: lib/command.php:44
+msgid "Sorry, this command is not yet implemented."
+msgstr ""
+
+#: lib/command.php:88
+#, php-format
+msgid "Could not find a user with nickname %s"
+msgstr ""
+
+#: lib/command.php:92
+msgid "It does not make a lot of sense to nudge yourself!"
+msgstr ""
+
+#: lib/command.php:99
+#, php-format
+msgid "Nudge sent to %s"
+msgstr ""
+
+#: lib/command.php:126
+#, php-format
+msgid ""
+"Subscriptions: %1$s\n"
+"Subscribers: %2$s\n"
+"Notices: %3$s"
+msgstr ""
+"الاشتراكات: %1$s\n"
+"المشتركون: %2$s\n"
+"الإشعارات: %3$s"
+
+#: lib/command.php:152 lib/command.php:400
+msgid "Notice with that id does not exist"
+msgstr ""
+
+#: lib/command.php:168 lib/command.php:416 lib/command.php:472
+msgid "User has no last notice"
+msgstr "ليس للمستخدم إشعار أخير"
+
+#: lib/command.php:190
+msgid "Notice marked as fave."
+msgstr ""
+
+#: lib/command.php:315
+#, php-format
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
+#: lib/command.php:318
+#, php-format
+msgid "Fullname: %s"
+msgstr "الاسم الكامل: %s"
+
+#: lib/command.php:321
+#, php-format
+msgid "Location: %s"
+msgstr "الموقع: %s"
+
+#: lib/command.php:324
+#, php-format
+msgid "Homepage: %s"
+msgstr "الصفحه الرئيسية: %s"
+
+#: lib/command.php:327
+#, php-format
+msgid "About: %s"
+msgstr "عن: %s"
+
+#: 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:377
+msgid "Error sending direct message."
+msgstr ""
+
+#: lib/command.php:431
+#, php-format
+msgid "Notice too long - maximum is %d characters, you sent %d"
+msgstr ""
+
+#: lib/command.php:440
+#, php-format
+msgid "Reply to %s sent"
+msgstr "رُد على رساله %s"
+
+#: lib/command.php:442
+msgid "Error saving notice."
+msgstr "خطأ أثناء حفظ الإشعار."
+
+#: lib/command.php:496
+msgid "Specify the name of the user to subscribe to"
+msgstr ""
+
+#: lib/command.php:503
+#, php-format
+msgid "Subscribed to %s"
+msgstr "مُشترك ب%s"
+
+#: lib/command.php:524
+msgid "Specify the name of the user to unsubscribe from"
+msgstr ""
+
+#: lib/command.php:531
+#, php-format
+msgid "Unsubscribed from %s"
+msgstr ""
+
+#: lib/command.php:549 lib/command.php:572
+msgid "Command not yet implemented."
+msgstr ""
+
+#: lib/command.php:552
+msgid "Notification off."
+msgstr ""
+
+#: lib/command.php:554
+msgid "Can't turn off notification."
+msgstr ""
+
+#: lib/command.php:575
+msgid "Notification on."
+msgstr ""
+
+#: lib/command.php:577
+msgid "Can't turn on notification."
+msgstr ""
+
+#: lib/command.php:590
+msgid "Login command is disabled"
+msgstr ""
+
+#: lib/command.php:604
+#, php-format
+msgid "Could not create login token for %s"
+msgstr ""
+
+#: lib/command.php:609
+#, php-format
+msgid "This link is useable only once, and is good for only 2 minutes: %s"
+msgstr ""
+
+#: lib/command.php:625
+msgid "You are not subscribed to anyone."
+msgstr "لست مُشتركًا بأى أحد."
+
+#: lib/command.php:627
+msgid "You are subscribed to this person:"
+msgid_plural "You are subscribed to these people:"
+msgstr[0] "لست مشتركًا بأحد."
+msgstr[1] "أنت مشترك بهذا الشخص:"
+msgstr[2] "أنت مشترك بهذين الشخصين:"
+msgstr[3] "أنت مشترك بهؤلاء الأشخاص:"
+msgstr[4] ""
+msgstr[5] ""
+
+#: lib/command.php:647
+msgid "No one is subscribed to you."
+msgstr "لا أحد مشترك بك."
+
+#: lib/command.php:649
+msgid "This person is subscribed to you:"
+msgid_plural "These people are subscribed to you:"
+msgstr[0] "لا أحد مشترك بك."
+msgstr[1] "هذا الشخص مشترك بك:"
+msgstr[2] "هذان الشخصان مشتركان بك:"
+msgstr[3] "هؤلاء الأشخاص مشتركون بك:"
+msgstr[4] ""
+msgstr[5] ""
+
+#: lib/command.php:669
+msgid "You are not a member of any groups."
+msgstr "لست عضوًا فى أى مجموعه."
+
+#: lib/command.php:671
+msgid "You are a member of this group:"
+msgid_plural "You are a member of these groups:"
+msgstr[0] "لست عضوًا فى أى مجموعه."
+msgstr[1] "أنت عضو فى هذه المجموعة:"
+msgstr[2] "أنت عضو فى هذين المجموعتين:"
+msgstr[3] "أنت عضو فى هذه المجموعات:"
+msgstr[4] ""
+msgstr[5] ""
+
+#: lib/command.php:685
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\n"
+"groups - lists the groups you have joined\n"
+"subscriptions - list the people you follow\n"
+"subscribers - list the people that follow you\n"
+"leave <nickname> - unsubscribe from user\n"
+"d <nickname> <text> - direct message to user\n"
+"get <nickname> - get last notice from user\n"
+"whois <nickname> - get profile info on user\n"
+"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 ""
+
+#: lib/common.php:199
+msgid "No configuration file found. "
+msgstr ""
+
+#: lib/common.php:200
+msgid "I looked for configuration files in the following places: "
+msgstr ""
+
+#: lib/common.php:201
+msgid "You may wish to run the installer to fix this."
+msgstr ""
+
+#: lib/common.php:202
+msgid "Go to the installer."
+msgstr "اذهب إلى المُثبّت."
+
+#: lib/connectsettingsaction.php:110
+msgid "IM"
+msgstr "محادثه فورية"
+
+#: lib/connectsettingsaction.php:111
+msgid "Updates by instant messenger (IM)"
+msgstr ""
+
+#: lib/connectsettingsaction.php:116
+msgid "Updates by SMS"
+msgstr ""
+
+#: lib/dberroraction.php:60
+msgid "Database error"
+msgstr "خطأ قاعده بيانات"
+
+#: lib/designsettings.php:105
+msgid "Upload file"
+msgstr "ارفع ملفًا"
+
+#: lib/designsettings.php:109
+msgid ""
+"You can upload your personal background image. The maximum file size is 2MB."
+msgstr "تستطيع رفع صورتك الشخصيه. أقصى حجم للملف هو 2 م.ب."
+
+#: lib/designsettings.php:418
+msgid "Design defaults restored."
+msgstr "استعيدت مبدئيات التصميم."
+
+#: lib/disfavorform.php:114 lib/disfavorform.php:140
+msgid "Disfavor this notice"
+msgstr "ألغِ تفضيل هذا الإشعار"
+
+#: lib/favorform.php:114 lib/favorform.php:140
+msgid "Favor this notice"
+msgstr "فضّل هذا الإشعار"
+
+#: lib/favorform.php:140
+msgid "Favor"
+msgstr "فضّل"
+
+#: lib/feed.php:85
+msgid "RSS 1.0"
+msgstr "آرإس​إس 1.0"
+
+#: lib/feed.php:87
+msgid "RSS 2.0"
+msgstr "آرإس​إس 2.0"
+
+#: lib/feed.php:89
+msgid "Atom"
+msgstr "أتوم"
+
+#: lib/feed.php:91
+msgid "FOAF"
+msgstr "FOAF"
+
+#: lib/feedlist.php:64
+msgid "Export data"
+msgstr "تصدير البيانات"
+
+#: lib/galleryaction.php:121
+msgid "Filter tags"
+msgstr "رشّح الوسوم"
+
+#: lib/galleryaction.php:131
+msgid "All"
+msgstr "الكل"
+
+#: lib/galleryaction.php:139
+msgid "Select tag to filter"
+msgstr "اختر وسمًا لترشيحه"
+
+#: lib/galleryaction.php:140
+msgid "Tag"
+msgstr "الوسم"
+
+#: lib/galleryaction.php:141
+msgid "Choose a tag to narrow list"
+msgstr ""
+
+#: lib/galleryaction.php:143
+msgid "Go"
+msgstr "اذهب"
+
+#: lib/groupeditform.php:163
+msgid "URL of the homepage or blog of the group or topic"
+msgstr ""
+
+#: lib/groupeditform.php:168
+msgid "Describe the group or topic"
+msgstr ""
+
+#: lib/groupeditform.php:170
+#, php-format
+msgid "Describe the group or topic in %d characters"
+msgstr ""
+
+#: lib/groupeditform.php:172
+msgid "Description"
+msgstr "الوصف"
+
+#: lib/groupeditform.php:179
+msgid ""
+"Location for the group, if any, like \"City, State (or Region), Country\""
+msgstr ""
+
+#: lib/groupeditform.php:187
+#, php-format
+msgid "Extra nicknames for the group, comma- or space- separated, max %d"
+msgstr ""
+
+#: lib/groupnav.php:85
+msgid "Group"
+msgstr "مجموعات"
+
+#: lib/groupnav.php:101
+msgid "Blocked"
+msgstr "ممنوع"
+
+#: lib/groupnav.php:102
+#, php-format
+msgid "%s blocked users"
+msgstr ""
+
+#: lib/groupnav.php:108
+#, php-format
+msgid "Edit %s group properties"
+msgstr "عدّل خصائص مجموعه %s"
+
+#: lib/groupnav.php:113
+msgid "Logo"
+msgstr "الشعار"
+
+#: lib/groupnav.php:114
+#, php-format
+msgid "Add or edit %s logo"
+msgstr "أضف أو عدّل شعار %s"
+
+#: lib/groupnav.php:120
+#, php-format
+msgid "Add or edit %s design"
+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:103
+msgid "This page is not available in a media type you accept"
+msgstr ""
+
+#: lib/imagefile.php:75
+#, php-format
+msgid "That file is too big. The maximum file size is %s."
+msgstr "هذا الملف كبير جدًا. إن أقصى حجم للملفات هو %s."
+
+#: lib/imagefile.php:80
+msgid "Partial upload."
+msgstr ""
+
+#: lib/imagefile.php:88 lib/mediafile.php:170
+msgid "System error uploading file."
+msgstr ""
+
+#: lib/imagefile.php:96
+msgid "Not an image or corrupt file."
+msgstr ""
+
+#: lib/imagefile.php:105
+msgid "Unsupported image file format."
+msgstr ""
+
+#: lib/imagefile.php:118
+msgid "Lost our file."
+msgstr ""
+
+#: lib/imagefile.php:150 lib/imagefile.php:197
+msgid "Unknown file type"
+msgstr "نوع ملف غير معروف"
+
+#: lib/imagefile.php:217
+msgid "MB"
+msgstr ""
+
+#: lib/imagefile.php:219
+msgid "kB"
+msgstr ""
+
+#: lib/jabber.php:191
+#, php-format
+msgid "[%s]"
+msgstr "[%s]"
+
+#: lib/joinform.php:114
+msgid "Join"
+msgstr "انضم"
+
+#: lib/leaveform.php:114
+msgid "Leave"
+msgstr "غادر"
+
+#: lib/logingroupnav.php:80
+msgid "Login with a username and password"
+msgstr ""
+
+#: lib/logingroupnav.php:86
+msgid "Sign up for a new account"
+msgstr ""
+
+#: lib/mail.php:172
+msgid "Email address confirmation"
+msgstr "تأكيد عنوان البريد الإلكتروني"
+
+#: 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:236
+#, php-format
+msgid "%1$s is now listening to your notices on %2$s."
+msgstr ""
+
+#: lib/mail.php:241
+#, php-format
+msgid ""
+"%1$s is now listening to your notices on %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"%4$s%5$s%6$s\n"
+"Faithfully yours,\n"
+"%7$s.\n"
+"\n"
+"----\n"
+"Change your email address or notification options at %8$s\n"
+msgstr ""
+
+#: lib/mail.php:254
+#, php-format
+msgid "Location: %s\n"
+msgstr "الموقع: %s\n"
+
+#: lib/mail.php:256
+#, php-format
+msgid "Homepage: %s\n"
+msgstr "الصفحه الرئيسية: %s\n"
+
+#: lib/mail.php:258
+#, php-format
+msgid ""
+"Bio: %s\n"
+"\n"
+msgstr "السيرة: %s\n"
+
+#: lib/mail.php:286
+#, php-format
+msgid "New email address for posting to %s"
+msgstr ""
+
+#: lib/mail.php:289
+#, 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 ""
+
+#: lib/mail.php:413
+#, php-format
+msgid "%s status"
+msgstr "حاله %s"
+
+#: lib/mail.php:439
+msgid "SMS confirmation"
+msgstr ""
+
+#: lib/mail.php:463
+#, php-format
+msgid "You've been nudged by %s"
+msgstr ""
+
+#: lib/mail.php:467
+#, 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:510
+#, php-format
+msgid "New private message from %s"
+msgstr "رساله خاصه جديده من %s"
+
+#: lib/mail.php:514
+#, 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:559
+#, php-format
+msgid "%s (@%s) added your notice as a favorite"
+msgstr ""
+
+#: lib/mail.php:561
+#, 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:620
+#, php-format
+msgid "%s (@%s) sent a notice to your attention"
+msgstr ""
+
+#: lib/mail.php:622
+#, 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:89
+msgid "Only the user can read their own mailboxes."
+msgstr ""
+
+#: lib/mailbox.php:139
+msgid ""
+"You have no private messages. You can send private message to engage other "
+"users in conversation. People can send you messages for your eyes only."
+msgstr ""
+
+#: lib/mailbox.php:227 lib/noticelist.php:452
+msgid "from"
+msgstr "من"
+
+#: lib/mediafile.php:98 lib/mediafile.php:123
+msgid "There was a database error while saving your file. Please try again."
+msgstr ""
+
+#: lib/mediafile.php:142
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#: lib/mediafile.php:147
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+
+#: lib/mediafile.php:152
+msgid "The uploaded file was only partially uploaded."
+msgstr ""
+
+#: lib/mediafile.php:159
+msgid "Missing a temporary folder."
+msgstr ""
+
+#: lib/mediafile.php:162
+msgid "Failed to write file to disk."
+msgstr "فشل فى كتابه الملف إلى القرص."
+
+#: lib/mediafile.php:165
+msgid "File upload stopped by extension."
+msgstr ""
+
+#: lib/mediafile.php:179 lib/mediafile.php:216
+msgid "File exceeds user's quota!"
+msgstr ""
+
+#: lib/mediafile.php:196 lib/mediafile.php:233
+msgid "File could not be moved to destination directory."
+msgstr ""
+
+#: lib/mediafile.php:201 lib/mediafile.php:237
+msgid "Could not determine file's mime-type!"
+msgstr ""
+
+#: lib/mediafile.php:270
+#, php-format
+msgid " Try using another %s format."
+msgstr ""
+
+#: lib/mediafile.php:275
+#, php-format
+msgid "%s is not a supported filetype on this server."
+msgstr ""
+
+#: lib/messageform.php:120
+msgid "Send a direct notice"
+msgstr "أرسل إشعارًا مباشرًا"
+
+#: lib/messageform.php:146
+msgid "To"
+msgstr "إلى"
+
+#: lib/messageform.php:159 lib/noticeform.php:183
+msgid "Available characters"
+msgstr "المحارف المتوفرة"
+
+#: lib/noticeform.php:158
+msgid "Send a notice"
+msgstr "أرسل إشعارًا"
+
+#: lib/noticeform.php:171
+#, php-format
+msgid "What's up, %s?"
+msgstr "ما الأخبار يا %s؟"
+
+#: lib/noticeform.php:190
+msgid "Attach"
+msgstr "أرفق"
+
+#: lib/noticeform.php:194
+msgid "Attach a file"
+msgstr "أرفق ملفًا"
+
+#: lib/noticelist.php:403
+#, php-format
+msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
+msgstr ""
+
+#: lib/noticelist.php:404
+msgid "N"
+msgstr "ش"
+
+#: lib/noticelist.php:404
+msgid "S"
+msgstr "ج"
+
+#: lib/noticelist.php:405
+msgid "E"
+msgstr "ر"
+
+#: lib/noticelist.php:405
+msgid "W"
+msgstr "غ"
+
+#: lib/noticelist.php:411
+msgid "at"
+msgstr "في"
+
+#: lib/noticelist.php:506
+msgid "in context"
+msgstr "فى السياق"
+
+#: lib/noticelist.php:526
+msgid "Reply to this notice"
+msgstr "رُد على هذا الإشعار"
+
+#: lib/noticelist.php:527
+msgid "Reply"
+msgstr "رُد"
+
+#: 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/oauthstore.php:283
+msgid "Error inserting new profile"
+msgstr "خطأ أثناء إدراج الملف الشخصى الجديد"
+
+#: lib/oauthstore.php:291
+msgid "Error inserting avatar"
+msgstr "خطأ فى إدراج الأفتار"
+
+#: lib/oauthstore.php:311
+msgid "Error inserting remote profile"
+msgstr "خطأ أثناء إدراج الملف الشخصى البعيد"
+
+#: lib/oauthstore.php:345
+msgid "Duplicate notice"
+msgstr "ضاعف الإشعار"
+
+#: lib/oauthstore.php:466 lib/subs.php:48
+msgid "You have been banned from subscribing."
+msgstr ""
+
+#: lib/oauthstore.php:491
+msgid "Couldn't insert new subscription."
+msgstr "تعذّر إدراج اشتراك جديد."
+
+#: lib/personalgroupnav.php:99
+msgid "Personal"
+msgstr "شخصية"
+
+#: lib/personalgroupnav.php:104
+msgid "Replies"
+msgstr "الردود"
+
+#: lib/personalgroupnav.php:114
+msgid "Favorites"
+msgstr "المفضلات"
+
+#: lib/personalgroupnav.php:124
+msgid "Inbox"
+msgstr "صندوق الوارد"
+
+#: lib/personalgroupnav.php:125
+msgid "Your incoming messages"
+msgstr "رسائلك الواردة"
+
+#: lib/personalgroupnav.php:129
+msgid "Outbox"
+msgstr "صندوق الصادر"
+
+#: lib/personalgroupnav.php:130
+msgid "Your sent messages"
+msgstr "رسائلك المُرسلة"
+
+#: lib/personaltagcloudsection.php:56
+#, php-format
+msgid "Tags in %s's notices"
+msgstr ""
+
+#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82
+msgid "Subscriptions"
+msgstr "الاشتراكات"
+
+#: lib/profileaction.php:126
+msgid "All subscriptions"
+msgstr "جميع الاشتراكات"
+
+#: lib/profileaction.php:140 lib/profileaction.php:201 lib/subgroupnav.php:90
+msgid "Subscribers"
+msgstr "المشتركون"
+
+#: lib/profileaction.php:157
+msgid "All subscribers"
+msgstr "جميع المشتركين"
+
+#: lib/profileaction.php:178
+msgid "User ID"
+msgstr "هويه المستخدم"
+
+#: lib/profileaction.php:183
+msgid "Member since"
+msgstr "عضو منذ"
+
+#: lib/profileaction.php:245
+msgid "All groups"
+msgstr "كل المجموعات"
+
+#: lib/profileformaction.php:123
+#, fuzzy
+msgid "No return-to arguments"
+msgstr "لا مُدخل هويه."
+
+#: lib/profileformaction.php:137
+msgid "unimplemented method"
+msgstr ""
+
+#: lib/publicgroupnav.php:78
+msgid "Public"
+msgstr "عام"
+
+#: lib/publicgroupnav.php:82
+msgid "User groups"
+msgstr "مجموعات المستخدمين"
+
+#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
+msgid "Recent tags"
+msgstr "الوسوم الحديثة"
+
+#: lib/publicgroupnav.php:88
+msgid "Featured"
+msgstr "مُختارون"
+
+#: lib/publicgroupnav.php:92
+msgid "Popular"
+msgstr "مشهورة"
+
+#: lib/sandboxform.php:67
+msgid "Sandbox"
+msgstr ""
+
+#: lib/sandboxform.php:78
+#, fuzzy
+msgid "Sandbox this user"
+msgstr "ألغِ منع هذا المستخدم"
+
+#: lib/searchaction.php:120
+msgid "Search site"
+msgstr "ابحث فى الموقع"
+
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr "الكلمات المفتاحية"
+
+#: lib/searchaction.php:162
+msgid "Search help"
+msgstr "ابحث فى المساعدة"
+
+#: lib/searchgroupnav.php:80
+msgid "People"
+msgstr "أشخاص"
+
+#: lib/searchgroupnav.php:81
+msgid "Find people on this site"
+msgstr "ابحث عن أشخاص على هذا الموقع"
+
+#: lib/searchgroupnav.php:83
+msgid "Find content of notices"
+msgstr "ابحث عن محتويات فى الإشعارات"
+
+#: lib/searchgroupnav.php:85
+msgid "Find groups on this site"
+msgstr "ابحث عن مجموعات على هذا الموقع"
+
+#: lib/section.php:89
+msgid "Untitled section"
+msgstr "قسم غير مُعنون"
+
+#: lib/section.php:106
+msgid "More..."
+msgstr "المزيد..."
+
+#: lib/silenceform.php:67
+msgid "Silence"
+msgstr "أسكت"
+
+#: lib/silenceform.php:78
+msgid "Silence this user"
+msgstr "أسكت هذا المستخدم"
+
+#: lib/subgroupnav.php:83
+#, php-format
+msgid "People %s subscribes to"
+msgstr "الأشخاص الذين اشترك بهم %s"
+
+#: lib/subgroupnav.php:91
+#, php-format
+msgid "People subscribed to %s"
+msgstr "الأشخاص المشتركون ب%s"
+
+#: lib/subgroupnav.php:99
+#, php-format
+msgid "Groups %s is a member of"
+msgstr "المجموعات التى %s عضو فيها"
+
+#: lib/subs.php:52
+msgid "Already subscribed!"
+msgstr "مُشترك أصلا!"
+
+#: lib/subs.php:56
+msgid "User has blocked you."
+msgstr "لقد منعك المستخدم."
+
+#: lib/subs.php:60
+msgid "Could not subscribe."
+msgstr "تعذّر الاشتراك."
+
+#: lib/subs.php:79
+msgid "Could not subscribe other to you."
+msgstr ""
+
+#: lib/subs.php:128
+#, fuzzy
+msgid "Not subscribed!"
+msgstr "لست مُشتركًا!"
+
+#: lib/subs.php:133
+#, fuzzy
+msgid "Couldn't delete self-subscription."
+msgstr "تعذّر حذف الاشتراك."
+
+#: lib/subs.php:146
+msgid "Couldn't delete subscription."
+msgstr "تعذّر حذف الاشتراك."
+
+#: lib/subscriberspeopleselftagcloudsection.php:48
+#: lib/subscriptionspeopleselftagcloudsection.php:48
+msgid "People Tagcloud as self-tagged"
+msgstr ""
+
+#: lib/subscriberspeopletagcloudsection.php:48
+#: lib/subscriptionspeopletagcloudsection.php:48
+msgid "People Tagcloud as tagged"
+msgstr ""
+
+#: lib/subscriptionlist.php:126
+msgid "(none)"
+msgstr "(لا شيء)"
+
+#: lib/tagcloudsection.php:56
+msgid "None"
+msgstr "لا شيء"
+
+#: lib/topposterssection.php:74
+msgid "Top posters"
+msgstr "أعلى المرسلين"
+
+#: lib/unsandboxform.php:69
+msgid "Unsandbox"
+msgstr ""
+
+#: lib/unsandboxform.php:80
+#, fuzzy
+msgid "Unsandbox this user"
+msgstr "ألغِ منع هذا المستخدم"
+
+#: lib/unsilenceform.php:67
+msgid "Unsilence"
+msgstr "ألغِ الإسكات"
+
+#: lib/unsilenceform.php:78
+msgid "Unsilence this user"
+msgstr "ألغِ إسكات هذا المستخدم"
+
+#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
+msgid "Unsubscribe from this user"
+msgstr "ألغِ الاشتراك مع هذا المستخدم"
+
+#: lib/unsubscribeform.php:137
+msgid "Unsubscribe"
+msgstr "ألغِ الاشتراك"
+
+#: lib/userprofile.php:116
+msgid "Edit Avatar"
+msgstr "عدّل الأفتار"
+
+#: lib/userprofile.php:236
+msgid "User actions"
+msgstr "تصرفات المستخدم"
+
+#: lib/userprofile.php:248
+msgid "Edit profile settings"
+msgstr "عدّل إعدادات الملف الشخصي"
+
+#: lib/userprofile.php:249
+msgid "Edit"
+msgstr "عدّل"
+
+#: lib/userprofile.php:272
+msgid "Send a direct message to this user"
+msgstr "أرسل رساله مباشره إلى هذا المستخدم"
+
+#: lib/userprofile.php:273
+msgid "Message"
+msgstr "رسالة"
+
+#: lib/userprofile.php:311
+msgid "Moderate"
+msgstr ""
+
+#: lib/util.php:825
+msgid "a few seconds ago"
+msgstr "قبل لحظات قليلة"
+
+#: lib/util.php:827
+msgid "about a minute ago"
+msgstr "قبل دقيقه تقريبًا"
+
+#: lib/util.php:829
+#, php-format
+msgid "about %d minutes ago"
+msgstr ""
+
+#: lib/util.php:831
+msgid "about an hour ago"
+msgstr "قبل ساعه تقريبًا"
+
+#: lib/util.php:833
+#, php-format
+msgid "about %d hours ago"
+msgstr ""
+
+#: lib/util.php:835
+msgid "about a day ago"
+msgstr "قبل يوم تقريبا"
+
+#: lib/util.php:837
+#, php-format
+msgid "about %d days ago"
+msgstr ""
+
+#: lib/util.php:839
+msgid "about a month ago"
+msgstr "قبل شهر تقريبًا"
+
+#: lib/util.php:841
+#, php-format
+msgid "about %d months ago"
+msgstr ""
+
+#: lib/util.php:843
+msgid "about a year ago"
+msgstr "قبل سنه تقريبًا"
+
+#: lib/webcolor.php:82
+#, php-format
+msgid "%s is not a valid color!"
+msgstr "%s ليس لونًا صحيحًا!"
+
+#: lib/webcolor.php:123
+#, php-format
+msgid "%s is not a valid color! Use 3 or 6 hex chars."
+msgstr ""
+
+#: scripts/maildaemon.php:48
+msgid "Could not parse message."
+msgstr "تعذّر تحليل الرساله."
+
+#: scripts/maildaemon.php:53
+msgid "Not a registered user."
+msgstr "ليس مستخدمًا مسجلًا."
+
+#: scripts/maildaemon.php:57
+msgid "Sorry, that is not your incoming email address."
+msgstr ""
+
+#: scripts/maildaemon.php:61
+msgid "Sorry, no incoming email allowed."
+msgstr ""

From c622d144400026dac65c39303994d11f114c0f5b Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sat, 12 Dec 2009 14:46:24 -0500
Subject: [PATCH 55/62] add statuses/retweets to API

---
 actions/apistatusesretweets.php | 116 ++++++++++++++++++++++++++++++++
 classes/Notice.php              |  67 ++++++++++++++++++
 lib/router.php                  |   5 ++
 3 files changed, 188 insertions(+)
 create mode 100644 actions/apistatusesretweets.php

diff --git a/actions/apistatusesretweets.php b/actions/apistatusesretweets.php
new file mode 100644
index 0000000000..c54a374e28
--- /dev/null
+++ b/actions/apistatusesretweets.php
@@ -0,0 +1,116 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Show up to 100 repeats of a notice
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  API
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+require_once INSTALLDIR . '/lib/apiauth.php';
+require_once INSTALLDIR . '/lib/mediafile.php';
+
+/**
+ * Show up to 100 repeats of a notice
+ *
+ * @category API
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+
+class ApiStatusesRetweetsAction extends ApiAuthAction
+{
+    const MAXCOUNT = 100;
+
+    var $original = null;
+    var $cnt      = self::MAXCOUNT;
+
+    /**
+     * Take arguments for running
+     *
+     * @param array $args $_REQUEST args
+     *
+     * @return boolean success flag
+     *
+     */
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+
+        $id = $this->trimmed('id');
+
+        $this->original = Notice::staticGet('id', $id);
+
+        if (empty($this->original)) {
+            $this->clientError(_('No such notice'),
+                               400, $this->format);
+            return false;
+        }
+
+        $cnt = $this->trimmed('count');
+
+        if (empty($cnt) || !is_integer($cnt)) {
+            $cnt = 100;
+        } else {
+            $this->cnt = min((int)$cnt, self::MAXCOUNT);
+        }
+
+        return true;
+    }
+
+    /**
+     * Handle the request
+     *
+     * Make a new notice for the update, save it, and show it
+     *
+     * @param array $args $_REQUEST data (unused)
+     *
+     * @return void
+     */
+
+    function handle($args)
+    {
+        parent::handle($args);
+
+        $strm = $this->original->repeatStream($this->cnt);
+
+        switch ($this->format) {
+        case 'xml':
+            $this->showXmlTimeline($strm);
+            break;
+        case 'json':
+            $this->showJsonTimeline($strm);
+            break;
+        default:
+            $this->clientError(_('API method not found!'), $code = 404);
+            break;
+        }
+    }
+}
diff --git a/classes/Notice.php b/classes/Notice.php
index 82753fbdd6..ec80f763ff 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -441,10 +441,23 @@ class Notice extends Memcached_DataObject
         $this->blowTagCache($blowLast);
         $this->blowGroupCache($blowLast);
         $this->blowConversationCache($blowLast);
+        $this->blowRepeatCache();
         $profile = Profile::staticGet($this->profile_id);
         $profile->blowNoticeCount();
     }
 
+    function blowRepeatCache()
+    {
+        if (!empty($this->repeat_of)) {
+            $cache = common_memcache();
+            if (!empty($cache)) {
+                // XXX: only blow if <100 in cache
+                $ck = common_cache_key('notice:repeats:'.$this->repeat_of);
+                $result = $cache->delete($ck);
+            }
+        }
+    }
+
     function blowConversationCache($blowLast=false)
     {
         $cache = common_memcache();
@@ -1455,4 +1468,58 @@ class Notice extends Memcached_DataObject
         return self::saveNew($repeater_id, $content, $source,
                              array('repeat_of' => $this->id));
     }
+
+    // These are supposed to be in chron order!
+
+    function repeatStream($limit=100)
+    {
+        $cache = common_memcache();
+
+        if (empty($cache)) {
+            $ids = $this->_repeatStreamDirect($limit);
+        } else {
+            $idstr = $cache->get(common_cache_key('notice:repeats:'.$this->id));
+            if (!empty($idstr)) {
+                $ids = explode(',', $idstr);
+            } else {
+                $ids = $this->_repeatStreamDirect(100);
+                $cache->set(common_cache_key('notice:repeats:'.$this->id), implode(',', $ids));
+            }
+            if ($limit < 100) {
+                // We do a max of 100, so slice down to limit
+                $ids = array_slice($ids, 0, $limit);
+            }
+        }
+
+        return Notice::getStreamByIds($ids);
+    }
+
+    function _repeatStreamDirect($limit)
+    {
+        $notice = new Notice();
+
+        $notice->selectAdd(); // clears it
+        $notice->selectAdd('id');
+
+        $notice->repeat_of = $this->id;
+
+        $notice->orderBy('created'); // NB: asc!
+
+        if (!is_null($offset)) {
+            $notice->limit($offset, $limit);
+        }
+
+        $ids = array();
+
+        if ($notice->find()) {
+            while ($notice->fetch()) {
+                $ids[] = $notice->id;
+            }
+        }
+
+        $notice->free();
+        $notice = NULL;
+
+        return $ids;
+    }
 }
diff --git a/lib/router.php b/lib/router.php
index 835339720d..b0b95b080e 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -364,6 +364,11 @@ class Router
                               'id' => '[0-9]+',
                               'format' => '(xml|json)'));
 
+            $m->connect('api/statuses/retweets/:id.:format',
+                        array('action' => 'ApiStatusesRetweets',
+                              'id' => '[0-9]+',
+                              'format' => '(xml|json)'));
+
             // users
 
             $m->connect('api/users/show.:format',

From b42b2e1d05867b2dd4cdb3e1b7e278c63001d355 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sat, 12 Dec 2009 15:00:09 -0500
Subject: [PATCH 56/62] integer utility for arguments

---
 lib/action.php | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/lib/action.php b/lib/action.php
index 87d8a43993..dac0e2583c 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -951,6 +951,36 @@ class Action extends HTMLOutputter // lawsuit
         }
     }
 
+    /**
+     * Integer value of an argument
+     *
+     * @param string $key      query key we're interested in
+     * @param string $defValue optional default value (default null)
+     * @param string $maxValue optional max value (default null)
+     * @param string $minValue optional min value (default null)
+     *
+     * @return integer integer value
+     */
+
+    function int($key, $defValue=null, $maxValue=null, $minValue=null)
+    {
+        $arg = strtolower($this->trimmed($key));
+
+        if (is_null($arg) || !is_integer($arg)) {
+            return $defValue;
+        }
+
+        if (!is_null($maxValue)) {
+            $arg = min($arg, $maxValue);
+        }
+
+        if (!is_null($minValue)) {
+            $arg = max($arg, $minValue);
+        }
+
+        return $arg;
+    }
+
     /**
      * Server error
      *

From 138ce0cd05e2e59c79b29f5eeea5c11d1e56e931 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sat, 12 Dec 2009 15:35:05 -0500
Subject: [PATCH 57/62] add statuses/retweeted_by_me api action

---
 actions/apitimelineretweetedbyme.php | 126 +++++++++++++++++++++++++++
 classes/Notice.php                   |   9 ++
 classes/User.php                     |  52 +++++++++++
 lib/router.php                       |   4 +
 4 files changed, 191 insertions(+)
 create mode 100644 actions/apitimelineretweetedbyme.php

diff --git a/actions/apitimelineretweetedbyme.php b/actions/apitimelineretweetedbyme.php
new file mode 100644
index 0000000000..1e65678ad5
--- /dev/null
+++ b/actions/apitimelineretweetedbyme.php
@@ -0,0 +1,126 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Show authenticating user's most recent repeats
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  API
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+require_once INSTALLDIR . '/lib/apiauth.php';
+require_once INSTALLDIR . '/lib/mediafile.php';
+
+/**
+ * Show authenticating user's most recent repeats
+ *
+ * @category API
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+
+class ApiTimelineRetweetedByMeAction extends ApiAuthAction
+{
+    const DEFAULTCOUNT = 20;
+    const MAXCOUNT     = 200;
+    const MAXNOTICES   = 3200;
+
+    var $repeats  = null;
+    var $cnt      = self::DEFAULTCOUNT;
+    var $page     = 1;
+    var $since_id = null;
+    var $max_id   = null;
+
+    /**
+     * Take arguments for running
+     *
+     * @param array $args $_REQUEST args
+     *
+     * @return boolean success flag
+     *
+     */
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+
+        $cnt = $this->int('count', self::DEFAULTCOUNT, self::MAXCOUNT, 1);
+
+        $page = $this->int('page', 1, (self::MAXNOTICES/$this->cnt));
+
+        $since_id = $this->int('since_id');
+
+        $max_id = $this->int('max_id');
+
+        return true;
+    }
+
+    /**
+     * Handle the request
+     *
+     * show a timeline of the user's repeated notices
+     *
+     * @param array $args $_REQUEST data (unused)
+     *
+     * @return void
+     */
+
+    function handle($args)
+    {
+        parent::handle($args);
+
+        $offset = ($this->page-1) * $this->cnt;
+        $limit  = $this->cnt;
+
+        $strm = $this->auth_user->repeatedByMe($offset, $limit, $this->since_id, $this->max_id);
+
+        switch ($this->format) {
+        case 'xml':
+            $this->showXmlTimeline($strm);
+            break;
+        case 'json':
+            $this->showJsonTimeline($strm);
+            break;
+        case 'atom':
+            $profile    = $this->auth_user->getProfile();
+
+            $title      = sprintf(_("Repeated by %s"), $this->auth_user->nickname);
+            $taguribase = common_config('integration', 'taguri');
+            $id         = "tag:$taguribase:RepeatedByMe:" . $this->auth_user->id;
+            $link       = common_local_url('showstream',
+                                           array('nickname' => $this->auth_user->nickname));
+
+            $this->showAtomTimeline($strm, $title, $id, $link);
+            break;
+
+        default:
+            $this->clientError(_('API method not found!'), $code = 404);
+            break;
+        }
+    }
+}
diff --git a/classes/Notice.php b/classes/Notice.php
index ec80f763ff..6a701ae0cd 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -454,6 +454,15 @@ class Notice extends Memcached_DataObject
                 // XXX: only blow if <100 in cache
                 $ck = common_cache_key('notice:repeats:'.$this->repeat_of);
                 $result = $cache->delete($ck);
+
+                $user = User::staticGet('id', $this->profile_id);
+
+                if (!empty($user)) {
+                    $uk = common_cache_key('user:repeated_by_me:'.$user->id);
+                    $cache->delete($uk);
+                    $user->free();
+                    unset($user);
+                }
             }
         }
     }
diff --git a/classes/User.php b/classes/User.php
index 2a4fab7d43..4b7365fc7a 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -741,4 +741,56 @@ class User extends Memcached_DataObject
         $profile = $this->getProfile();
         return $profile->isSilenced();
     }
+
+    function repeatedByMe($offset=0, $limit=20, $since_id=null, $max_id=null)
+    {
+        $ids = Notice::stream(array($this, '_repeatedByMeDirect'),
+                              array(),
+                              'user:repeated_by_me:'.$this->id,
+                              $offset, $limit, $since_id, $max_id, null);
+
+        return Notice::getStreamByIds($ids);
+    }
+
+    function _repeatedByMeDirect($offset, $limit, $since_id, $max_id, $since)
+    {
+        $notice = new Notice();
+
+        $notice->selectAdd(); // clears it
+        $notice->selectAdd('id');
+
+        $notice->profile_id = $this->id;
+        $notice->whereAdd('repeat_of IS NOT NULL');
+
+        $notice->orderBy('id DESC');
+
+        if (!is_null($offset)) {
+            $notice->limit($offset, $limit);
+        }
+
+        if ($since_id != 0) {
+            $notice->whereAdd('id > ' . $since_id);
+        }
+
+        if ($max_id != 0) {
+            $notice->whereAdd('id <= ' . $max_id);
+        }
+
+        if (!is_null($since)) {
+            $notice->whereAdd('created > \'' . date('Y-m-d H:i:s', $since) . '\'');
+        }
+
+        $ids = array();
+
+        if ($notice->find()) {
+            while ($notice->fetch()) {
+                $ids[] = $notice->id;
+            }
+        }
+
+        $notice->free();
+        $notice = NULL;
+
+        return $ids;
+    }
 }
diff --git a/lib/router.php b/lib/router.php
index b0b95b080e..5c1bd3c4ff 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -319,6 +319,10 @@ class Router
                               'id' => '[a-zA-Z0-9]+',
                               'format' => '(xml|json|rss|atom)'));
 
+            $m->connect('api/statuses/retweeted_by_me.:format',
+                        array('action' => 'ApiTimelineRetweetedByMe',
+                              'format' => '(xml|json|atom)'));
+
             $m->connect('api/statuses/friends.:format',
                         array('action' => 'ApiUserFriends',
                               'format' => '(xml|json)'));

From cfe67a9c0192129448ea3f0b98aadf49e962fd4d Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sat, 12 Dec 2009 16:00:27 -0500
Subject: [PATCH 58/62] add statuses/retweets_of_me to API

---
 actions/apitimelineretweetsofme.php | 126 ++++++++++++++++++++++++++++
 classes/Notice.php                  |  14 ++++
 classes/User.php                    |  53 ++++++++++++
 lib/router.php                      |   4 +
 4 files changed, 197 insertions(+)
 create mode 100644 actions/apitimelineretweetsofme.php

diff --git a/actions/apitimelineretweetsofme.php b/actions/apitimelineretweetsofme.php
new file mode 100644
index 0000000000..479bff4315
--- /dev/null
+++ b/actions/apitimelineretweetsofme.php
@@ -0,0 +1,126 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Show authenticating user's most recent notices that have been repeated
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  API
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+require_once INSTALLDIR . '/lib/apiauth.php';
+require_once INSTALLDIR . '/lib/mediafile.php';
+
+/**
+ * Show authenticating user's most recent notices that have been repeated
+ *
+ * @category API
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+
+class ApiTimelineRetweetsOfMeAction extends ApiAuthAction
+{
+    const DEFAULTCOUNT = 20;
+    const MAXCOUNT     = 200;
+    const MAXNOTICES   = 3200;
+
+    var $repeats  = null;
+    var $cnt      = self::DEFAULTCOUNT;
+    var $page     = 1;
+    var $since_id = null;
+    var $max_id   = null;
+
+    /**
+     * Take arguments for running
+     *
+     * @param array $args $_REQUEST args
+     *
+     * @return boolean success flag
+     *
+     */
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+
+        $cnt = $this->int('count', self::DEFAULTCOUNT, self::MAXCOUNT, 1);
+
+        $page = $this->int('page', 1, (self::MAXNOTICES/$this->cnt));
+
+        $since_id = $this->int('since_id');
+
+        $max_id = $this->int('max_id');
+
+        return true;
+    }
+
+    /**
+     * Handle the request
+     *
+     * show a timeline of the user's repeated notices
+     *
+     * @param array $args $_REQUEST data (unused)
+     *
+     * @return void
+     */
+
+    function handle($args)
+    {
+        parent::handle($args);
+
+        $offset = ($this->page-1) * $this->cnt;
+        $limit  = $this->cnt;
+
+        $strm = $this->auth_user->repeatsOfMe($offset, $limit, $this->since_id, $this->max_id);
+
+        switch ($this->format) {
+        case 'xml':
+            $this->showXmlTimeline($strm);
+            break;
+        case 'json':
+            $this->showJsonTimeline($strm);
+            break;
+        case 'atom':
+            $profile    = $this->auth_user->getProfile();
+
+            $title      = sprintf(_("Repeats of %s"), $this->auth_user->nickname);
+            $taguribase = common_config('integration', 'taguri');
+            $id         = "tag:$taguribase:RepeatsOfMe:" . $this->auth_user->id;
+            $link       = common_local_url('showstream',
+                                           array('nickname' => $this->auth_user->nickname));
+
+            $this->showAtomTimeline($strm, $title, $id, $link);
+            break;
+
+        default:
+            $this->clientError(_('API method not found!'), $code = 404);
+            break;
+        }
+    }
+}
diff --git a/classes/Notice.php b/classes/Notice.php
index 6a701ae0cd..eb611f314f 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -463,6 +463,20 @@ class Notice extends Memcached_DataObject
                     $user->free();
                     unset($user);
                 }
+
+                $original = Notice::staticGet('id', $this->repeat_of);
+
+                if (!empty($original)) {
+                    $originalUser = User::staticGet('id', $original->profile_id);
+                    if (!empty($originalUser)) {
+                        $ouk = common_cache_key('user:repeats_of_me:'.$originalUser->id);
+                        $cache->delete($ouk);
+                        $originalUser->free();
+                        unset($originalUser);
+                    }
+                    $original->free();
+                    unset($original);
+                }
             }
         }
     }
diff --git a/classes/User.php b/classes/User.php
index 4b7365fc7a..b3da448a68 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -793,4 +793,57 @@ class User extends Memcached_DataObject
 
         return $ids;
     }
+
+    function repeatsOfMe($offset=0, $limit=20, $since_id=null, $max_id=null)
+    {
+        $ids = Notice::stream(array($this, '_repeatsOfMeDirect'),
+                              array(),
+                              'user:repeats_of_me:'.$this->id,
+                              $offset, $limit, $since_id, $max_id, null);
+
+        return Notice::getStreamByIds($ids);
+    }
+
+    function _repeatsOfMeDirect($offset, $limit, $since_id, $max_id, $since)
+    {
+        $qry =
+          'SELECT DISTINCT original.id AS id ' .
+          'FROM notice original JOIN notice rept ON original.id = rept.repeat_of ' .
+          'WHERE original.profile_id = ' . $this->id . ' ';
+
+        if ($since_id != 0) {
+            $qry .= 'AND original.id > ' . $since_id . ' ';
+        }
+
+        if ($max_id != 0) {
+            $qry .= 'AND original.id <= ' . $max_id . ' ';
+        }
+
+        if (!is_null($since)) {
+            $qry .= 'AND original.modified > \'' . date('Y-m-d H:i:s', $since) . '\' ';
+        }
+
+        // NOTE: we sort by fave time, not by notice time!
+
+        $qry .= 'ORDER BY original.id DESC ';
+
+        if (!is_null($offset)) {
+            $qry .= "LIMIT $limit OFFSET $offset";
+        }
+
+        $ids = array();
+
+        $notice = new Notice();
+
+        $notice->query($qry);
+
+        while ($notice->fetch()) {
+            $ids[] = $notice->id;
+        }
+
+        $notice->free();
+        $notice = NULL;
+
+        return $ids;
+    }
 }
diff --git a/lib/router.php b/lib/router.php
index 5c1bd3c4ff..732caa1c7e 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -323,6 +323,10 @@ class Router
                         array('action' => 'ApiTimelineRetweetedByMe',
                               'format' => '(xml|json|atom)'));
 
+            $m->connect('api/statuses/retweets_of_me.:format',
+                        array('action' => 'ApiTimelineRetweetsOfMe',
+                              'format' => '(xml|json|atom)'));
+
             $m->connect('api/statuses/friends.:format',
                         array('action' => 'ApiUserFriends',
                               'format' => '(xml|json)'));

From 698b28c95c9d4fa5cb404395b2c90b10a438fcd5 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sat, 12 Dec 2009 16:02:44 -0500
Subject: [PATCH 59/62] clear repeat_of flag when a notice is deleted

---
 classes/Notice.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/classes/Notice.php b/classes/Notice.php
index eb611f314f..a7b0f8cdbc 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -115,6 +115,12 @@ class Notice extends Memcached_DataObject
 
         //Null any notices that are replies to this notice
         $this->query(sprintf("UPDATE notice set reply_to = null WHERE reply_to = %d", $this->id));
+
+        //Null any notices that are repeats of this notice
+        //XXX: probably need to uncache these, too
+
+        $this->query(sprintf("UPDATE notice set repeat_of = null WHERE repeat_of = %d", $this->id));
+
         $related = array('Reply',
                          'Fave',
                          'Notice_tag',

From 1ec54d3433a79f56c14c0a99114bb1e607348899 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sat, 12 Dec 2009 16:15:23 -0500
Subject: [PATCH 60/62] add statuses/retweeted_to_me to API

---
 actions/apitimelineretweetedtome.php | 125 +++++++++++++++++++++++++++
 classes/Notice.php                   |  14 +++
 classes/User.php                     |  54 ++++++++++++
 lib/router.php                       |   4 +
 4 files changed, 197 insertions(+)
 create mode 100644 actions/apitimelineretweetedtome.php

diff --git a/actions/apitimelineretweetedtome.php b/actions/apitimelineretweetedtome.php
new file mode 100644
index 0000000000..681b0b9e9e
--- /dev/null
+++ b/actions/apitimelineretweetedtome.php
@@ -0,0 +1,125 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Show most recent notices that are repeats in user's inbox
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  API
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+require_once INSTALLDIR . '/lib/apiauth.php';
+
+/**
+ * Show most recent notices that are repeats in user's inbox
+ *
+ * @category API
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+
+class ApiTimelineRetweetedToMeAction extends ApiAuthAction
+{
+    const DEFAULTCOUNT = 20;
+    const MAXCOUNT     = 200;
+    const MAXNOTICES   = 3200;
+
+    var $repeats  = null;
+    var $cnt      = self::DEFAULTCOUNT;
+    var $page     = 1;
+    var $since_id = null;
+    var $max_id   = null;
+
+    /**
+     * Take arguments for running
+     *
+     * @param array $args $_REQUEST args
+     *
+     * @return boolean success flag
+     *
+     */
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+
+        $cnt = $this->int('count', self::DEFAULTCOUNT, self::MAXCOUNT, 1);
+
+        $page = $this->int('page', 1, (self::MAXNOTICES/$this->cnt));
+
+        $since_id = $this->int('since_id');
+
+        $max_id = $this->int('max_id');
+
+        return true;
+    }
+
+    /**
+     * Handle the request
+     *
+     * show a timeline of the user's repeated notices
+     *
+     * @param array $args $_REQUEST data (unused)
+     *
+     * @return void
+     */
+
+    function handle($args)
+    {
+        parent::handle($args);
+
+        $offset = ($this->page-1) * $this->cnt;
+        $limit  = $this->cnt;
+
+        $strm = $this->auth_user->repeatedToMe($offset, $limit, $this->since_id, $this->max_id);
+
+        switch ($this->format) {
+        case 'xml':
+            $this->showXmlTimeline($strm);
+            break;
+        case 'json':
+            $this->showJsonTimeline($strm);
+            break;
+        case 'atom':
+            $profile    = $this->auth_user->getProfile();
+
+            $title      = sprintf(_("Repeated to %s"), $this->auth_user->nickname);
+            $taguribase = common_config('integration', 'taguri');
+            $id         = "tag:$taguribase:RepeatedToMe:" . $this->auth_user->id;
+            $link       = common_local_url('all',
+                                           array('nickname' => $this->auth_user->nickname));
+
+            $this->showAtomTimeline($strm, $title, $id, $link);
+            break;
+
+        default:
+            $this->clientError(_('API method not found!'), $code = 404);
+            break;
+        }
+    }
+}
diff --git a/classes/Notice.php b/classes/Notice.php
index a7b0f8cdbc..7d2b898d26 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -483,6 +483,20 @@ class Notice extends Memcached_DataObject
                     $original->free();
                     unset($original);
                 }
+
+                $ni = new Notice_inbox();
+
+                $ni->notice_id = $this->id;
+
+                if ($ni->find()) {
+                    while ($ni->fetch()) {
+                        $tmk = common_cache_key('user:repeated_to_me:'.$ni->user_id);
+                        $cache->delete($tmk);
+                    }
+                }
+
+                $ni->free();
+                unset($ni);
             }
         }
     }
diff --git a/classes/User.php b/classes/User.php
index b3da448a68..9c071e06b0 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -846,4 +846,58 @@ class User extends Memcached_DataObject
 
         return $ids;
     }
+
+    function repeatedToMe($offset=0, $limit=20, $since_id=null, $max_id=null)
+    {
+        $ids = Notice::stream(array($this, '_repeatedToMeDirect'),
+                              array(),
+                              'user:repeated_to_me:'.$this->id,
+                              $offset, $limit, $since_id, $max_id, null);
+
+        return Notice::getStreamByIds($ids);
+    }
+
+    function _repeatedToMeDirect($offset, $limit, $since_id, $max_id, $since)
+    {
+        $qry =
+          'SELECT notice.id AS id ' .
+          'FROM notice JOIN notice_inbox ON notice.id = notice_inbox.notice_id ' .
+          'WHERE notice_inbox.user_id = ' . $this->id . ' ' .
+          'AND notice.repeat_of IS NOT NULL ';
+
+        if ($since_id != 0) {
+            $qry .= 'AND notice.id > ' . $since_id . ' ';
+        }
+
+        if ($max_id != 0) {
+            $qry .= 'AND notice.id <= ' . $max_id . ' ';
+        }
+
+        if (!is_null($since)) {
+            $qry .= 'AND notice.modified > \'' . date('Y-m-d H:i:s', $since) . '\' ';
+        }
+
+        // NOTE: we sort by fave time, not by notice time!
+
+        $qry .= 'ORDER BY notice.id DESC ';
+
+        if (!is_null($offset)) {
+            $qry .= "LIMIT $limit OFFSET $offset";
+        }
+
+        $ids = array();
+
+        $notice = new Notice();
+
+        $notice->query($qry);
+
+        while ($notice->fetch()) {
+            $ids[] = $notice->id;
+        }
+
+        $notice->free();
+        $notice = NULL;
+
+        return $ids;
+    }
 }
diff --git a/lib/router.php b/lib/router.php
index 732caa1c7e..8f68f86ac7 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -323,6 +323,10 @@ class Router
                         array('action' => 'ApiTimelineRetweetedByMe',
                               'format' => '(xml|json|atom)'));
 
+            $m->connect('api/statuses/retweeted_to_me.:format',
+                        array('action' => 'ApiTimelineRetweetedToMe',
+                              'format' => '(xml|json|atom)'));
+
             $m->connect('api/statuses/retweets_of_me.:format',
                         array('action' => 'ApiTimelineRetweetsOfMe',
                               'format' => '(xml|json|atom)'));

From 304ba80a0f39340c9bb4f15b631cbccf5949afbd Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sat, 12 Dec 2009 16:33:38 -0500
Subject: [PATCH 61/62] make sure to show repeats correctly when original is
 deleted

---
 lib/noticelist.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/noticelist.php b/lib/noticelist.php
index 7319a62ea7..aa6ea278c9 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -167,8 +167,13 @@ class NoticeListItem extends Widget
     {
         parent::__construct($out);
         if (!empty($notice->repeat_of)) {
-            $this->notice = Notice::staticGet('id', $notice->repeat_of);
-            $this->repeat = $notice;
+            $original = Notice::staticGet('id', $notice->repeat_of);
+            if (empty($original)) { // could have been deleted
+                $this->notice = $notice;
+            } else {
+                $this->notice = $original;
+                $this->repeat = $notice;
+            }
         } else {
             $this->notice  = $notice;
         }

From 438a0d7f1c23d176f380d6f5dba181ec54722b83 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sat, 12 Dec 2009 16:58:39 -0500
Subject: [PATCH 62/62] remove obsoleted getStream, getStreamDirect,
 getCachedStream from Notice; use stream() instead

---
 classes/Notice.php | 187 ---------------------------------------------
 1 file changed, 187 deletions(-)

diff --git a/classes/Notice.php b/classes/Notice.php
index 7d2b898d26..66d9cf5d47 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -655,193 +655,6 @@ class Notice extends Memcached_DataObject
         }
     }
 
-    # XXX: too many args; we need to move to named params or even a separate
-    # class for notice streams
-
-    static function getStream($qry, $cachekey, $offset=0, $limit=20, $since_id=0, $max_id=0, $order=null, $since=null) {
-
-        if (common_config('memcached', 'enabled')) {
-
-            # Skip the cache if this is a since, since_id or max_id qry
-            if ($since_id > 0 || $max_id > 0 || $since) {
-                return Notice::getStreamDirect($qry, $offset, $limit, $since_id, $max_id, $order, $since);
-            } else {
-                return Notice::getCachedStream($qry, $cachekey, $offset, $limit, $order);
-            }
-        }
-
-        return Notice::getStreamDirect($qry, $offset, $limit, $since_id, $max_id, $order, $since);
-    }
-
-    static function getStreamDirect($qry, $offset, $limit, $since_id, $max_id, $order, $since) {
-
-        $needAnd = false;
-        $needWhere = true;
-
-        if (preg_match('/\bWHERE\b/i', $qry)) {
-            $needWhere = false;
-            $needAnd = true;
-        }
-
-        if ($since_id > 0) {
-
-            if ($needWhere) {
-                $qry .= ' WHERE ';
-                $needWhere = false;
-            } else {
-                $qry .= ' AND ';
-            }
-
-            $qry .= ' notice.id > ' . $since_id;
-        }
-
-        if ($max_id > 0) {
-
-            if ($needWhere) {
-                $qry .= ' WHERE ';
-                $needWhere = false;
-            } else {
-                $qry .= ' AND ';
-            }
-
-            $qry .= ' notice.id <= ' . $max_id;
-        }
-
-        if ($since) {
-
-            if ($needWhere) {
-                $qry .= ' WHERE ';
-                $needWhere = false;
-            } else {
-                $qry .= ' AND ';
-            }
-
-            $qry .= ' notice.created > \'' . date('Y-m-d H:i:s', $since) . '\'';
-        }
-
-        # Allow ORDER override
-
-        if ($order) {
-            $qry .= $order;
-        } else {
-            $qry .= ' ORDER BY notice.created DESC, notice.id DESC ';
-        }
-
-        if (common_config('db','type') == 'pgsql') {
-            $qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset;
-        } else {
-            $qry .= ' LIMIT ' . $offset . ', ' . $limit;
-        }
-
-        $notice = new Notice();
-
-        $notice->query($qry);
-
-        return $notice;
-    }
-
-    # XXX: this is pretty long and should probably be broken up into
-    # some helper functions
-
-    static function getCachedStream($qry, $cachekey, $offset, $limit, $order) {
-
-        # If outside our cache window, just go to the DB
-
-        if ($offset + $limit > NOTICE_CACHE_WINDOW) {
-            return Notice::getStreamDirect($qry, $offset, $limit, null, null, $order, null);
-        }
-
-        # Get the cache; if we can't, just go to the DB
-
-        $cache = common_memcache();
-
-        if (empty($cache)) {
-            return Notice::getStreamDirect($qry, $offset, $limit, null, null, $order, null);
-        }
-
-        # Get the notices out of the cache
-
-        $notices = $cache->get(common_cache_key($cachekey));
-
-        # On a cache hit, return a DB-object-like wrapper
-
-        if ($notices !== false) {
-            $wrapper = new ArrayWrapper(array_slice($notices, $offset, $limit));
-            return $wrapper;
-        }
-
-        # If the cache was invalidated because of new data being
-        # added, we can try and just get the new stuff. We keep an additional
-        # copy of the data at the key + ';last'
-
-        # No cache hit. Try to get the *last* cached version
-
-        $last_notices = $cache->get(common_cache_key($cachekey) . ';last');
-
-        if ($last_notices) {
-
-            # Reverse-chron order, so last ID is last.
-
-            $last_id = $last_notices[0]->id;
-
-            # XXX: this assumes monotonically increasing IDs; a fair
-            # bet with our DB.
-
-            $new_notice = Notice::getStreamDirect($qry, 0, NOTICE_CACHE_WINDOW,
-                                                  $last_id, null, $order, null);
-
-            if ($new_notice) {
-                $new_notices = array();
-                while ($new_notice->fetch()) {
-                    $new_notices[] = clone($new_notice);
-                }
-                $new_notice->free();
-                $notices = array_slice(array_merge($new_notices, $last_notices),
-                                       0, NOTICE_CACHE_WINDOW);
-
-                # Store the array in the cache for next time
-
-                $result = $cache->set(common_cache_key($cachekey), $notices);
-                $result = $cache->set(common_cache_key($cachekey) . ';last', $notices);
-
-                # return a wrapper of the array for use now
-
-                return new ArrayWrapper(array_slice($notices, $offset, $limit));
-            }
-        }
-
-        # Otherwise, get the full cache window out of the DB
-
-        $notice = Notice::getStreamDirect($qry, 0, NOTICE_CACHE_WINDOW, null, null, $order, null);
-
-        # If there are no hits, just return the value
-
-        if (empty($notice)) {
-            return $notice;
-        }
-
-        # Pack results into an array
-
-        $notices = array();
-
-        while ($notice->fetch()) {
-            $notices[] = clone($notice);
-        }
-
-        $notice->free();
-
-        # Store the array in the cache for next time
-
-        $result = $cache->set(common_cache_key($cachekey), $notices);
-        $result = $cache->set(common_cache_key($cachekey) . ';last', $notices);
-
-        # return a wrapper of the array for use now
-
-        $wrapper = new ArrayWrapper(array_slice($notices, $offset, $limit));
-
-        return $wrapper;
-    }
-
     function getStreamByIds($ids)
     {
         $cache = common_memcache();