Merge branch '0.9.x' into 1.0.x

81 files changed, 17310 insertions, 10637 deletions

diff --git a/actions/apistatusesupdate.php b/actions/apistatusesupdate.php
index 666ed9fa3..1a3b54900 100644
--- a/actions/apistatusesupdate.php
+++ b/actions/apistatusesupdate.php
@@ -55,7 +55,7 @@
     Yes
 
     @param status (Required) The URL-encoded text of the status update.
-    @param source (Optional) The source of the status.
+    @param source (Optional) The source application name, if using HTTP authentication or an anonymous OAuth consumer.
     @param in_reply_to_status_id (Optional) The ID of an existing status that the update is in reply to.
     @param lat (Optional) The latitude the status refers to.
     @param long (Optional) The longitude the status refers to.
@@ -67,7 +67,7 @@
     @subsection usagenotes Usage notes
 
     @li The URL pattern is relative to the @ref apiroot.
-    @li If the @e source parameter is not supplied the source of the status will default to 'api'.
+    @li If the @e source parameter is not supplied the source of the status will default to 'api'. When authenticated via a registered OAuth application, the application's registered name and URL will always override the source parameter.
     @li The XML response uses <a href="http://georss.org/Main_Page">GeoRSS</a>
     to encode the latitude and longitude (see example response below <georss:point>).
     @li Data uploaded via the @e media parameter should be multipart/form-data encoded.
diff --git a/actions/invite.php b/actions/invite.php
index 2779437e0..e9adb3b7f 100644
--- a/actions/invite.php
+++ b/actions/invite.php
@@ -142,7 +142,7 @@ class InviteAction extends CurrentUserDesignAction
             $this->elementStart('ul');
             foreach ($this->already as $other) {
                 // TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
-                $this->element('li', null, sprintf(_('%1$s (%2$s)'), $other->nickname, $other->email));
+                $this->element('li', null, sprintf(_m('INVITE','%1$s (%2$s)'), $other->nickname, $other->email));
             }
             $this->elementEnd('ul');
         }
@@ -156,7 +156,7 @@ class InviteAction extends CurrentUserDesignAction
             $this->elementStart('ul');
             foreach ($this->subbed as $other) {
                 // TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-                $this->element('li', null, sprintf(_('%1$s (%2$s)'), $other->nickname, $other->email));
+                $this->element('li', null, sprintf(_m('INVITE','%1$s (%2$s)'), $other->nickname, $other->email));
             }
             $this->elementEnd('ul');
         }
diff --git a/actions/oembed.php b/actions/oembed.php
index e25e4cb25..da3aa0c71 100644
--- a/actions/oembed.php
+++ b/actions/oembed.php
@@ -79,11 +79,7 @@ class OembedAction extends Action
                     if (empty($profile)) {
                         $this->serverError(_('Notice has no profile.'), 500);
                     }
-                    if (!empty($profile->fullname)) {
-                        $authorname = $profile->fullname . ' (' . $profile->nickname . ')';
-                    } else {
-                        $authorname = $profile->nickname;
-                    }
+                    $authorname = $profile->getFancyName();
                     $oembed['title'] = sprintf(_('%1$s\'s status on %2$s'),
                         $authorname,
                         common_exact_date($notice->created));
diff --git a/actions/showgroup.php b/actions/showgroup.php
index c87282844..f38cd420a 100644
--- a/actions/showgroup.php
+++ b/actions/showgroup.php
@@ -68,12 +68,7 @@ class ShowgroupAction extends GroupDesignAction
      */
     function title()
     {
-        if (!empty($this->group->fullname)) {
-            // @todo FIXME: Needs proper i18n. Maybe use a generic method for this?
-            $base = $this->group->fullname . ' (' . $this->group->nickname . ')';
-        } else {
-            $base = $this->group->nickname;
-        }
+        $base = $this->group->getFancyName();
 
         if ($this->page == 1) {
             // TRANS: Page title for first group page. %s is a group name.
diff --git a/actions/shownotice.php b/actions/shownotice.php
index 5b3ec93de..653461731 100644
--- a/actions/shownotice.php
+++ b/actions/shownotice.php
@@ -167,11 +167,7 @@ class ShownoticeAction extends OwnerDesignAction
 
     function title()
     {
-        if (!empty($this->profile->fullname)) {
-            $base = $this->profile->fullname . ' (' . $this->profile->nickname . ')';
-        } else {
-            $base = $this->profile->nickname;
-        }
+        $base = $this->profile->getFancyName();
 
         return sprintf(_('%1$s\'s status on %2$s'),
                        $base,
diff --git a/actions/showstream.php b/actions/showstream.php
index dabdcd103..702edd732 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -66,17 +66,19 @@ class ShowstreamAction extends ProfileAction
         $base = $this->profile->getFancyName();
         if (!empty($this->tag)) {
             if ($this->page == 1) {
-                // TRANS: Page title showing tagged notices in one user's stream. Param 1 is the username, 2 is the hash tag.
+                // TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
                 return sprintf(_('%1$s tagged %2$s'), $base, $this->tag);
             } else {
-                // TRANS: Page title showing tagged notices in one user's stream. Param 1 is the username, 2 is the hash tag, 3 is the page number.
+                // TRANS: Page title showing tagged notices in one user's stream.
+                // TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
                 return sprintf(_('%1$s tagged %2$s, page %3$d'), $base, $this->tag, $this->page);
             }
         } else {
             if ($this->page == 1) {
                 return $base;
             } else {
-                // TRANS: Extended page title showing tagged notices in one user's stream. Param 1 is the username, param 2 is the page number.
+                // TRANS: Extended page title showing tagged notices in one user's stream.
+                // TRANS: %1$s is the username, %2$d is the page number.
                 return sprintf(_('%1$s, page %2$d'),
                                $base,
                                $this->page);
@@ -120,6 +122,8 @@ class ShowstreamAction extends ProfileAction
                                   common_local_url('userrss',
                                                    array('nickname' => $this->user->nickname,
                                                          'tag' => $this->tag)),
+                                  // TRANS: Title for link to notice feed.
+                                  // TRANS: %1$s is a user nickname, %2$s is a hashtag.
                                   sprintf(_('Notice feed for %1$s tagged %2$s (RSS 1.0)'),
                                           $this->user->nickname, $this->tag)));
         }
@@ -127,6 +131,8 @@ class ShowstreamAction extends ProfileAction
         return array(new Feed(Feed::RSS1,
                               common_local_url('userrss',
                                                array('nickname' => $this->user->nickname)),
+                              // TRANS: Title for link to notice feed.
+                              // TRANS: %s is a user nickname.
                               sprintf(_('Notice feed for %s (RSS 1.0)'),
                                       $this->user->nickname)),
                      new Feed(Feed::RSS2,
@@ -134,6 +140,8 @@ class ShowstreamAction extends ProfileAction
                                                array(
                                                     'id' => $this->user->id,
                                                     'format' => 'rss')),
+                              // TRANS: Title for link to notice feed.
+                              // TRANS: %s is a user nickname.
                               sprintf(_('Notice feed for %s (RSS 2.0)'),
                                       $this->user->nickname)),
                      new Feed(Feed::ATOM,
@@ -146,6 +154,8 @@ class ShowstreamAction extends ProfileAction
                      new Feed(Feed::FOAF,
                               common_local_url('foaf', array('nickname' =>
                                                              $this->user->nickname)),
+                              // TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
+                              // TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
                               sprintf(_('FOAF for %s'), $this->user->nickname)));
     }
 
@@ -191,17 +201,23 @@ class ShowstreamAction extends ProfileAction
 
     function showEmptyListMessage()
     {
-        $message = sprintf(_('This is the timeline for %1$s but %2$s hasn\'t posted anything yet.'), $this->user->nickname, $this->user->nickname) . ' ';
+        // TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
+        $message = sprintf(_('This is the timeline for %1$s, but %1$s hasn\'t posted anything yet.'), $this->user->nickname) . ' ';
 
         if (common_logged_in()) {
             $current_user = common_current_user();
             if ($this->user->id === $current_user->id) {
+                // TRANS: Second sentence of empty list message for a stream for the user themselves.
                 $message .= _('Seen anything interesting recently? You haven\'t posted any notices yet, now would be a good time to start :)');
             } else {
+                // TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+                // TRANS: This message contains a Markdown link. Keep "](" together.
                 $message .= sprintf(_('You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%%?status_textarea=%2$s).'), $this->user->nickname, '@' . $this->user->nickname);
             }
         }
         else {
+            // TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
+            // TRANS: This message contains a Markdown link. Keep "](" together.
             $message .= sprintf(_('Why not [register an account](%%%%action.register%%%%) and then nudge %s or post a notice to them.'), $this->user->nickname);
         }
 
@@ -237,11 +253,15 @@ class ShowstreamAction extends ProfileAction
     function showAnonymousMessage()
     {
         if (!(common_config('site','closed') || common_config('site','inviteonly'))) {
+            // TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+            // TRANS: This message contains a Markdown link. Keep "](" together.
             $m = sprintf(_('**%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%%%%))'),
                          $this->user->nickname, $this->user->nickname);
         } else {
+            // TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+            // TRANS: This message contains a Markdown link. Keep "](" together.
             $m = sprintf(_('**%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. '),
                          $this->user->nickname, $this->user->nickname);
@@ -281,7 +301,6 @@ class ProfileNoticeListItem extends DoFollowListItem
      *
      * @return void
      */
-
     function showRepeat()
     {
         if (!empty($this->repeat)) {
@@ -292,13 +311,14 @@ class ProfileNoticeListItem extends DoFollowListItem
                            'class' => 'url');
 
             if (!empty($this->profile->fullname)) {
-                $attrs['title'] = $this->profile->fullname . ' (' . $this->profile->nickname . ')';
+                $attrs['title'] = $this->getFancyName();
             }
 
             $this->out->elementStart('span', 'repeat');
 
             $text_link = XMLStringer::estring('a', $attrs, $this->profile->nickname);
 
+            // TRANS: Link to the author of a repeated notice. %s is a linked nickname.
             $this->out->raw(sprintf(_('Repeat of %s'), $text_link));
 
             $this->out->elementEnd('span');
diff --git a/classes/Profile.php b/classes/Profile.php
index 545950a9e..b56e508c6 100644
--- a/classes/Profile.php
+++ b/classes/Profile.php
@@ -161,7 +161,7 @@ class Profile extends Memcached_DataObject
     {
         if ($this->fullname) {
             // TRANS: Full name of a profile or group followed by nickname in parens
-            return sprintf(_('%1$s (%2$s)'), $this->fullname, $this->nickname);
+            return sprintf(_m('FANCYNAME','%1$s (%2$s)'), $this->fullname, $this->nickname);
         } else {
             return $this->nickname;
         }
diff --git a/classes/User_group.php b/classes/User_group.php
index 7d6e21914..60217e960 100644
--- a/classes/User_group.php
+++ b/classes/User_group.php
@@ -234,6 +234,22 @@ class User_group extends Memcached_DataObject
         return ($this->fullname) ? $this->fullname : $this->nickname;
     }
 
+    /**
+     * Gets the full name (if filled) with nickname as a parenthetical, or the nickname alone
+     * if no fullname is provided.
+     *
+     * @return string
+     */
+    function getFancyName()
+    {
+        if ($this->fullname) {
+            // TRANS: Full name of a profile or group followed by nickname in parens
+            return sprintf(_m('FANCYNAME','%1$s (%2$s)'), $this->fullname, $this->nickname);
+        } else {
+            return $this->nickname;
+        }
+    }
+
     function getAliases()
     {
         $aliases = array();
diff --git a/lib/action.php b/lib/action.php
index 766cfca26..427b85427 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -873,16 +873,17 @@ class Action extends HTMLOutputter // lawsuit
                             // TRANS: Secondary navigation menu option leading to privacy policy.
                             _('Privacy'));
             $this->menuItem(common_local_url('doc', array('title' => 'source')),
-                            // TRANS: Secondary navigation menu option.
+                            // TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
                             _('Source'));
             $this->menuItem(common_local_url('version'),
                             // TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
                             _('Version'));
             $this->menuItem(common_local_url('doc', array('title' => 'contact')),
-                            // TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
+                            // TRANS: Secondary navigation menu option leading to e-mail contact information on the
+                            // TRANS: StatusNet site, where to report bugs, ...
                             _('Contact'));
             $this->menuItem(common_local_url('doc', array('title' => 'badge')),
-                            // TRANS: Secondary navigation menu option.
+                            // TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
                             _('Badge'));
             Event::handle('EndSecondaryNav', array($this));
         }
diff --git a/lib/command.php b/lib/command.php
index bd8a4ebfe..a25ea4a9d 100644
--- a/lib/command.php
+++ b/lib/command.php
@@ -423,7 +423,7 @@ class WhoisCommand extends Command
 
         // TRANS: Whois output.
         // TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-        $whois = sprintf(_("%1\$s (%2\$s)"), $recipient->nickname,
+        $whois = sprintf(_m('WHOIS',"%1\$s (%2\$s)"), $recipient->nickname,
                          $recipient->profileurl);
         if ($recipient->fullname) {
             // TRANS: Whois output. %s is the full name of the queried user.
diff --git a/lib/mail.php b/lib/mail.php
index 30d743848..dd6a1a366 100644
--- a/lib/mail.php
+++ b/lib/mail.php
@@ -593,6 +593,10 @@ function mail_notify_fave($other, $user, $notice)
     }
 
     $profile = $user->getProfile();
+    if ($other->hasBlocked($profile)) {
+        // If the author has blocked us, don't spam them with a notification.
+        return;
+    }
 
     $bestname = $profile->getBestName();
 
diff --git a/lib/noticelist.php b/lib/noticelist.php
index df1533980..bdf2530b3 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -306,7 +306,7 @@ class NoticeListItem extends Widget
         $attrs = array('href' => $this->profile->profileurl,
                        'class' => 'url');
         if (!empty($this->profile->fullname)) {
-            $attrs['title'] = $this->profile->fullname . ' (' . $this->profile->nickname . ')';
+            $attrs['title'] = $this->profile->getFancyName();
         }
         $this->out->elementStart('a', $attrs);
         $this->showAvatar();
diff --git a/lib/personalgroupnav.php b/lib/personalgroupnav.php
index 25db5baa9..1f543b897 100644
--- a/lib/personalgroupnav.php
+++ b/lib/personalgroupnav.php
@@ -87,8 +87,11 @@ class PersonalGroupNav extends Widget
         if ($nickname) {
             $user = User::staticGet('nickname', $nickname);
             $user_profile = $user->getProfile();
+            $name = $user_profile->getBestName();
         } else {
+            // @fixme can this happen? is this valid?
             $user_profile = false;
+            $name = $nickname;
         }
 
         $this->out->elementStart('ul', array('class' => 'nav'));
@@ -97,22 +100,22 @@ class PersonalGroupNav extends Widget
             $this->out->menuItem(common_local_url('all', array('nickname' =>
                                                            $nickname)),
                              _('Personal'),
-                             sprintf(_('%s and friends'), (($user_profile && $user_profile->fullname) ? $user_profile->fullname : $nickname)),
+                             sprintf(_('%s and friends'), $name),
                              $action == 'all', 'nav_timeline_personal');
             $this->out->menuItem(common_local_url('replies', array('nickname' =>
                                                                   $nickname)),
                              _('Replies'),
-                             sprintf(_('Replies to %s'), (($user_profile && $user_profile->fullname) ? $user_profile->fullname : $nickname)),
+                             sprintf(_('Replies to %s'), $name),
                              $action == 'replies', 'nav_timeline_replies');
             $this->out->menuItem(common_local_url('showstream', array('nickname' =>
                                                                   $nickname)),
                              _('Profile'),
-                             ($user_profile && $user_profile->fullname) ? $user_profile->fullname : $nickname,
+                             $name,
                              $action == 'showstream', 'nav_profile');
             $this->out->menuItem(common_local_url('showfavorites', array('nickname' =>
                                                                   $nickname)),
                              _('Favorites'),
-                             sprintf(_('%s\'s favorite notices'), ($user_profile) ? $user_profile->getBestName() : _('User')),
+                             sprintf(_('%s\'s favorite notices'), ($user_profile) ? $name : _('User')),
                              $action == 'showfavorites', 'nav_timeline_favorites');
 
             $cur = common_current_user();
diff --git a/lib/util.php b/lib/util.php
index 5094b2712..1d4f5a549 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -1038,7 +1038,7 @@ function common_group_link($sender_id, $nickname)
         $attrs = array('href' => $group->permalink(),
                        'class' => 'url');
         if (!empty($group->fullname)) {
-            $attrs['title'] = $group->fullname . ' (' . $group->nickname . ')';
+            $attrs['title'] = $group->getFancyName();
         }
         $xs = new XMLStringer();
         $xs->elementStart('span', 'vcard');
diff --git a/locale/af/LC_MESSAGES/statusnet.po b/locale/af/LC_MESSAGES/statusnet.po
index 0a6f30d66..c99ac3b54 100644
--- a/locale/af/LC_MESSAGES/statusnet.po
+++ b/locale/af/LC_MESSAGES/statusnet.po
@@ -9,17 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-30 23:18+0000\n"
-"PO-Revision-Date: 2010-10-30 23:19:48+0000\n"
+"POT-Creation-Date: 2010-11-02 22:51+0000\n"
+"PO-Revision-Date: 2010-11-02 22:52:57+0000\n"
 "Language-Team: Afrikaans <http://translatewiki.net/wiki/Portal:af>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r75708); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r75875); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: af\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2010-10-30 09:48:40+0000\n"
+"X-POT-Import-Date: 2010-10-30 23:42:01+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -76,15 +76,20 @@ msgstr "Stoor toegangsinstellings"
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
+#. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
+#. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #: actions/accessadminpanel.php:193 actions/emailsettings.php:228
-#: actions/imsettings.php:187 actions/pathsadminpanel.php:512
-#: actions/profilesettings.php:201 actions/smssettings.php:209
-#: actions/subscriptions.php:246 lib/applicationeditform.php:355
+#: actions/imsettings.php:187 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: lib/applicationeditform.php:355 lib/groupeditform.php:207
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Stoor"
@@ -135,7 +140,7 @@ msgstr "Hierdie bladsy bestaan nie."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:495 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Onbekende gebruiker."
@@ -204,7 +209,9 @@ msgstr ""
 
 #. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:208
+#. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -558,8 +565,11 @@ msgstr "Volledige naam is te lang (maksimum 255 karakters)."
 #. TRANS: Group edit form validation error.
 #. TRANS: Form validation error in New application form.
 #. TRANS: %d is the maximum number of characters for the description.
+#. TRANS: Group create form validation error.
+#. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:220 actions/editapplication.php:201
 #: actions/editgroup.php:216 actions/newapplication.php:178
+#: actions/newgroup.php:152
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -719,14 +729,14 @@ msgstr ""
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:172 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:74
 #: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
 #: actions/groupunblock.php:65 actions/imsettings.php:230
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
-#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/othersettings.php:153 actions/passwordsettings.php:138
 #: actions/profilesettings.php:221 actions/recoverpassword.php:350
 #: actions/register.php:172 actions/remotesubscribe.php:77
 #: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
@@ -899,20 +909,21 @@ msgstr "U mag nie 'n ander gebruiker se status verwyder nie."
 
 #. TRANS: Client error displayed trying to repeat a non-existing notice through the API.
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
+#. TRANS: Error message displayed trying to delete a non-existing notice.
 #: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/deletenotice.php:58 actions/shownotice.php:92
+#: actions/deletenotice.php:61 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "Die kennisgewing bestaan nie."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:535
+#: actions/apistatusesretweet.php:83 lib/command.php:537
 msgid "Cannot repeat your own notice."
 msgstr "U kan nie u eie kennisgewings herhaal nie."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:541
+#: actions/apistatusesretweet.php:92 lib/command.php:543
 msgid "Already repeated that notice."
 msgstr "U het reeds die kennisgewing herhaal."
 
@@ -933,7 +944,8 @@ msgstr ""
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#: actions/apistatusesupdate.php:244
+#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
+#: lib/mailhandler.php:60
 #, fuzzy, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
@@ -948,7 +960,7 @@ msgstr "Die API-funksie is nie gevind nie."
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
-#: actions/apistatusesupdate.php:308
+#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
 #, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
@@ -1161,17 +1173,18 @@ msgstr ""
 msgid "Lost our file data."
 msgstr ""
 
-#: actions/avatarsettings.php:384
+#. TRANS: Success message for having updated a user avatar.
+#: actions/avatarsettings.php:385
 msgid "Avatar updated."
 msgstr "Die avatar is opgedateer."
 
 #. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
-#: actions/avatarsettings.php:388
+#: actions/avatarsettings.php:389
 msgid "Failed updating avatar."
 msgstr "Die opdatering van die avatar het gefaal."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:412
+#: actions/avatarsettings.php:413
 msgid "Avatar deleted."
 msgstr "Die avatar is verwyder."
 
@@ -1200,8 +1213,8 @@ msgstr ""
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:154 actions/deleteapplication.php:154
-#: actions/deletegroup.php:220 actions/deletenotice.php:150
+#: actions/block.php:154 actions/deleteapplication.php:157
+#: actions/deletegroup.php:220 actions/deletenotice.php:155
 #: actions/deleteuser.php:152 actions/groupblock.php:178
 msgctxt "BUTTON"
 msgid "No"
@@ -1219,8 +1232,8 @@ msgstr "Moenie hierdie gebruiker blokkeer nie"
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:161 actions/deleteapplication.php:161
-#: actions/deletegroup.php:227 actions/deletenotice.php:157
+#: actions/block.php:161 actions/deleteapplication.php:164
+#: actions/deletegroup.php:227 actions/deletenotice.php:162
 #: actions/deleteuser.php:159 actions/groupblock.php:185
 msgctxt "BUTTON"
 msgid "Yes"
@@ -1341,12 +1354,13 @@ msgstr "Die E-posadres bestaan reeds."
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
 #. TRANS: Server error thrown on database error updating IM preferences.
 #. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
 #. TRANS: Server error thrown when user profile settings could not be updated.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #: actions/confirmaddress.php:118 actions/emailsettings.php:331
 #: actions/emailsettings.php:477 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:174
+#: actions/imsettings.php:442 actions/othersettings.php:184
 #: actions/profilesettings.php:326 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
@@ -1382,16 +1396,19 @@ msgstr "Gesprek"
 msgid "Notices"
 msgstr "Kennisgewings"
 
-#: actions/deleteapplication.php:63
+#. TRANS: Client error displayed trying to delete an application while not logged in.
+#: actions/deleteapplication.php:62
 msgid "You must be logged in to delete an application."
 msgstr "U moet aangeteken alvorens u 'n aansoek kan skrap."
 
+#. TRANS: Client error displayed trying to delete an application that does not exist.
 #: actions/deleteapplication.php:71
 msgid "Application not found."
 msgstr "Die applikasie is nie gevind nie."
 
+#. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
-#: actions/deleteapplication.php:78 actions/editapplication.php:78
+#: actions/deleteapplication.php:79 actions/editapplication.php:78
 #: actions/showapplication.php:94
 msgid "You are not the owner of this application."
 msgstr "U is nie die eienaar van hierdie applikasie nie."
@@ -1399,15 +1416,18 @@ msgstr "U is nie die eienaar van hierdie applikasie nie."
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
 #: actions/newapplication.php:114 actions/showapplication.php:118
-#: lib/action.php:1354
+#: lib/action.php:1404
 msgid "There was a problem with your session token."
 msgstr ""
 
-#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+#. TRANS: Title for delete application page.
+#. TRANS: Fieldset legend on delete application page.
+#: actions/deleteapplication.php:124 actions/deleteapplication.php:149
 msgid "Delete application"
 msgstr "Skrap applikasie"
 
-#: actions/deleteapplication.php:149
+#. TRANS: Confirmation text on delete application page.
+#: actions/deleteapplication.php:152
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
 "about the application from the database, including all existing user "
@@ -1415,12 +1435,12 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:158
+#: actions/deleteapplication.php:161
 msgid "Do not delete this application"
 msgstr "Moenie die applikasie verwyder nie"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:164
+#: actions/deleteapplication.php:167
 msgid "Delete this application"
 msgstr "Skrap hierdie applikasie"
 
@@ -1456,13 +1476,14 @@ msgstr "Dit was nie moontlik om die groep by te werk nie."
 msgid "Deleted group %s"
 msgstr "%1$s het die groep %2$s verlaat"
 
-#. TRANS: Title.
+#. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
 #: actions/deletegroup.php:176 actions/deletegroup.php:202
 #, fuzzy
 msgid "Delete group"
 msgstr "Verwyder gebruiker"
 
+#. TRANS: Warning in form for deleleting a group.
 #: actions/deletegroup.php:206
 msgid ""
 "Are you sure you want to delete this group? This will clear all data about "
@@ -1482,10 +1503,11 @@ msgstr "Moenie hierdie kennisgewing verwyder nie"
 msgid "Delete this group"
 msgstr "Verwyder die gebruiker"
 
+#. TRANS: Error message displayed trying to delete a notice while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1495,31 +1517,36 @@ msgstr "Verwyder die gebruiker"
 msgid "Not logged in."
 msgstr "Nie aangeteken nie."
 
-#: actions/deletenotice.php:74
+#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
+#: actions/deletenotice.php:78
 msgid "Can't delete this notice."
 msgstr "Hierdie kennisgewing kan nie verwyder word nie."
 
-#: actions/deletenotice.php:106
+#. TRANS: Instructions for deleting a notice.
+#: actions/deletenotice.php:110
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
 msgstr ""
 
-#: actions/deletenotice.php:112 actions/deletenotice.php:144
+#. TRANS: Page title when deleting a notice.
+#. TRANS: Fieldset legend for the delete notice form.
+#: actions/deletenotice.php:117 actions/deletenotice.php:148
 msgid "Delete notice"
 msgstr "Verwyder kennisgewing"
 
-#: actions/deletenotice.php:147
+#. TRANS: Message for the delete notice form.
+#: actions/deletenotice.php:152
 msgid "Are you sure you want to delete this notice?"
 msgstr "Is u seker u wil hierdie kennisgewing verwyder?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:154
+#: actions/deletenotice.php:159
 msgid "Do not delete this notice"
 msgstr "Moenie hierdie kennisgewing verwyder nie"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:161 lib/noticelist.php:667
+#: actions/deletenotice.php:166 lib/noticelist.php:667
 msgid "Delete this notice"
 msgstr "Verwyder hierdie kennisgewing"
 
@@ -1683,11 +1710,9 @@ msgstr "Stel terug na standaard"
 
 #. TRANS: Submit button title.
 #: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
-#: actions/othersettings.php:126 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: actions/useradminpanel.php:295 lib/applicationeditform.php:357
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: lib/applicationeditform.php:357 lib/designsettings.php:256
 msgid "Save"
 msgstr "Stoor"
 
@@ -1736,9 +1761,9 @@ msgid "Name is required."
 msgstr "'n Naam is verpligtend."
 
 #. TRANS: Validation error shown when providing too long a name in the "Edit application" form.
-#: actions/editapplication.php:188
+#: actions/editapplication.php:188 actions/newapplication.php:169
 #, fuzzy
-msgid "Name is too long (max 255 characters)."
+msgid "Name is too long (maximum 255 characters)."
 msgstr "Die naam is te lank (maksimum 255 karakters)."
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
@@ -1767,7 +1792,7 @@ msgid "Organization is required."
 msgstr "Organisasie is verpligtend."
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#: actions/editapplication.php:223
+#: actions/editapplication.php:223 actions/newapplication.php:199
 #, fuzzy
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "Die organisasienaam is te lang (maksimum 255 karakters)."
@@ -2553,7 +2578,7 @@ msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr ""
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:180
+#: actions/imsettings.php:290 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "Voorkeure is gestoor."
 
@@ -2674,10 +2699,9 @@ msgstr[1] "U volg hierdie gebruiker:"
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#. TRANS: Whois output.
-#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:145 actions/invite.php:159 lib/command.php:426
-#, php-format
+#: actions/invite.php:145 actions/invite.php:159
+#, fuzzy, php-format
+msgctxt "INVITE"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
@@ -2828,8 +2852,9 @@ msgid ""
 msgstr ""
 
 #: actions/licenseadminpanel.php:156
-msgid "Invalid license title. Max length is 255 characters."
-msgstr ""
+#, fuzzy
+msgid "Invalid license title. Maximum length is 255 characters."
+msgstr "Ligging is te lank is (maksimum 255 karakters)."
 
 #: actions/licenseadminpanel.php:168
 msgid "Invalid license URL."
@@ -3000,20 +3025,10 @@ msgstr "U moet aangeteken wees alvorens u 'n applikasie kan wysig."
 msgid "Use this form to register a new application."
 msgstr "Gebruik die vorm om u applikasie te wysig."
 
-#: actions/newapplication.php:169
-#, fuzzy
-msgid "Name is too long (maximum 255 chars)."
-msgstr "Die naam is te lank (maksimum 255 karakters)."
-
 #: actions/newapplication.php:184
 msgid "Source URL is required."
 msgstr "'n Bron-URL is verpligtend."
 
-#: actions/newapplication.php:199
-#, fuzzy
-msgid "Organization is too long (maximum 255 chars)."
-msgstr "Die organisasienaam is te lang (maksimum 255 karakters)."
-
 #: actions/newapplication.php:266 actions/newapplication.php:275
 msgid "Could not create application."
 msgstr "Dit was nie moontlik om die applikasie te skep nie."
@@ -3034,14 +3049,14 @@ msgid "New message"
 msgstr "Nuwe boodskap"
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:499
+#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501
 msgid "You can't send a message to this user."
 msgstr "U kan nie 'n boodskap aan hierdie gebruiker stuur nie."
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
 #: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
-#: lib/command.php:579
+#: lib/command.php:581
 msgid "No content!"
 msgstr "Geen inhoud nie!"
 
@@ -3050,7 +3065,7 @@ msgid "No recipient specified."
 msgstr "Geen ontvanger gespesifiseer nie."
 
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:503
+#: actions/newmessage.php:167 lib/command.php:505
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -3061,12 +3076,12 @@ msgstr "Boodskap is gestuur."
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:511
+#: actions/newmessage.php:188 lib/command.php:513
 #, fuzzy, php-format
 msgid "Direct message to %s sent."
 msgstr "Direkte boodskappe aan %s"
 
-#: actions/newmessage.php:213 actions/newnotice.php:263
+#: actions/newmessage.php:213 actions/newnotice.php:264
 msgid "Ajax Error"
 msgstr "Ajax-fout"
 
@@ -3075,17 +3090,7 @@ msgstr "Ajax-fout"
 msgid "New notice"
 msgstr "Geen kennisgewing."
 
-#: actions/newnotice.php:159 lib/mailhandler.php:60
-#, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr "Die kennisgewing is te lank. Gebruik maksimum %d karakters."
-
-#: actions/newnotice.php:183
-#, php-format
-msgid "Max notice size is %d chars, including attachment URL."
-msgstr ""
-
-#: actions/newnotice.php:229
+#: actions/newnotice.php:230
 #, fuzzy
 msgid "Notice posted"
 msgstr "Hierdie kennisgewing is verwyder."
@@ -3253,39 +3258,48 @@ msgstr "Mense soek"
 msgid "Notice Search"
 msgstr "Mense soek"
 
-#: actions/othersettings.php:60
+#: actions/othersettings.php:59
 #, fuzzy
 msgid "Other settings"
 msgstr "Avatar-instellings"
 
+#. TRANS: Instructions for tab "Other" in user profile settings.
 #: actions/othersettings.php:71
 msgid "Manage various other options."
 msgstr ""
 
-#: actions/othersettings.php:108
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/othersettings.php:111
 msgid " (free service)"
-msgstr "(gratis diens)"
+msgstr " (gratis diens)"
 
-#: actions/othersettings.php:116
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/othersettings.php:120
 msgid "Shorten URLs with"
 msgstr ""
 
-#: actions/othersettings.php:117
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/othersettings.php:122
 msgid "Automatic shortening service to use."
 msgstr ""
 
-#: actions/othersettings.php:122
+#. TRANS: Label for checkbox.
+#: actions/othersettings.php:128
 #, fuzzy
 msgid "View profile designs"
 msgstr "Wysig profiel-instellings"
 
-#: actions/othersettings.php:123
+#. TRANS: Tooltip for checkbox.
+#: actions/othersettings.php:130
 msgid "Show or hide profile designs."
 msgstr ""
 
-#: actions/othersettings.php:153
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/othersettings.php:162
 #, fuzzy
-msgid "URL shortening service is too long (max 50 chars)."
+msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "Ligging is te lank is (maksimum 255 karakters)."
 
 #: actions/otp.php:69
@@ -3771,7 +3785,7 @@ msgstr "Bio"
 #. TRANS: Label for group location (dt). Text hidden by default.
 #: actions/profilesettings.php:149 actions/register.php:485
 #: actions/showgroup.php:267 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:177
+#: actions/userauthorization.php:166 lib/groupeditform.php:180
 #: lib/userprofile.php:165
 msgid "Location"
 msgstr "Ligging"
@@ -4114,7 +4128,7 @@ msgstr "Die vorm is onverwags ingestuur."
 
 #: actions/recoverpassword.php:365
 #, fuzzy
-msgid "Password must be 6 chars or more."
+msgid "Password must be 6 characters or more."
 msgstr "Wagwoord moet 6 of meer karakters bevat."
 
 #: actions/recoverpassword.php:369
@@ -4474,7 +4488,7 @@ msgstr "Organisasie"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:172
+#: lib/applicationeditform.php:208 lib/groupeditform.php:175
 msgid "Description"
 msgstr "Beskrywing"
 
@@ -4621,7 +4635,7 @@ msgid "Note"
 msgstr "Nota"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:298 lib/groupeditform.php:184
+#: actions/showgroup.php:298 lib/groupeditform.php:187
 msgid "Aliases"
 msgstr "Aliasse"
 
@@ -4744,62 +4758,86 @@ msgstr "Opdaterings van %1$s op %2$s."
 msgid "Notice deleted."
 msgstr "Hierdie kennisgewing is verwyder."
 
-#: actions/showstream.php:72
-#, php-format
-msgid " tagged %s"
-msgstr "met die etiket %s"
+#. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
+#: actions/showstream.php:70
+#, fuzzy, php-format
+msgid "%1$s tagged %2$s"
+msgstr "%1$s, bladsy %2$d"
+
+#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#: actions/showstream.php:74
+#, fuzzy, php-format
+msgid "%1$s tagged %2$s, page %3$d"
+msgstr "%1$s, bladsy %2$d"
 
-#: actions/showstream.php:78
+#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$d is the page number.
+#: actions/showstream.php:82
 #, php-format
 msgid "%1$s, page %2$d"
 msgstr "%1$s, bladsy %2$d"
 
-#: actions/showstream.php:120
+#. TRANS: Title for link to notice feed.
+#. TRANS: %1$s is a user nickname, %2$s is a hashtag.
+#: actions/showstream.php:127
 #, fuzzy, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Voer vir vriende van %s (RSS 1.0)"
 
-#: actions/showstream.php:127
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:136
 #, fuzzy, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "Voer vir vriende van %s (RSS 1.0)"
 
-#: actions/showstream.php:134
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:145
 #, fuzzy, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "Voer vir vriende van %s (RSS 2.0)"
 
-#: actions/showstream.php:141
+#: actions/showstream.php:152
 #, fuzzy, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "Voer vir vriende van %s (Atom)"
 
-#: actions/showstream.php:146
+#. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
+#. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
+#: actions/showstream.php:159
 #, php-format
 msgid "FOAF for %s"
 msgstr "Vriend van 'n vriend (FOAF) vir %s"
 
-#: actions/showstream.php:197
+#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
+#: actions/showstream.php:211
 #, fuzzy, php-format
-msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
+msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr ""
 "Hierdie is die tydslyn vir %s en vriende, maar niemand het nog iets gepos "
 "nie."
 
-#: actions/showstream.php:202
+#. TRANS: Second sentence of empty list message for a stream for the user themselves.
+#: actions/showstream.php:217
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
 msgstr ""
 
-#: actions/showstream.php:204
+#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:221
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
 "%?status_textarea=%2$s)."
 msgstr ""
 
-#: actions/showstream.php:243
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:264
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4808,7 +4846,9 @@ msgid ""
 "follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
 
-#: actions/showstream.php:248
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:271
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4816,7 +4856,8 @@ msgid ""
 "[StatusNet](http://status.net/) tool. "
 msgstr ""
 
-#: actions/showstream.php:305
+#. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
+#: actions/showstream.php:328
 #, php-format
 msgid "Repeat of %s"
 msgstr "Herhaling van %s"
@@ -4930,35 +4971,42 @@ msgstr "Duplikaatlimiet"
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:56
+#. TRANS: Page title for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:55
 #, fuzzy
 msgid "Site Notice"
 msgstr "Kennisgewings"
 
-#: actions/sitenoticeadminpanel.php:67
+#. TRANS: Instructions for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:66
 #, fuzzy
 msgid "Edit site-wide message"
 msgstr "Nuwe boodskap"
 
-#: actions/sitenoticeadminpanel.php:103
+#. TRANS: Server error displayed when saving a site-wide notice was impossible.
+#: actions/sitenoticeadminpanel.php:101
 #, fuzzy
 msgid "Unable to save site notice."
 msgstr "Dit was nie moontlik om u ontwerp-instellings te stoor nie."
 
-#: actions/sitenoticeadminpanel.php:113
-msgid "Max length for the site-wide notice is 255 chars."
+#. TRANS: Client error displayed when a site-wide notice was longer than allowed.
+#: actions/sitenoticeadminpanel.php:112
+msgid "Maximum length for the site-wide notice is 255 characters."
 msgstr ""
 
+#. TRANS: Label for site-wide notice text field in admin panel.
 #: actions/sitenoticeadminpanel.php:176
 #, fuzzy
 msgid "Site notice text"
 msgstr "Verwyder kennisgewing"
 
-#: actions/sitenoticeadminpanel.php:178
-msgid "Site-wide notice text (255 chars max; HTML okay)"
+#. TRANS: Tooltip for site-wide notice text field in admin panel.
+#: actions/sitenoticeadminpanel.php:179
+msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:198
+#. TRANS: Title for button to save site notice in admin panel.
+#: actions/sitenoticeadminpanel.php:201
 #, fuzzy
 msgid "Save site notice"
 msgstr "Verwyder kennisgewing"
@@ -5423,80 +5471,96 @@ msgid ""
 msgstr ""
 
 #. TRANS: User admin panel title
-#: actions/useradminpanel.php:60
+#: actions/useradminpanel.php:58
 msgctxt "TITLE"
 msgid "User"
 msgstr "Gebruiker"
 
-#: actions/useradminpanel.php:71
+#. TRANS: Instruction for user admin panel.
+#: actions/useradminpanel.php:69
 msgid "User settings for this StatusNet site"
 msgstr ""
 
-#: actions/useradminpanel.php:150
+#. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
+#: actions/useradminpanel.php:147
 msgid "Invalid bio limit. Must be numeric."
 msgstr ""
 
-#: actions/useradminpanel.php:156
-msgid "Invalid welcome text. Max length is 255 characters."
+#. TRANS: Form validation error in user admin panel when welcome text is too long.
+#: actions/useradminpanel.php:154
+msgid "Invalid welcome text. Maximum length is 255 characters."
 msgstr ""
 
+#. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
+#. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
 #, php-format
-msgid "Invalid default subscripton: '%1$s' is not user."
+msgid "Invalid default subscripton: '%1$s' is not a user."
 msgstr ""
 
 #. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:106
+#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
 #: lib/personalgroupnav.php:109
 msgid "Profile"
 msgstr "Profiel"
 
-#: actions/useradminpanel.php:223
+#. TRANS: Field label in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:220
 msgid "Bio Limit"
 msgstr "Profiellimiet"
 
-#: actions/useradminpanel.php:224
+#. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:222
 msgid "Maximum length of a profile bio in characters."
 msgstr ""
 
-#: actions/useradminpanel.php:232
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:231
 msgid "New users"
 msgstr "Nuwe gebruikers"
 
+#. TRANS: Field label in user admin panel for setting new user welcome text.
 #: actions/useradminpanel.php:236
 #, fuzzy
 msgid "New user welcome"
 msgstr "Nuwe gebruikers"
 
-#: actions/useradminpanel.php:237
+#. TRANS: Tooltip in user admin panel for setting new user welcome text.
+#: actions/useradminpanel.php:238
 #, fuzzy
-msgid "Welcome text for new users (Max 255 chars)."
+msgid "Welcome text for new users (maximum 255 characters)."
 msgstr "Die naam is te lank (maksimum 255 karakters)."
 
-#: actions/useradminpanel.php:242
+#. TRANS: Field label in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:244
 #, fuzzy
 msgid "Default subscription"
 msgstr "Beskrywing"
 
-#: actions/useradminpanel.php:243
+#. TRANS: Tooltip in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:246
 #, fuzzy
 msgid "Automatically subscribe new users to this user."
 msgstr "Jy kan nie gebruikers op hierdie webwerf stilmaak nie."
 
-#: actions/useradminpanel.php:252
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:256
 msgid "Invitations"
 msgstr "Uitnodigings"
 
-#: actions/useradminpanel.php:257
+#. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:262
 #, fuzzy
 msgid "Invitations enabled"
 msgstr "Uitnodigings"
 
-#: actions/useradminpanel.php:259
+#. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:265
 msgid "Whether to allow users to invite new users."
 msgstr ""
 
-#: actions/useradminpanel.php:295
+#. TRANS: Title for button to save user settings in user admin panel.
+#: actions/useradminpanel.php:302
 msgid "Save user settings"
 msgstr ""
 
@@ -5689,7 +5753,7 @@ msgid "Plugins"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:831
+#: actions/version.php:198 lib/action.php:880
 msgid "Version"
 msgstr "Weergawe"
 
@@ -5901,16 +5965,23 @@ msgstr "Kon nie die profiel stoor nie."
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
+#. TRANS: Full name of a profile or group followed by nickname in parens
+#: classes/Profile.php:164
+#, fuzzy, php-format
+msgctxt "FANCYNAME"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:791
+#: classes/Profile.php:812
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:800
+#: classes/Profile.php:821
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6068,200 +6139,207 @@ msgstr "%1$s - %2$s"
 msgid "Untitled page"
 msgstr ""
 
+#. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
+#: lib/action.php:310
+msgctxt "TOOLTIP"
+msgid "Show more"
+msgstr ""
+
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:477
+#: lib/action.php:526
 msgid "Primary site navigation"
 msgstr ""
 
 #. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:483
+#: lib/action.php:532
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr ""
 
 #. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:486
+#: lib/action.php:535
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Persoonlik"
 
 #. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:488
+#: lib/action.php:537
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
 msgstr "Verander u wagwoord"
 
 #. TRANS: Main menu option when logged in for access to user settings
-#: lib/action.php:491
+#: lib/action.php:540
 msgid "Account"
 msgstr "Gebruiker"
 
 #. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:493
+#: lib/action.php:542
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr ""
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:496
+#: lib/action.php:545
 msgid "Connect"
 msgstr "Konnekteer"
 
 #. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:499
+#: lib/action.php:548
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr ""
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:502 lib/groupnav.php:117
+#: lib/action.php:551 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Beheer"
 
 #. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:506
+#: lib/action.php:555
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr ""
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:509
+#: lib/action.php:558
 msgctxt "MENU"
 msgid "Invite"
 msgstr "Uitnodig"
 
 #. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:515
+#: lib/action.php:564
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "Meld by die webwerf aan"
 
 #. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:518
+#: lib/action.php:567
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Teken uit"
 
 #. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:523
+#: lib/action.php:572
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "Skep 'n gebruiker"
 
 #. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:526
+#: lib/action.php:575
 msgctxt "MENU"
 msgid "Register"
 msgstr "Registreer"
 
 #. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:529
+#: lib/action.php:578
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "Meld by die webwerf aan"
 
 #. TRANS: Main menu option when not logged in to log in
-#: lib/action.php:532
+#: lib/action.php:581
 msgctxt "MENU"
 msgid "Login"
 msgstr "Teken in"
 
 #. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:535
+#: lib/action.php:584
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Help my!"
 
 #. TRANS: Main menu option for help on the StatusNet site
-#: lib/action.php:538
+#: lib/action.php:587
 msgctxt "MENU"
 msgid "Help"
 msgstr "Help"
 
 #. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:541
+#: lib/action.php:590
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr "Soek na mense of teks"
 
 #. TRANS: Main menu option when logged in or when the StatusNet instance is not private
-#: lib/action.php:544
+#: lib/action.php:593
 msgctxt "MENU"
 msgid "Search"
 msgstr "Soek"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:566 lib/adminpanelaction.php:387
+#: lib/action.php:615 lib/adminpanelaction.php:387
 #, fuzzy
 msgid "Site notice"
 msgstr "Verwyder kennisgewing"
 
 #. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:633
+#: lib/action.php:682
 #, fuzzy
 msgid "Local views"
 msgstr "Lokaal"
 
 #. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:703
+#: lib/action.php:752
 #, fuzzy
 msgid "Page notice"
 msgstr "Populêre kennisgewings"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:804
+#: lib/action.php:853
 msgid "Secondary site navigation"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:810
+#: lib/action.php:859
 msgid "Help"
 msgstr "Help"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:813
+#: lib/action.php:862
 msgid "About"
 msgstr "Aangaande"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:816
+#: lib/action.php:865
 msgid "FAQ"
 msgstr "Gewilde vrae"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:821
+#: lib/action.php:870
 msgid "TOS"
 msgstr "Gebruiksvoorwaardes"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:825
+#: lib/action.php:874
 msgid "Privacy"
 msgstr "Privaatheid"
 
-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:828
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+#: lib/action.php:877
 msgid "Source"
 msgstr "Bron"
 
-#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:834
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+#: lib/action.php:884
 msgid "Contact"
 msgstr "Kontak"
 
-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:837
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+#: lib/action.php:887
 #, fuzzy
 msgid "Badge"
 msgstr "Aanpor"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:866
+#: lib/action.php:916
 msgid "StatusNet software license"
 msgstr ""
 
@@ -6269,7 +6347,7 @@ msgstr ""
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:873
+#: lib/action.php:923
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -6277,7 +6355,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:876
+#: lib/action.php:926
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr ""
@@ -6286,7 +6364,7 @@ msgstr ""
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:883
+#: lib/action.php:933
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -6295,51 +6373,51 @@ msgid ""
 msgstr ""
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:899
+#: lib/action.php:949
 msgid "Site content license"
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:906
+#: lib/action.php:956
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:913
+#: lib/action.php:963
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:917
+#: lib/action.php:967
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:949
+#: lib/action.php:999
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1285
+#: lib/action.php:1335
 #, fuzzy
 msgid "Pagination"
 msgstr "Registratie"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1296
+#: lib/action.php:1346
 msgid "After"
 msgstr "Na"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1306
+#: lib/action.php:1356
 msgid "Before"
 msgstr "Voor"
 
@@ -6701,7 +6779,7 @@ msgid "AJAX error"
 msgstr "Ajax-fout"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:233 lib/mailhandler.php:142
+#: lib/channel.php:233 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "Opdrag voltooi"
 
@@ -6718,7 +6796,7 @@ msgstr ""
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:626
+#: lib/command.php:99 lib/command.php:630
 msgid "User has no last notice."
 msgstr ""
 
@@ -6784,6 +6862,14 @@ msgstr ""
 msgid "%1$s left group %2$s."
 msgstr ""
 
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: lib/command.php:426
+#, fuzzy, php-format
+msgctxt "WHOIS"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
 #. TRANS: Whois output. %s is the full name of the queried user.
 #: lib/command.php:430
 #, php-format
@@ -6821,134 +6907,144 @@ msgid ""
 "same server."
 msgstr ""
 
-#. TRANS: Message given if content is too long.
+#. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
 #: lib/command.php:488
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] ""
+"Boodskap is te lank. Die maksimum is %1$d karakters. U het %2$d karakters "
+"gestuur."
+msgstr[1] ""
 "Boodskap is te lank. Die maksimum is %1$d karakters. U het %2$d karakters "
 "gestuur."
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:514
+#: lib/command.php:516
 msgid "Error sending direct message."
 msgstr ""
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:551
+#: lib/command.php:553
 #, php-format
 msgid "Notice from %s repeated."
 msgstr ""
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:554
+#: lib/command.php:556
 #, fuzzy
 msgid "Error repeating notice."
 msgstr "U kan nie u eie kennisgewings herhaal nie."
 
-#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:589
-#, php-format
-msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
+#: lib/command.php:591
+#, fuzzy, php-format
+msgid "Notice too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] ""
+"Boodskap is te lank. Die maksimum is %1$d karakters. U het %2$d karakters "
+"gestuur."
+msgstr[1] ""
+"Boodskap is te lank. Die maksimum is %1$d karakters. U het %2$d karakters "
+"gestuur."
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:600
+#: lib/command.php:604
 #, php-format
 msgid "Reply to %s sent."
 msgstr ""
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:603
+#: lib/command.php:607
 #, fuzzy
 msgid "Error saving notice."
 msgstr "Fout tydens stoor van gebruiker; ongeldig."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:650
+#: lib/command.php:654
 msgid "Specify the name of the user to subscribe to."
 msgstr ""
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:659
+#: lib/command.php:663
 msgid "Can't subscribe to OMB profiles by command."
 msgstr ""
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:667
+#: lib/command.php:671
 #, php-format
 msgid "Subscribed to %s."
 msgstr ""
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:688 lib/command.php:799
+#: lib/command.php:692 lib/command.php:803
 msgid "Specify the name of the user to unsubscribe from."
 msgstr ""
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:699
+#: lib/command.php:703
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:719 lib/command.php:745
+#: lib/command.php:723 lib/command.php:749
 #, fuzzy
 msgid "Command not yet implemented."
 msgstr "Opdrag voltooi"
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:723
+#: lib/command.php:727
 #, fuzzy
 msgid "Notification off."
 msgstr "Geen bevestigingskode."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:726
+#: lib/command.php:730
 msgid "Can't turn off notification."
 msgstr ""
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:749
+#: lib/command.php:753
 #, fuzzy
 msgid "Notification on."
 msgstr "Geen bevestigingskode."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:752
+#: lib/command.php:756
 #, fuzzy
 msgid "Can't turn on notification."
 msgstr "U kan nie u eie kennisgewings herhaal nie."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:766
+#: lib/command.php:770
 msgid "Login command is disabled."
 msgstr ""
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:779
+#: lib/command.php:783
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:808
+#: lib/command.php:812
 #, php-format
 msgid "Unsubscribed %s."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:826
+#: lib/command.php:830
 #, fuzzy
 msgid "You are not subscribed to anyone."
 msgstr "U volg hierdie gebruiker:"
@@ -6956,7 +7052,7 @@ msgstr "U volg hierdie gebruiker:"
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:831
+#: lib/command.php:835
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "U volg hierdie gebruiker:"
@@ -6964,7 +7060,7 @@ msgstr[1] "U volg hierdie gebruikers:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:853
+#: lib/command.php:857
 #, fuzzy
 msgid "No one is subscribed to you."
 msgstr "Hierdie gebruiker volg u:"
@@ -6972,7 +7068,7 @@ msgstr "Hierdie gebruiker volg u:"
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:858
+#: lib/command.php:862
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Hierdie gebruiker volg u:"
@@ -6980,21 +7076,21 @@ msgstr[1] "Hierdie gebruikers volg u:"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:880
+#: lib/command.php:884
 msgid "You are not a member of any groups."
 msgstr "U is nie 'n lid van enige groep nie."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:885
+#: lib/command.php:889
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "U is 'n lid van hierdie groep:"
 msgstr[1] "U is 'n lid van hierdie groepe:"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:900
+#: lib/command.php:904
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -7189,27 +7285,36 @@ msgstr ""
 "spasies bevat nie."
 
 #: lib/groupeditform.php:163
-msgid "URL of the homepage or blog of the group or topic"
-msgstr ""
+#, fuzzy
+msgid "URL of the homepage or blog of the group or topic."
+msgstr "U is nie die eienaar van hierdie applikasie nie."
 
 #: 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 ""
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d character or less"
+msgid_plural "Describe the group or topic in %d characters or less"
+msgstr[0] "Skrap applikasie"
+msgstr[1] "Skrap applikasie"
 
-#: lib/groupeditform.php:179
+#: lib/groupeditform.php:182
 msgid ""
-"Location for the group, if any, like \"City, State (or Region), Country\""
+"Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr ""
 
-#: lib/groupeditform.php:187
+#: lib/groupeditform.php:190
 #, php-format
-msgid "Extra nicknames for the group, comma- or space- separated, max %d"
-msgstr ""
+msgid ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"alias allowed."
+msgid_plural ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"aliases allowed."
+msgstr[0] ""
+msgstr[1] ""
 
 #. TRANS: Menu item in the group navigation page.
 #: lib/groupnav.php:86
@@ -7667,7 +7772,7 @@ msgstr "Jammer, dit is nie u inkomende e-posadres nie."
 msgid "Sorry, no incoming email allowed."
 msgstr "Jammer, inkomende e-pos word nie toegelaat nie."
 
-#: lib/mailhandler.php:228
+#: lib/mailhandler.php:229
 #, fuzzy, php-format
 msgid "Unsupported message type: %s"
 msgstr "Nie-ondersteunde formaat."
@@ -8026,17 +8131,18 @@ msgid "Sandbox this user"
 msgstr "Deblokkeer hierdie gebruiker"
 
 #. TRANS: Fieldset legend for the search form.
-#: lib/searchaction.php:121
+#: lib/searchaction.php:120
 #, fuzzy
 msgid "Search site"
 msgstr "Soek"
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
-#: lib/searchaction.php:129
+#: lib/searchaction.php:128
 msgid "Keyword(s)"
 msgstr "Term(e)"
 
+#. TRANS: Button text for searching site.
 #: lib/searchaction.php:130
 msgctxt "BUTTON"
 msgid "Search"
@@ -8128,8 +8234,8 @@ msgid "The theme file is missing or the upload failed."
 msgstr ""
 
 #: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:278 lib/themeuploader.php:282
-#: lib/themeuploader.php:290 lib/themeuploader.php:297
+#: lib/themeuploader.php:279 lib/themeuploader.php:283
+#: lib/themeuploader.php:291 lib/themeuploader.php:298
 #, fuzzy
 msgid "Failed saving theme."
 msgstr "Die opdatering van die avatar het gefaal."
@@ -8140,29 +8246,32 @@ msgstr ""
 
 #: lib/themeuploader.php:166
 #, php-format
-msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
-msgstr ""
+msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
+msgid_plural ""
+"Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr[0] ""
+msgstr[1] ""
 
-#: lib/themeuploader.php:178
+#: lib/themeuploader.php:179
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr ""
 
-#: lib/themeuploader.php:218
+#: lib/themeuploader.php:219
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
 msgstr ""
 
-#: lib/themeuploader.php:224
+#: lib/themeuploader.php:225
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr ""
 
-#: lib/themeuploader.php:241
+#: lib/themeuploader.php:242
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr ""
 
-#: lib/themeuploader.php:259
+#: lib/themeuploader.php:260
 #, fuzzy
 msgid "Error opening theme archive."
 msgstr "Kon nie die profiel stoor nie."
@@ -8353,23 +8462,36 @@ msgstr[1] ""
 "Boodskap is te lank. Die maksimum is %1$d karakters. U het %2$d karakters "
 "gestuur."
 
-#: scripts/restoreuser.php:82
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: scripts/restoreuser.php:61
 #, php-format
-msgid "Backup file for user %s (%s)"
+msgid "Getting backup from file '%s'."
 msgstr ""
 
-#: scripts/restoreuser.php:88
+#. TRANS: Commandline script output.
+#: scripts/restoreuser.php:91
 #, fuzzy
 msgid "No user specified; using backup user."
 msgstr "Geen groep verskaf nie."
 
-#: scripts/restoreuser.php:94
+#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
+#: scripts/restoreuser.php:98
 #, php-format
-msgid "%d entries in backup."
-msgstr ""
+msgid "%d entry in backup."
+msgid_plural "%d entries in backup."
+msgstr[0] ""
+msgstr[1] ""
+
+#, fuzzy
+#~ msgid "Name is too long (maximum 255 chars)."
+#~ msgstr "Die naam is te lank (maksimum 255 karakters)."
+
+#, fuzzy
+#~ msgid "Organization is too long (maximum 255 chars)."
+#~ msgstr "Die organisasienaam is te lang (maksimum 255 karakters)."
 
-#~ msgid "Description is too long (max %d chars)."
-#~ msgstr "Die beskrywing is te lank (die maksimum is %d karakters)."
+#~ msgid "That's too long. Max notice size is %d chars."
+#~ msgstr "Die kennisgewing is te lank. Gebruik maksimum %d karakters."
 
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "Te veel aliasse! Die maksimum aantal is %d."
+#~ msgid " tagged %s"
+#~ msgstr "met die etiket %s"
diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po
index dbaf0b84a..1f34cd9dc 100644
--- a/locale/ar/LC_MESSAGES/statusnet.po
+++ b/locale/ar/LC_MESSAGES/statusnet.po
@@ -11,19 +11,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-30 23:18+0000\n"
-"PO-Revision-Date: 2010-10-30 23:19:49+0000\n"
+"POT-Creation-Date: 2010-11-02 22:51+0000\n"
+"PO-Revision-Date: 2010-11-02 22:52:58+0000\n"
 "Language-Team: Arabic <http://translatewiki.net/wiki/Portal:ar>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r75708); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r75875); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ar\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=6; plural=(n == 0) ? 0 : ( (n == 1) ? 1 : ( (n == "
 "2) ? 2 : ( (n%100 >= 3 && n%100 <= 10) ? 3 : ( (n%100 >= 11 && n%100 <= "
 "99) ? 4 : 5 ) ) ) );\n"
-"X-POT-Import-Date: 2010-10-30 09:48:40+0000\n"
+"X-POT-Import-Date: 2010-10-30 23:42:01+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -80,15 +80,20 @@ msgstr "حفظ إعدادت الوصول"
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
+#. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
+#. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #: actions/accessadminpanel.php:193 actions/emailsettings.php:228
-#: actions/imsettings.php:187 actions/pathsadminpanel.php:512
-#: actions/profilesettings.php:201 actions/smssettings.php:209
-#: actions/subscriptions.php:246 lib/applicationeditform.php:355
+#: actions/imsettings.php:187 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: lib/applicationeditform.php:355 lib/groupeditform.php:207
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "احفظ"
@@ -139,7 +144,7 @@ msgstr "لا صفحة كهذه."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:495 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "لا مستخدم كهذا."
@@ -206,7 +211,9 @@ msgstr ""
 
 #. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:208
+#. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227
 #, fuzzy, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -566,8 +573,11 @@ msgstr "الاسم الكامل طويل جدا (الأقصى 255 حرفًا)"
 #. TRANS: Group edit form validation error.
 #. TRANS: Form validation error in New application form.
 #. TRANS: %d is the maximum number of characters for the description.
+#. TRANS: Group create form validation error.
+#. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:220 actions/editapplication.php:201
 #: actions/editgroup.php:216 actions/newapplication.php:178
+#: actions/newgroup.php:152
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -738,14 +748,14 @@ msgstr "لا تملك تصريحًا."
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:172 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:74
 #: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
 #: actions/groupunblock.php:65 actions/imsettings.php:230
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
-#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/othersettings.php:153 actions/passwordsettings.php:138
 #: actions/profilesettings.php:221 actions/recoverpassword.php:350
 #: actions/register.php:172 actions/remotesubscribe.php:77
 #: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
@@ -920,20 +930,21 @@ msgstr "لا يمكنك حذف المستخدمين."
 
 #. TRANS: Client error displayed trying to repeat a non-existing notice through the API.
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
+#. TRANS: Error message displayed trying to delete a non-existing notice.
 #: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/deletenotice.php:58 actions/shownotice.php:92
+#: actions/deletenotice.php:61 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "لا إشعار كهذا."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:535
+#: actions/apistatusesretweet.php:83 lib/command.php:537
 msgid "Cannot repeat your own notice."
 msgstr "لا يمكنك تكرار ملحوظتك الخاصة."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:541
+#: actions/apistatusesretweet.php:92 lib/command.php:543
 msgid "Already repeated that notice."
 msgstr "كرر بالفعل هذه الملاحظة."
 
@@ -954,7 +965,8 @@ msgstr ""
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#: actions/apistatusesupdate.php:244
+#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
+#: lib/mailhandler.php:60
 #, fuzzy, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
@@ -973,7 +985,7 @@ msgstr "لم يتم العثور على وسيلة API."
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
-#: actions/apistatusesupdate.php:308
+#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
 #, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
@@ -1188,17 +1200,18 @@ msgstr ""
 msgid "Lost our file data."
 msgstr ""
 
-#: actions/avatarsettings.php:384
+#. TRANS: Success message for having updated a user avatar.
+#: actions/avatarsettings.php:385
 msgid "Avatar updated."
 msgstr "رُفع الأفتار."
 
 #. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
-#: actions/avatarsettings.php:388
+#: actions/avatarsettings.php:389
 msgid "Failed updating avatar."
 msgstr "فشل تحديث الأفتار."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:412
+#: actions/avatarsettings.php:413
 msgid "Avatar deleted."
 msgstr "حُذف الأفتار."
 
@@ -1227,8 +1240,8 @@ msgstr ""
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:154 actions/deleteapplication.php:154
-#: actions/deletegroup.php:220 actions/deletenotice.php:150
+#: actions/block.php:154 actions/deleteapplication.php:157
+#: actions/deletegroup.php:220 actions/deletenotice.php:155
 #: actions/deleteuser.php:152 actions/groupblock.php:178
 msgctxt "BUTTON"
 msgid "No"
@@ -1246,8 +1259,8 @@ msgstr "لا تمنع هذا المستخدم"
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:161 actions/deleteapplication.php:161
-#: actions/deletegroup.php:227 actions/deletenotice.php:157
+#: actions/block.php:161 actions/deleteapplication.php:164
+#: actions/deletegroup.php:227 actions/deletenotice.php:162
 #: actions/deleteuser.php:159 actions/groupblock.php:185
 msgctxt "BUTTON"
 msgid "Yes"
@@ -1366,12 +1379,13 @@ msgstr "هذا البريد الإلكتروني ملك مستخدم آخر با
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
 #. TRANS: Server error thrown on database error updating IM preferences.
 #. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
 #. TRANS: Server error thrown when user profile settings could not be updated.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #: actions/confirmaddress.php:118 actions/emailsettings.php:331
 #: actions/emailsettings.php:477 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:174
+#: actions/imsettings.php:442 actions/othersettings.php:184
 #: actions/profilesettings.php:326 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
@@ -1407,16 +1421,19 @@ msgstr "محادثة"
 msgid "Notices"
 msgstr "الإشعارات"
 
-#: actions/deleteapplication.php:63
+#. TRANS: Client error displayed trying to delete an application while not logged in.
+#: actions/deleteapplication.php:62
 msgid "You must be logged in to delete an application."
 msgstr "يجب أن تسجل الدخول لتحذف تطبيقا."
 
+#. TRANS: Client error displayed trying to delete an application that does not exist.
 #: actions/deleteapplication.php:71
 msgid "Application not found."
 msgstr "لم يوجد التطبيق."
 
+#. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
-#: actions/deleteapplication.php:78 actions/editapplication.php:78
+#: actions/deleteapplication.php:79 actions/editapplication.php:78
 #: actions/showapplication.php:94
 msgid "You are not the owner of this application."
 msgstr "أنت لست مالك هذا التطبيق."
@@ -1424,15 +1441,18 @@ msgstr "أنت لست مالك هذا التطبيق."
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
 #: actions/newapplication.php:114 actions/showapplication.php:118
-#: lib/action.php:1354
+#: lib/action.php:1404
 msgid "There was a problem with your session token."
 msgstr ""
 
-#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+#. TRANS: Title for delete application page.
+#. TRANS: Fieldset legend on delete application page.
+#: actions/deleteapplication.php:124 actions/deleteapplication.php:149
 msgid "Delete application"
 msgstr "احذف هذا التطبيق"
 
-#: actions/deleteapplication.php:149
+#. TRANS: Confirmation text on delete application page.
+#: actions/deleteapplication.php:152
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
 "about the application from the database, including all existing user "
@@ -1440,12 +1460,12 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:158
+#: actions/deleteapplication.php:161
 msgid "Do not delete this application"
 msgstr "لا تحذف هذا التطبيق"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:164
+#: actions/deleteapplication.php:167
 msgid "Delete this application"
 msgstr "احذف هذا التطبيق"
 
@@ -1482,13 +1502,14 @@ msgstr "تعذر تحديث المجموعة."
 msgid "Deleted group %s"
 msgstr "%1$s ترك المجموعة %2$s"
 
-#. TRANS: Title.
+#. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
 #: actions/deletegroup.php:176 actions/deletegroup.php:202
 #, fuzzy
 msgid "Delete group"
 msgstr "احذف المستخدم"
 
+#. TRANS: Warning in form for deleleting a group.
 #: actions/deletegroup.php:206
 msgid ""
 "Are you sure you want to delete this group? This will clear all data about "
@@ -1508,10 +1529,11 @@ msgstr "لا تحذف هذا الإشعار"
 msgid "Delete this group"
 msgstr "احذف هذا المستخدم"
 
+#. TRANS: Error message displayed trying to delete a notice while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1521,31 +1543,36 @@ msgstr "احذف هذا المستخدم"
 msgid "Not logged in."
 msgstr "لست والجًا."
 
-#: actions/deletenotice.php:74
+#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
+#: actions/deletenotice.php:78
 msgid "Can't delete this notice."
 msgstr "تعذّر حذف هذا الإشعار."
 
-#: actions/deletenotice.php:106
+#. TRANS: Instructions for deleting a notice.
+#: actions/deletenotice.php:110
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
 msgstr ""
 
-#: actions/deletenotice.php:112 actions/deletenotice.php:144
+#. TRANS: Page title when deleting a notice.
+#. TRANS: Fieldset legend for the delete notice form.
+#: actions/deletenotice.php:117 actions/deletenotice.php:148
 msgid "Delete notice"
 msgstr "احذف الإشعار"
 
-#: actions/deletenotice.php:147
+#. TRANS: Message for the delete notice form.
+#: actions/deletenotice.php:152
 msgid "Are you sure you want to delete this notice?"
 msgstr "أمتأكد من أنك تريد حذف هذا الإشعار؟"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:154
+#: actions/deletenotice.php:159
 msgid "Do not delete this notice"
 msgstr "لا تحذف هذا الإشعار"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:161 lib/noticelist.php:667
+#: actions/deletenotice.php:166 lib/noticelist.php:667
 msgid "Delete this notice"
 msgstr "احذف هذا الإشعار"
 
@@ -1706,11 +1733,9 @@ msgstr "ارجع إلى المبدئي"
 
 #. TRANS: Submit button title.
 #: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
-#: actions/othersettings.php:126 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: actions/useradminpanel.php:295 lib/applicationeditform.php:357
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: lib/applicationeditform.php:357 lib/designsettings.php:256
 msgid "Save"
 msgstr "أرسل"
 
@@ -1758,9 +1783,9 @@ msgid "Name is required."
 msgstr "الاسم مطلوب."
 
 #. TRANS: Validation error shown when providing too long a name in the "Edit application" form.
-#: actions/editapplication.php:188
+#: actions/editapplication.php:188 actions/newapplication.php:169
 #, fuzzy
-msgid "Name is too long (max 255 characters)."
+msgid "Name is too long (maximum 255 characters)."
 msgstr "الاسم طويل جدا (الأقصى 255 حرفا)."
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
@@ -1790,7 +1815,7 @@ msgid "Organization is required."
 msgstr "المنظمة مطلوبة."
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#: actions/editapplication.php:223
+#: actions/editapplication.php:223 actions/newapplication.php:199
 #, fuzzy
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "المنظمة طويلة جدا (الأقصى 255 حرفا)."
@@ -2569,7 +2594,7 @@ msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "انشر هوية مصغّرة لعنوان بريدي الإلكتروني."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:180
+#: actions/imsettings.php:290 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "حُفِظت التفضيلات."
 
@@ -2697,10 +2722,9 @@ msgstr[5] "لست مشتركًا بأحد."
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#. TRANS: Whois output.
-#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:145 actions/invite.php:159 lib/command.php:426
-#, php-format
+#: actions/invite.php:145 actions/invite.php:159
+#, fuzzy, php-format
+msgctxt "INVITE"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
@@ -2859,8 +2883,9 @@ msgid ""
 msgstr ""
 
 #: actions/licenseadminpanel.php:156
-msgid "Invalid license title. Max length is 255 characters."
-msgstr ""
+#, fuzzy
+msgid "Invalid license title. Maximum length is 255 characters."
+msgstr "رسالة ترحيب غير صالحة. أقصى طول هو 255 حرف."
 
 #: actions/licenseadminpanel.php:168
 msgid "Invalid license URL."
@@ -3029,21 +3054,11 @@ msgstr "يجب أن تكون مسجل الدخول لتسجل تطبيقا."
 msgid "Use this form to register a new application."
 msgstr "استخدم هذا النموذج لتسجل تطبيقا جديدا."
 
-#: actions/newapplication.php:169
-#, fuzzy
-msgid "Name is too long (maximum 255 chars)."
-msgstr "الاسم طويل جدا (الأقصى 255 حرفا)."
-
 #: actions/newapplication.php:184
 #, fuzzy
 msgid "Source URL is required."
 msgstr "مسار المصدر ليس صحيحا."
 
-#: actions/newapplication.php:199
-#, fuzzy
-msgid "Organization is too long (maximum 255 chars)."
-msgstr "المنظمة طويلة جدا (الأقصى 255 حرفا)."
-
 #: actions/newapplication.php:266 actions/newapplication.php:275
 msgid "Could not create application."
 msgstr "لم يمكن إنشاء التطبيق."
@@ -3063,14 +3078,14 @@ msgid "New message"
 msgstr "رسالة جديدة"
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:499
+#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501
 msgid "You can't send a message to this user."
 msgstr "لا يمكنك إرسال رسائل إلى هذا المستخدم."
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
 #: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
-#: lib/command.php:579
+#: lib/command.php:581
 msgid "No content!"
 msgstr "لا محتوى!"
 
@@ -3079,7 +3094,7 @@ msgid "No recipient specified."
 msgstr "لا مستلم حُدّد."
 
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:503
+#: actions/newmessage.php:167 lib/command.php:505
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -3090,12 +3105,12 @@ msgstr "أُرسلت الرسالة"
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:511
+#: actions/newmessage.php:188 lib/command.php:513
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "رسالة مباشرة ل%s تم إرسالها."
 
-#: actions/newmessage.php:213 actions/newnotice.php:263
+#: actions/newmessage.php:213 actions/newnotice.php:264
 msgid "Ajax Error"
 msgstr "خطأ أجاكس"
 
@@ -3103,17 +3118,7 @@ msgstr "خطأ أجاكس"
 msgid "New notice"
 msgstr "إشعار جديد"
 
-#: actions/newnotice.php:159 lib/mailhandler.php:60
-#, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr "هذه طويلة جدًا. أطول حجم للإشعار %d  حرفًا."
-
-#: actions/newnotice.php:183
-#, php-format
-msgid "Max notice size is %d chars, including attachment URL."
-msgstr ""
-
-#: actions/newnotice.php:229
+#: actions/newnotice.php:230
 msgid "Notice posted"
 msgstr "أُرسل الإشعار"
 
@@ -3277,37 +3282,46 @@ msgstr "بحث في الأشخاص"
 msgid "Notice Search"
 msgstr "بحث الإشعارات"
 
-#: actions/othersettings.php:60
+#: actions/othersettings.php:59
 msgid "Other settings"
 msgstr "إعدادات أخرى"
 
+#. TRANS: Instructions for tab "Other" in user profile settings.
 #: actions/othersettings.php:71
 msgid "Manage various other options."
 msgstr "أدر خيارات أخرى عديدة."
 
-#: actions/othersettings.php:108
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/othersettings.php:111
 msgid " (free service)"
 msgstr " (خدمة حرة)"
 
-#: actions/othersettings.php:116
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/othersettings.php:120
 msgid "Shorten URLs with"
 msgstr "قصّر المسارات بـ"
 
-#: actions/othersettings.php:117
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/othersettings.php:122
 msgid "Automatic shortening service to use."
 msgstr "خدمة التقصير المطلوب استخدامها."
 
-#: actions/othersettings.php:122
+#. TRANS: Label for checkbox.
+#: actions/othersettings.php:128
 msgid "View profile designs"
 msgstr "اعرض تصاميم الملف الشخصي"
 
-#: actions/othersettings.php:123
+#. TRANS: Tooltip for checkbox.
+#: actions/othersettings.php:130
 msgid "Show or hide profile designs."
 msgstr "أظهر أو أخفِ تصاميم الملفات الشخصية."
 
-#: actions/othersettings.php:153
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/othersettings.php:162
 #, fuzzy
-msgid "URL shortening service is too long (max 50 chars)."
+msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "الاسم الكامل طويل جدا (الأقصى 255 حرفًا)"
 
 #: actions/otp.php:69
@@ -3796,7 +3810,7 @@ msgstr "السيرة"
 #. TRANS: Label for group location (dt). Text hidden by default.
 #: actions/profilesettings.php:149 actions/register.php:485
 #: actions/showgroup.php:267 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:177
+#: actions/userauthorization.php:166 lib/groupeditform.php:180
 #: lib/userprofile.php:165
 msgid "Location"
 msgstr "الموقع"
@@ -4133,7 +4147,8 @@ msgid "Unexpected password reset."
 msgstr "أعد ضبط كلمة السر"
 
 #: actions/recoverpassword.php:365
-msgid "Password must be 6 chars or more."
+#, fuzzy
+msgid "Password must be 6 characters or more."
 msgstr "يجب أن تكون كلمة السر 6 محارف أو أكثر."
 
 #: actions/recoverpassword.php:369
@@ -4482,7 +4497,7 @@ msgstr "المنظمة"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:172
+#: lib/applicationeditform.php:208 lib/groupeditform.php:175
 msgid "Description"
 msgstr "الوصف"
 
@@ -4630,7 +4645,7 @@ msgid "Note"
 msgstr "ملاحظة"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:298 lib/groupeditform.php:184
+#: actions/showgroup.php:298 lib/groupeditform.php:187
 msgid "Aliases"
 msgstr "الكنى"
 
@@ -4762,60 +4777,84 @@ msgstr "نتائج البحث ل\"%1$s\" على %2$s"
 msgid "Notice deleted."
 msgstr "حُذف الإشعار."
 
-#: actions/showstream.php:72
+#. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
+#: actions/showstream.php:70
 #, fuzzy, php-format
-msgid " tagged %s"
-msgstr "الإشعارات الموسومة ب%s"
+msgid "%1$s tagged %2$s"
+msgstr "%1$s، الصفحة %2$d"
 
-#: actions/showstream.php:78
+#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#: actions/showstream.php:74
+#, fuzzy, php-format
+msgid "%1$s tagged %2$s, page %3$d"
+msgstr "الإشعارات الموسومة ب%s، الصفحة %2$d"
+
+#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$d is the page number.
+#: actions/showstream.php:82
 #, php-format
 msgid "%1$s, page %2$d"
 msgstr "%1$s، الصفحة %2$d"
 
-#: actions/showstream.php:120
+#. TRANS: Title for link to notice feed.
+#. TRANS: %1$s is a user nickname, %2$s is a hashtag.
+#: actions/showstream.php:127
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr ""
 
-#: actions/showstream.php:127
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:136
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr ""
 
-#: actions/showstream.php:134
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:145
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr ""
 
-#: actions/showstream.php:141
+#: actions/showstream.php:152
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr ""
 
-#: actions/showstream.php:146
+#. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
+#. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
+#: actions/showstream.php:159
 #, fuzzy, php-format
 msgid "FOAF for %s"
 msgstr "صندوق %s الصادر"
 
-#: actions/showstream.php:197
+#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
+#: actions/showstream.php:211
 #, php-format
-msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
+msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr ""
 
-#: actions/showstream.php:202
+#. TRANS: Second sentence of empty list message for a stream for the user themselves.
+#: actions/showstream.php:217
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
 msgstr ""
 
-#: actions/showstream.php:204
+#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:221
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
 "%?status_textarea=%2$s)."
 msgstr ""
 
-#: actions/showstream.php:243
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:264
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4829,7 +4868,9 @@ msgstr ""
 "[انضم الآن](%%%%action.register%%%%) لتتابع إشعارت **%s** وغيره! ([اقرأ "
 "المزيد](%%%%doc.help%%%%))"
 
-#: actions/showstream.php:248
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:271
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4840,7 +4881,8 @@ msgstr ""
 "wikipedia.org/wiki/Micro-blogging) المبنية على البرنامج الحر [StatusNet]"
 "(http://status.net/). "
 
-#: actions/showstream.php:305
+#. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
+#: actions/showstream.php:328
 #, php-format
 msgid "Repeat of %s"
 msgstr "تكرار ل%s"
@@ -4951,31 +4993,39 @@ msgstr "حد النص"
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:56
+#. TRANS: Page title for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:55
 msgid "Site Notice"
 msgstr "إشعار الموقع"
 
-#: actions/sitenoticeadminpanel.php:67
+#. TRANS: Instructions for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:66
 msgid "Edit site-wide message"
 msgstr "عدّل رسالة الموقع العامة"
 
-#: actions/sitenoticeadminpanel.php:103
+#. TRANS: Server error displayed when saving a site-wide notice was impossible.
+#: actions/sitenoticeadminpanel.php:101
 msgid "Unable to save site notice."
 msgstr "تعذّر حفظ إشعار الموقع."
 
-#: actions/sitenoticeadminpanel.php:113
-msgid "Max length for the site-wide notice is 255 chars."
+#. TRANS: Client error displayed when a site-wide notice was longer than allowed.
+#: actions/sitenoticeadminpanel.php:112
+msgid "Maximum length for the site-wide notice is 255 characters."
 msgstr ""
 
+#. TRANS: Label for site-wide notice text field in admin panel.
 #: actions/sitenoticeadminpanel.php:176
 msgid "Site notice text"
 msgstr "نص إشعار الموقع"
 
-#: actions/sitenoticeadminpanel.php:178
-msgid "Site-wide notice text (255 chars max; HTML okay)"
+#. TRANS: Tooltip for site-wide notice text field in admin panel.
+#: actions/sitenoticeadminpanel.php:179
+#, fuzzy
+msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr "نص إشعار عام للموقع (255 حرف كحد أقصى؛ يسمح بHTML)"
 
-#: actions/sitenoticeadminpanel.php:198
+#. TRANS: Title for button to save site notice in admin panel.
+#: actions/sitenoticeadminpanel.php:201
 msgid "Save site notice"
 msgstr "احفظ إشعار الموقع"
 
@@ -5431,75 +5481,93 @@ msgid ""
 msgstr ""
 
 #. TRANS: User admin panel title
-#: actions/useradminpanel.php:60
+#: actions/useradminpanel.php:58
 msgctxt "TITLE"
 msgid "User"
 msgstr "المستخدم"
 
-#: actions/useradminpanel.php:71
+#. TRANS: Instruction for user admin panel.
+#: actions/useradminpanel.php:69
 msgid "User settings for this StatusNet site"
 msgstr ""
 
-#: actions/useradminpanel.php:150
+#. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
+#: actions/useradminpanel.php:147
 msgid "Invalid bio limit. Must be numeric."
 msgstr ""
 
-#: actions/useradminpanel.php:156
-msgid "Invalid welcome text. Max length is 255 characters."
+#. TRANS: Form validation error in user admin panel when welcome text is too long.
+#: actions/useradminpanel.php:154
+#, fuzzy
+msgid "Invalid welcome text. Maximum length is 255 characters."
 msgstr "رسالة ترحيب غير صالحة. أقصى طول هو 255 حرف."
 
+#. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
+#. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
 #, php-format
-msgid "Invalid default subscripton: '%1$s' is not user."
+msgid "Invalid default subscripton: '%1$s' is not a user."
 msgstr ""
 
 #. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:106
+#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
 #: lib/personalgroupnav.php:109
 msgid "Profile"
 msgstr "الملف الشخصي"
 
-#: actions/useradminpanel.php:223
+#. TRANS: Field label in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:220
 msgid "Bio Limit"
 msgstr "حد السيرة"
 
-#: actions/useradminpanel.php:224
+#. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:222
 msgid "Maximum length of a profile bio in characters."
 msgstr ""
 
-#: actions/useradminpanel.php:232
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:231
 msgid "New users"
 msgstr "مستخدمون جدد"
 
+#. TRANS: Field label in user admin panel for setting new user welcome text.
 #: actions/useradminpanel.php:236
 msgid "New user welcome"
 msgstr "ترحيب المستخدمين الجدد"
 
-#: actions/useradminpanel.php:237
-msgid "Welcome text for new users (Max 255 chars)."
+#. TRANS: Tooltip in user admin panel for setting new user welcome text.
+#: actions/useradminpanel.php:238
+#, fuzzy
+msgid "Welcome text for new users (maximum 255 characters)."
 msgstr "نص الترحيب بالمستخدمين الجدد (255 حرفًا كحد أقصى)."
 
-#: actions/useradminpanel.php:242
+#. TRANS: Field label in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:244
 msgid "Default subscription"
 msgstr "الاشتراك المبدئي"
 
-#: actions/useradminpanel.php:243
+#. TRANS: Tooltip in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:246
 msgid "Automatically subscribe new users to this user."
 msgstr "أشرك المستخدمين الجدد بهذا المستخدم تلقائيًا."
 
-#: actions/useradminpanel.php:252
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:256
 msgid "Invitations"
 msgstr "الدعوات"
 
-#: actions/useradminpanel.php:257
+#. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:262
 msgid "Invitations enabled"
 msgstr "الدعوات مُفعلة"
 
-#: actions/useradminpanel.php:259
+#. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:265
 msgid "Whether to allow users to invite new users."
 msgstr ""
 
-#: actions/useradminpanel.php:295
+#. TRANS: Title for button to save user settings in user admin panel.
+#: actions/useradminpanel.php:302
 msgid "Save user settings"
 msgstr ""
 
@@ -5691,7 +5759,7 @@ msgid "Plugins"
 msgstr "الملحقات"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:831
+#: actions/version.php:198 lib/action.php:880
 msgid "Version"
 msgstr "النسخة"
 
@@ -5898,16 +5966,23 @@ msgstr "تعذر تحديث المجموعة المحلية."
 msgid "RT @%1$s %2$s"
 msgstr "آر تي @%1$s %2$s"
 
+#. TRANS: Full name of a profile or group followed by nickname in parens
+#: classes/Profile.php:164
+#, fuzzy, php-format
+msgctxt "FANCYNAME"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:791
+#: classes/Profile.php:812
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:800
+#: classes/Profile.php:821
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6054,196 +6129,203 @@ msgstr "%1$s - %2$s"
 msgid "Untitled page"
 msgstr "صفحة غير مُعنونة"
 
+#. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
+#: lib/action.php:310
+msgctxt "TOOLTIP"
+msgid "Show more"
+msgstr ""
+
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:477
+#: lib/action.php:526
 #, fuzzy
 msgid "Primary site navigation"
 msgstr "ضبط الموقع الأساسي"
 
 #. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:483
+#: lib/action.php:532
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "الملف الشخصي ومسار الأصدقاء الزمني"
 
 #. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:486
+#: lib/action.php:535
 msgctxt "MENU"
 msgid "Personal"
 msgstr "الصفحة الشخصية"
 
 #. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:488
+#: lib/action.php:537
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
 msgstr "غير بريدك الإلكتروني وكلمة سرّك وأفتارك وملفك الشخصي"
 
 #. TRANS: Main menu option when logged in for access to user settings
-#: lib/action.php:491
+#: lib/action.php:540
 msgid "Account"
 msgstr "الحساب"
 
 #. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:493
+#: lib/action.php:542
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "اتصل بالخدمات"
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:496
+#: lib/action.php:545
 msgid "Connect"
 msgstr "اتصل"
 
 #. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:499
+#: lib/action.php:548
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "غيّر ضبط الموقع"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:502 lib/groupnav.php:117
+#: lib/action.php:551 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "إداري"
 
 #. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:506
+#: lib/action.php:555
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "ادعُ أصدقائك وزملائك للانضمام إليك في %s"
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:509
+#: lib/action.php:558
 msgctxt "MENU"
 msgid "Invite"
 msgstr "ادعُ"
 
 #. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:515
+#: lib/action.php:564
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "اخرج من الموقع"
 
 #. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:518
+#: lib/action.php:567
 msgctxt "MENU"
 msgid "Logout"
 msgstr "اخرج"
 
 #. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:523
+#: lib/action.php:572
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "أنشئ حسابًا"
 
 #. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:526
+#: lib/action.php:575
 msgctxt "MENU"
 msgid "Register"
 msgstr "سجّل"
 
 #. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:529
+#: lib/action.php:578
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "لُج إلى الموقع"
 
 #. TRANS: Main menu option when not logged in to log in
-#: lib/action.php:532
+#: lib/action.php:581
 msgctxt "MENU"
 msgid "Login"
 msgstr "لُج"
 
 #. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:535
+#: lib/action.php:584
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "ساعدني!"
 
 #. TRANS: Main menu option for help on the StatusNet site
-#: lib/action.php:538
+#: lib/action.php:587
 msgctxt "MENU"
 msgid "Help"
 msgstr "مساعدة"
 
 #. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:541
+#: lib/action.php:590
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr "ابحث عن أشخاص أو نصوص"
 
 #. TRANS: Main menu option when logged in or when the StatusNet instance is not private
-#: lib/action.php:544
+#: lib/action.php:593
 msgctxt "MENU"
 msgid "Search"
 msgstr "ابحث"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:566 lib/adminpanelaction.php:387
+#: lib/action.php:615 lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "إشعار الموقع"
 
 #. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:633
+#: lib/action.php:682
 msgid "Local views"
 msgstr "المشاهدات المحلية"
 
 #. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:703
+#: lib/action.php:752
 msgid "Page notice"
 msgstr "إشعار الصفحة"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:804
+#: lib/action.php:853
 #, fuzzy
 msgid "Secondary site navigation"
 msgstr "ضبط الموقع الأساسي"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:810
+#: lib/action.php:859
 msgid "Help"
 msgstr "مساعدة"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:813
+#: lib/action.php:862
 msgid "About"
 msgstr "عن"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:816
+#: lib/action.php:865
 msgid "FAQ"
 msgstr "الأسئلة المكررة"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:821
+#: lib/action.php:870
 msgid "TOS"
 msgstr "الشروط"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:825
+#: lib/action.php:874
 msgid "Privacy"
 msgstr "خصوصية"
 
-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:828
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+#: lib/action.php:877
 msgid "Source"
 msgstr "المصدر"
 
-#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:834
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+#: lib/action.php:884
 msgid "Contact"
 msgstr "اتصل"
 
-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:837
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+#: lib/action.php:887
 msgid "Badge"
 msgstr "الجسر"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:866
+#: lib/action.php:916
 msgid "StatusNet software license"
 msgstr "رخصة برنامج StatusNet"
 
@@ -6251,7 +6333,7 @@ msgstr "رخصة برنامج StatusNet"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:873
+#: lib/action.php:923
 #, fuzzy, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -6261,7 +6343,7 @@ msgstr ""
 "broughtbyurl%%). "
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:876
+#: lib/action.php:926
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr ""
@@ -6270,7 +6352,7 @@ msgstr ""
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:883
+#: lib/action.php:933
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -6282,51 +6364,51 @@ msgstr ""
 "agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:899
+#: lib/action.php:949
 msgid "Site content license"
 msgstr "رخصة محتوى الموقع"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:906
+#: lib/action.php:956
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:913
+#: lib/action.php:963
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:917
+#: lib/action.php:967
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:949
+#: lib/action.php:999
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1285
+#: lib/action.php:1335
 #, fuzzy
 msgid "Pagination"
 msgstr "تسجيل"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1296
+#: lib/action.php:1346
 msgid "After"
 msgstr "بعد"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1306
+#: lib/action.php:1356
 msgid "Before"
 msgstr "قبل"
 
@@ -6679,7 +6761,7 @@ msgid "AJAX error"
 msgstr "خطأ أجاكس"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:233 lib/mailhandler.php:142
+#: lib/channel.php:233 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "اكتمل الأمر"
 
@@ -6696,7 +6778,7 @@ msgstr "لا ملف بهذه الهوية."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:626
+#: lib/command.php:99 lib/command.php:630
 #, fuzzy
 msgid "User has no last notice."
 msgstr "ليس للمستخدم إشعار أخير"
@@ -6768,6 +6850,14 @@ msgstr ""
 msgid "%1$s left group %2$s."
 msgstr ""
 
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: lib/command.php:426
+#, fuzzy, php-format
+msgctxt "WHOIS"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
 #. TRANS: Whois output. %s is the full name of the queried user.
 #: lib/command.php:430
 #, php-format
@@ -6805,134 +6895,146 @@ msgid ""
 "same server."
 msgstr ""
 
-#. TRANS: Message given if content is too long.
+#. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
 #: lib/command.php:488
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] "هذه طويلة جدًا. أطول حجم للإشعار %d  حرفًا."
+msgstr[1] "هذه طويلة جدًا. أطول حجم للإشعار %d  حرفًا."
+msgstr[2] "هذه طويلة جدًا. أطول حجم للإشعار %d  حرفًا."
+msgstr[3] "هذه طويلة جدًا. أطول حجم للإشعار %d  حرفًا."
+msgstr[4] "هذه طويلة جدًا. أطول حجم للإشعار %d  حرفًا."
+msgstr[5] "هذه طويلة جدًا. أطول حجم للإشعار %d  حرفًا."
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:514
+#: lib/command.php:516
 #, fuzzy
 msgid "Error sending direct message."
 msgstr "أنت ممنوع من إرسال رسائل مباشرة."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:551
+#: lib/command.php:553
 #, fuzzy, php-format
 msgid "Notice from %s repeated."
 msgstr "الإشعار من %s مكرر"
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:554
+#: lib/command.php:556
 msgid "Error repeating notice."
 msgstr "خطأ تكرار الإشعار."
 
-#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:589
-#, php-format
-msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
+#: lib/command.php:591
+#, fuzzy, php-format
+msgid "Notice too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] "هذه طويلة جدًا. أطول حجم للإشعار %d  حرفًا."
+msgstr[1] "هذه طويلة جدًا. أطول حجم للإشعار %d  حرفًا."
+msgstr[2] "هذه طويلة جدًا. أطول حجم للإشعار %d  حرفًا."
+msgstr[3] "هذه طويلة جدًا. أطول حجم للإشعار %d  حرفًا."
+msgstr[4] "هذه طويلة جدًا. أطول حجم للإشعار %d  حرفًا."
+msgstr[5] "هذه طويلة جدًا. أطول حجم للإشعار %d  حرفًا."
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:600
+#: lib/command.php:604
 #, fuzzy, php-format
 msgid "Reply to %s sent."
 msgstr "رُد على رسالة %s"
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:603
+#: lib/command.php:607
 msgid "Error saving notice."
 msgstr "خطأ أثناء حفظ الإشعار."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:650
+#: lib/command.php:654
 msgid "Specify the name of the user to subscribe to."
 msgstr ""
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:659
+#: lib/command.php:663
 msgid "Can't subscribe to OMB profiles by command."
 msgstr ""
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:667
+#: lib/command.php:671
 #, php-format
 msgid "Subscribed to %s."
 msgstr ""
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:688 lib/command.php:799
+#: lib/command.php:692 lib/command.php:803
 msgid "Specify the name of the user to unsubscribe from."
 msgstr ""
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:699
+#: lib/command.php:703
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:719 lib/command.php:745
+#: lib/command.php:723 lib/command.php:749
 msgid "Command not yet implemented."
 msgstr "الأمر لم يُجهزّ بعد."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:723
+#: lib/command.php:727
 msgid "Notification off."
 msgstr "الإشعار مُطفأ."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:726
+#: lib/command.php:730
 msgid "Can't turn off notification."
 msgstr "تعذّر إطفاء الإشعارات."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:749
+#: lib/command.php:753
 msgid "Notification on."
 msgstr "الإشعار يعمل."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:752
+#: lib/command.php:756
 msgid "Can't turn on notification."
 msgstr "تعذّر تشغيل الإشعار."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:766
+#: lib/command.php:770
 msgid "Login command is disabled."
 msgstr ""
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:779
+#: lib/command.php:783
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:808
+#: lib/command.php:812
 #, php-format
 msgid "Unsubscribed %s."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:826
+#: lib/command.php:830
 msgid "You are not subscribed to anyone."
 msgstr "لست مُشتركًا بأي أحد."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:831
+#: lib/command.php:835
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "لست مشتركًا بأحد."
@@ -6944,14 +7046,14 @@ msgstr[5] ""
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:853
+#: lib/command.php:857
 msgid "No one is subscribed to you."
 msgstr "لا أحد مشترك بك."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:858
+#: lib/command.php:862
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "لا أحد مشترك بك."
@@ -6963,14 +7065,14 @@ msgstr[5] ""
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:880
+#: lib/command.php:884
 msgid "You are not a member of any groups."
 msgstr "لست عضوًا في أي مجموعة."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:885
+#: lib/command.php:889
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "لست عضوًا في أي مجموعة."
@@ -6981,7 +7083,7 @@ msgstr[4] ""
 msgstr[5] ""
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:900
+#: lib/command.php:904
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -7209,7 +7311,7 @@ msgstr "1-64 حرفًا إنجليزيًا أو رقمًا بدون نقاط أ�
 
 #: lib/groupeditform.php:163
 #, fuzzy
-msgid "URL of the homepage or blog of the group or topic"
+msgid "URL of the homepage or blog of the group or topic."
 msgstr "مسار صفحة هذا التطبيق"
 
 #: lib/groupeditform.php:168
@@ -7218,19 +7320,35 @@ msgstr "صِف المجموعة أو الموضوع"
 
 #: lib/groupeditform.php:170
 #, fuzzy, php-format
-msgid "Describe the group or topic in %d characters"
-msgstr "صِف المجموعة أو الموضوع"
+msgid "Describe the group or topic in %d character or less"
+msgid_plural "Describe the group or topic in %d characters or less"
+msgstr[0] "صِف المجموعة أو الموضوع"
+msgstr[1] "صِف المجموعة أو الموضوع"
+msgstr[2] "صِف المجموعة أو الموضوع"
+msgstr[3] "صِف المجموعة أو الموضوع"
+msgstr[4] "صِف المجموعة أو الموضوع"
+msgstr[5] "صِف المجموعة أو الموضوع"
 
-#: lib/groupeditform.php:179
+#: lib/groupeditform.php:182
 #, fuzzy
 msgid ""
-"Location for the group, if any, like \"City, State (or Region), Country\""
+"Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr "مكان تواجدك، على سبيل المثال \"المدينة، الولاية (أو المنطقة)، الدولة\""
 
-#: lib/groupeditform.php:187
+#: lib/groupeditform.php:190
 #, php-format
-msgid "Extra nicknames for the group, comma- or space- separated, max %d"
-msgstr ""
+msgid ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"alias allowed."
+msgid_plural ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"aliases allowed."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
 
 #. TRANS: Menu item in the group navigation page.
 #: lib/groupnav.php:86
@@ -7722,7 +7840,7 @@ msgstr "هذا ليس عنوان بريدك الإلكتروني."
 msgid "Sorry, no incoming email allowed."
 msgstr "لا عنوان بريد إلكتروني وارد."
 
-#: lib/mailhandler.php:228
+#: lib/mailhandler.php:229
 #, php-format
 msgid "Unsupported message type: %s"
 msgstr "نوع رسالة غير مدعوم: %s"
@@ -8064,16 +8182,17 @@ msgid "Sandbox this user"
 msgstr "أضف هذا المستخدم إلى صندوق الرمل"
 
 #. TRANS: Fieldset legend for the search form.
-#: lib/searchaction.php:121
+#: lib/searchaction.php:120
 msgid "Search site"
 msgstr "ابحث في الموقع"
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
-#: lib/searchaction.php:129
+#: lib/searchaction.php:128
 msgid "Keyword(s)"
 msgstr "الكلمات المفتاحية"
 
+#. TRANS: Button text for searching site.
 #: lib/searchaction.php:130
 msgctxt "BUTTON"
 msgid "Search"
@@ -8163,8 +8282,8 @@ msgid "The theme file is missing or the upload failed."
 msgstr ""
 
 #: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:278 lib/themeuploader.php:282
-#: lib/themeuploader.php:290 lib/themeuploader.php:297
+#: lib/themeuploader.php:279 lib/themeuploader.php:283
+#: lib/themeuploader.php:291 lib/themeuploader.php:298
 #, fuzzy
 msgid "Failed saving theme."
 msgstr "فشل تحديث الأفتار."
@@ -8175,29 +8294,36 @@ msgstr ""
 
 #: lib/themeuploader.php:166
 #, php-format
-msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
-msgstr ""
+msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
+msgid_plural ""
+"Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
 
-#: lib/themeuploader.php:178
+#: lib/themeuploader.php:179
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr ""
 
-#: lib/themeuploader.php:218
+#: lib/themeuploader.php:219
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
 msgstr ""
 
-#: lib/themeuploader.php:224
+#: lib/themeuploader.php:225
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr ""
 
-#: lib/themeuploader.php:241
+#: lib/themeuploader.php:242
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr ""
 
-#: lib/themeuploader.php:259
+#: lib/themeuploader.php:260
 msgid "Error opening theme archive."
 msgstr "خطأ أثناء تحديث الملف الشخصي البعيد."
 
@@ -8399,24 +8525,41 @@ msgstr[3] "هذه طويلة جدًا. أطول حجم للإشعار %d  حرف
 msgstr[4] "هذه طويلة جدًا. أطول حجم للإشعار %d  حرفًا."
 msgstr[5] "هذه طويلة جدًا. أطول حجم للإشعار %d  حرفًا."
 
-#: scripts/restoreuser.php:82
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: scripts/restoreuser.php:61
 #, php-format
-msgid "Backup file for user %s (%s)"
+msgid "Getting backup from file '%s'."
 msgstr ""
 
-#: scripts/restoreuser.php:88
+#. TRANS: Commandline script output.
+#: scripts/restoreuser.php:91
 #, fuzzy
 msgid "No user specified; using backup user."
 msgstr "لا هوية مستخدم محددة."
 
-#: scripts/restoreuser.php:94
+#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
+#: scripts/restoreuser.php:98
 #, php-format
-msgid "%d entries in backup."
-msgstr ""
+msgid "%d entry in backup."
+msgid_plural "%d entries in backup."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
+#, fuzzy
+#~ msgid "Name is too long (maximum 255 chars)."
+#~ msgstr "الاسم طويل جدا (الأقصى 255 حرفا)."
 
 #, fuzzy
-#~ msgid "Description is too long (max %d chars)."
-#~ msgstr "المنظمة طويلة جدا (الأقصى %d حرفا)."
+#~ msgid "Organization is too long (maximum 255 chars)."
+#~ msgstr "المنظمة طويلة جدا (الأقصى 255 حرفا)."
+
+#~ msgid "That's too long. Max notice size is %d chars."
+#~ msgstr "هذه طويلة جدًا. أطول حجم للإشعار %d  حرفًا."
 
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "كنيات كيرة! العدد الأقصى هو %d."
+#, fuzzy
+#~ msgid " tagged %s"
+#~ msgstr "الإشعارات الموسومة ب%s"
diff --git a/locale/arz/LC_MESSAGES/statusnet.po b/locale/arz/LC_MESSAGES/statusnet.po
index f6052299e..112142090 100644
--- a/locale/arz/LC_MESSAGES/statusnet.po
+++ b/locale/arz/LC_MESSAGES/statusnet.po
@@ -11,19 +11,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-30 23:18+0000\n"
-"PO-Revision-Date: 2010-10-30 23:19:50+0000\n"
+"POT-Creation-Date: 2010-11-02 22:51+0000\n"
+"PO-Revision-Date: 2010-11-02 22:52:59+0000\n"
 "Language-Team: Egyptian Spoken Arabic <http://translatewiki.net/wiki/Portal:"
 "arz>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r75708); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r75875); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: arz\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=6; plural= n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
 "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-"X-POT-Import-Date: 2010-10-30 09:48:40+0000\n"
+"X-POT-Import-Date: 2010-10-30 23:42:01+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -83,15 +83,20 @@ msgstr "اذف إعدادت الموقع"
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
+#. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
+#. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #: actions/accessadminpanel.php:193 actions/emailsettings.php:228
-#: actions/imsettings.php:187 actions/pathsadminpanel.php:512
-#: actions/profilesettings.php:201 actions/smssettings.php:209
-#: actions/subscriptions.php:246 lib/applicationeditform.php:355
+#: actions/imsettings.php:187 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: lib/applicationeditform.php:355 lib/groupeditform.php:207
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Save"
@@ -143,7 +148,7 @@ msgstr "لا وسم كهذا."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:495 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "لا مستخدم كهذا."
@@ -210,7 +215,9 @@ msgstr ""
 
 #. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:208
+#. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227
 #, fuzzy, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -570,8 +577,11 @@ msgstr "الاسم الكامل طويل جدا (الأقصى 255 حرفًا)"
 #. TRANS: Group edit form validation error.
 #. TRANS: Form validation error in New application form.
 #. TRANS: %d is the maximum number of characters for the description.
+#. TRANS: Group create form validation error.
+#. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:220 actions/editapplication.php:201
 #: actions/editgroup.php:216 actions/newapplication.php:178
+#: actions/newgroup.php:152
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -743,14 +753,14 @@ msgstr "لا تملك تصريحًا."
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:172 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:74
 #: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
 #: actions/groupunblock.php:65 actions/imsettings.php:230
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
-#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/othersettings.php:153 actions/passwordsettings.php:138
 #: actions/profilesettings.php:221 actions/recoverpassword.php:350
 #: actions/register.php:172 actions/remotesubscribe.php:77
 #: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
@@ -926,20 +936,21 @@ msgstr "لا يمكنك حذف المستخدمين."
 
 #. TRANS: Client error displayed trying to repeat a non-existing notice through the API.
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
+#. TRANS: Error message displayed trying to delete a non-existing notice.
 #: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/deletenotice.php:58 actions/shownotice.php:92
+#: actions/deletenotice.php:61 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "لا إشعار كهذا."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:535
+#: actions/apistatusesretweet.php:83 lib/command.php:537
 msgid "Cannot repeat your own notice."
 msgstr "مش نافعه تتكرر الملاحظتك بتاعتك."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:541
+#: actions/apistatusesretweet.php:92 lib/command.php:543
 msgid "Already repeated that notice."
 msgstr "الملاحظه اتكررت فعلا."
 
@@ -961,7 +972,8 @@ msgstr ""
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#: actions/apistatusesupdate.php:244
+#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
+#: lib/mailhandler.php:60
 #, fuzzy, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
@@ -980,7 +992,7 @@ msgstr "الـ API method مش موجوده."
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
-#: actions/apistatusesupdate.php:308
+#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
 #, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
@@ -1197,17 +1209,18 @@ msgstr ""
 msgid "Lost our file data."
 msgstr ""
 
-#: actions/avatarsettings.php:384
+#. TRANS: Success message for having updated a user avatar.
+#: actions/avatarsettings.php:385
 msgid "Avatar updated."
 msgstr "رُفع الأفتار."
 
 #. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
-#: actions/avatarsettings.php:388
+#: actions/avatarsettings.php:389
 msgid "Failed updating avatar."
 msgstr "فشل تحديث الأفتار."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:412
+#: actions/avatarsettings.php:413
 msgid "Avatar deleted."
 msgstr "حُذف الأفتار."
 
@@ -1236,8 +1249,8 @@ msgstr ""
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:154 actions/deleteapplication.php:154
-#: actions/deletegroup.php:220 actions/deletenotice.php:150
+#: actions/block.php:154 actions/deleteapplication.php:157
+#: actions/deletegroup.php:220 actions/deletenotice.php:155
 #: actions/deleteuser.php:152 actions/groupblock.php:178
 msgctxt "BUTTON"
 msgid "No"
@@ -1255,8 +1268,8 @@ msgstr "لا تمنع هذا المستخدم"
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:161 actions/deleteapplication.php:161
-#: actions/deletegroup.php:227 actions/deletenotice.php:157
+#: actions/block.php:161 actions/deleteapplication.php:164
+#: actions/deletegroup.php:227 actions/deletenotice.php:162
 #: actions/deleteuser.php:159 actions/groupblock.php:185
 #, fuzzy
 msgctxt "BUTTON"
@@ -1376,12 +1389,13 @@ msgstr "هذا البريد الإلكترونى ملك مستخدم آخر با
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
 #. TRANS: Server error thrown on database error updating IM preferences.
 #. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
 #. TRANS: Server error thrown when user profile settings could not be updated.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #: actions/confirmaddress.php:118 actions/emailsettings.php:331
 #: actions/emailsettings.php:477 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:174
+#: actions/imsettings.php:442 actions/othersettings.php:184
 #: actions/profilesettings.php:326 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
@@ -1417,17 +1431,20 @@ msgstr "محادثة"
 msgid "Notices"
 msgstr "الإشعارات"
 
-#: actions/deleteapplication.php:63
+#. TRANS: Client error displayed trying to delete an application while not logged in.
+#: actions/deleteapplication.php:62
 msgid "You must be logged in to delete an application."
 msgstr "لازم يكون متسجل دخولك علشان تعدّل application."
 
+#. TRANS: Client error displayed trying to delete an application that does not exist.
 #: actions/deleteapplication.php:71
 #, fuzzy
 msgid "Application not found."
 msgstr "لم يوجد رمز التأكيد."
 
+#. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
-#: actions/deleteapplication.php:78 actions/editapplication.php:78
+#: actions/deleteapplication.php:79 actions/editapplication.php:78
 #: actions/showapplication.php:94
 msgid "You are not the owner of this application."
 msgstr "انت مش بتملك الapplication دى."
@@ -1435,15 +1452,18 @@ msgstr "انت مش بتملك الapplication دى."
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
 #: actions/newapplication.php:114 actions/showapplication.php:118
-#: lib/action.php:1354
+#: lib/action.php:1404
 msgid "There was a problem with your session token."
 msgstr ""
 
-#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+#. TRANS: Title for delete application page.
+#. TRANS: Fieldset legend on delete application page.
+#: actions/deleteapplication.php:124 actions/deleteapplication.php:149
 msgid "Delete application"
 msgstr "OAuth applications"
 
-#: actions/deleteapplication.php:149
+#. TRANS: Confirmation text on delete application page.
+#: actions/deleteapplication.php:152
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
 "about the application from the database, including all existing user "
@@ -1451,13 +1471,13 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:158
+#: actions/deleteapplication.php:161
 #, fuzzy
 msgid "Do not delete this application"
 msgstr "لا تحذف هذا الإشعار"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:164
+#: actions/deleteapplication.php:167
 #, fuzzy
 msgid "Delete this application"
 msgstr "احذف هذا الإشعار"
@@ -1495,13 +1515,14 @@ msgstr "تعذر تحديث المجموعه."
 msgid "Deleted group %s"
 msgstr "%1$s ساب جروپ %2$s"
 
-#. TRANS: Title.
+#. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
 #: actions/deletegroup.php:176 actions/deletegroup.php:202
 #, fuzzy
 msgid "Delete group"
 msgstr "احذف المستخدم"
 
+#. TRANS: Warning in form for deleleting a group.
 #: actions/deletegroup.php:206
 msgid ""
 "Are you sure you want to delete this group? This will clear all data about "
@@ -1521,10 +1542,11 @@ msgstr "لا تحذف هذا الإشعار"
 msgid "Delete this group"
 msgstr "احذف هذا المستخدم"
 
+#. TRANS: Error message displayed trying to delete a notice while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1534,31 +1556,36 @@ msgstr "احذف هذا المستخدم"
 msgid "Not logged in."
 msgstr "لست والجًا."
 
-#: actions/deletenotice.php:74
+#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
+#: actions/deletenotice.php:78
 msgid "Can't delete this notice."
 msgstr "تعذّر حذف هذا الإشعار."
 
-#: actions/deletenotice.php:106
+#. TRANS: Instructions for deleting a notice.
+#: actions/deletenotice.php:110
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
 msgstr ""
 
-#: actions/deletenotice.php:112 actions/deletenotice.php:144
+#. TRANS: Page title when deleting a notice.
+#. TRANS: Fieldset legend for the delete notice form.
+#: actions/deletenotice.php:117 actions/deletenotice.php:148
 msgid "Delete notice"
 msgstr "احذف الإشعار"
 
-#: actions/deletenotice.php:147
+#. TRANS: Message for the delete notice form.
+#: actions/deletenotice.php:152
 msgid "Are you sure you want to delete this notice?"
 msgstr "أمتأكد من أنك تريد حذف هذا الإشعار؟"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:154
+#: actions/deletenotice.php:159
 msgid "Do not delete this notice"
 msgstr "لا تحذف هذا الإشعار"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:161 lib/noticelist.php:667
+#: actions/deletenotice.php:166 lib/noticelist.php:667
 msgid "Delete this notice"
 msgstr "احذف هذا الإشعار"
 
@@ -1720,11 +1747,9 @@ msgstr "ارجع إلى المبدئي"
 
 #. TRANS: Submit button title.
 #: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
-#: actions/othersettings.php:126 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: actions/useradminpanel.php:295 lib/applicationeditform.php:357
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: lib/applicationeditform.php:357 lib/designsettings.php:256
 msgid "Save"
 msgstr "أرسل"
 
@@ -1773,9 +1798,9 @@ msgid "Name is required."
 msgstr "الاسم مطلوب."
 
 #. TRANS: Validation error shown when providing too long a name in the "Edit application" form.
-#: actions/editapplication.php:188
+#: actions/editapplication.php:188 actions/newapplication.php:169
 #, fuzzy
-msgid "Name is too long (max 255 characters)."
+msgid "Name is too long (maximum 255 characters)."
 msgstr "الاسم طويل جدا (اكتر حاجه 255 رمز)."
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
@@ -1806,7 +1831,7 @@ msgid "Organization is required."
 msgstr "الوصف مطلوب."
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#: actions/editapplication.php:223
+#: actions/editapplication.php:223 actions/newapplication.php:199
 #, fuzzy
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "المنظمه طويله جدا (اكتر حاجه 255 رمز)."
@@ -2592,7 +2617,7 @@ msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr ""
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:180
+#: actions/imsettings.php:290 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "حُفِظت التفضيلات."
 
@@ -2723,10 +2748,9 @@ msgstr[5] "لست مشتركًا بأحد."
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#. TRANS: Whois output.
-#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:145 actions/invite.php:159 lib/command.php:426
-#, php-format
+#: actions/invite.php:145 actions/invite.php:159
+#, fuzzy, php-format
+msgctxt "INVITE"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
@@ -2888,8 +2912,9 @@ msgid ""
 msgstr ""
 
 #: actions/licenseadminpanel.php:156
-msgid "Invalid license title. Max length is 255 characters."
-msgstr ""
+#, fuzzy
+msgid "Invalid license title. Maximum length is 255 characters."
+msgstr "رساله ترحيب غير صالحه. أقصى طول هو 255 حرف."
 
 #: actions/licenseadminpanel.php:168
 msgid "Invalid license URL."
@@ -3058,21 +3083,11 @@ msgstr "لازم تكون مسجل دخوللك علشان تسجل application.
 msgid "Use this form to register a new application."
 msgstr "استعمل الفورمه دى علشان تسجل application جديد."
 
-#: actions/newapplication.php:169
-#, fuzzy
-msgid "Name is too long (maximum 255 chars)."
-msgstr "الاسم طويل جدا (اكتر حاجه 255 رمز)."
-
 #: actions/newapplication.php:184
 #, fuzzy
 msgid "Source URL is required."
 msgstr "الSource URL مش مظبوط."
 
-#: actions/newapplication.php:199
-#, fuzzy
-msgid "Organization is too long (maximum 255 chars)."
-msgstr "المنظمه طويله جدا (اكتر حاجه 255 رمز)."
-
 #: actions/newapplication.php:266 actions/newapplication.php:275
 msgid "Could not create application."
 msgstr "مش ممكن إنشاء الapplication."
@@ -3092,7 +3107,7 @@ msgid "New message"
 msgstr "رساله جديدة"
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:499
+#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501
 #, fuzzy
 msgid "You can't send a message to this user."
 msgstr "أرسل رساله مباشره إلى هذا المستخدم"
@@ -3100,7 +3115,7 @@ msgstr "أرسل رساله مباشره إلى هذا المستخدم"
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
 #: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
-#: lib/command.php:579
+#: lib/command.php:581
 msgid "No content!"
 msgstr "لا محتوى!"
 
@@ -3109,7 +3124,7 @@ msgid "No recipient specified."
 msgstr "لا مستلم حُدّد."
 
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:503
+#: actions/newmessage.php:167 lib/command.php:505
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -3120,12 +3135,12 @@ msgstr "أُرسلت الرسالة"
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:511
+#: actions/newmessage.php:188 lib/command.php:513
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "رساله مباشره اتبعتت لـ%s."
 
-#: actions/newmessage.php:213 actions/newnotice.php:263
+#: actions/newmessage.php:213 actions/newnotice.php:264
 msgid "Ajax Error"
 msgstr "خطأ أجاكس"
 
@@ -3133,17 +3148,7 @@ msgstr "خطأ أجاكس"
 msgid "New notice"
 msgstr "إشعار جديد"
 
-#: actions/newnotice.php:159 lib/mailhandler.php:60
-#, fuzzy, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr "هذا الملف كبير جدًا. إن أقصى حجم للملفات هو %d."
-
-#: actions/newnotice.php:183
-#, php-format
-msgid "Max notice size is %d chars, including attachment URL."
-msgstr ""
-
-#: actions/newnotice.php:229
+#: actions/newnotice.php:230
 msgid "Notice posted"
 msgstr "أُرسل الإشعار"
 
@@ -3305,37 +3310,46 @@ msgstr "تدوير فى الأشخاص"
 msgid "Notice Search"
 msgstr "بحث الإشعارات"
 
-#: actions/othersettings.php:60
+#: actions/othersettings.php:59
 msgid "Other settings"
 msgstr "تظبيطات تانيه"
 
+#. TRANS: Instructions for tab "Other" in user profile settings.
 #: actions/othersettings.php:71
 msgid "Manage various other options."
 msgstr "أدر خيارات أخرى عديده."
 
-#: actions/othersettings.php:108
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/othersettings.php:111
 msgid " (free service)"
 msgstr " (خدمه حرة)"
 
-#: actions/othersettings.php:116
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/othersettings.php:120
 msgid "Shorten URLs with"
 msgstr "قصّر المسارات بـ"
 
-#: actions/othersettings.php:117
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/othersettings.php:122
 msgid "Automatic shortening service to use."
 msgstr "خدمه التقصير المطلوب استخدامها."
 
-#: actions/othersettings.php:122
+#. TRANS: Label for checkbox.
+#: actions/othersettings.php:128
 msgid "View profile designs"
 msgstr "اعرض تصاميم الملف الشخصي"
 
-#: actions/othersettings.php:123
+#. TRANS: Tooltip for checkbox.
+#: actions/othersettings.php:130
 msgid "Show or hide profile designs."
 msgstr "أظهر أو أخفِ تصاميم الملفات الشخصيه."
 
-#: actions/othersettings.php:153
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/othersettings.php:162
 #, fuzzy
-msgid "URL shortening service is too long (max 50 chars)."
+msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "الاسم الكامل طويل جدا (الأقصى 255 حرفًا)"
 
 #: actions/otp.php:69
@@ -3821,7 +3835,7 @@ msgstr "السيرة"
 #. TRANS: Label for group location (dt). Text hidden by default.
 #: actions/profilesettings.php:149 actions/register.php:485
 #: actions/showgroup.php:267 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:177
+#: actions/userauthorization.php:166 lib/groupeditform.php:180
 #: lib/userprofile.php:165
 msgid "Location"
 msgstr "الموقع"
@@ -4159,7 +4173,8 @@ msgid "Unexpected password reset."
 msgstr "أعد ضبط كلمه السر"
 
 #: actions/recoverpassword.php:365
-msgid "Password must be 6 chars or more."
+#, fuzzy
+msgid "Password must be 6 characters or more."
 msgstr "يجب أن تكون كلمه السر 6 محارف أو أكثر."
 
 #: actions/recoverpassword.php:369
@@ -4508,7 +4523,7 @@ msgstr "المنظمه"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:172
+#: lib/applicationeditform.php:208 lib/groupeditform.php:175
 msgid "Description"
 msgstr "الوصف"
 
@@ -4658,7 +4673,7 @@ msgid "Note"
 msgstr "ملاحظة"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:298 lib/groupeditform.php:184
+#: actions/showgroup.php:298 lib/groupeditform.php:187
 msgid "Aliases"
 msgstr "الكنى"
 
@@ -4788,60 +4803,84 @@ msgstr "نتايج التدوير لـ\"%1$s\" على %2$s"
 msgid "Notice deleted."
 msgstr "حُذف الإشعار."
 
-#: actions/showstream.php:72
+#. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
+#: actions/showstream.php:70
 #, fuzzy, php-format
-msgid " tagged %s"
+msgid "%1$s tagged %2$s"
+msgstr "%1$s و الصحاب, صفحه %2$d"
+
+#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#: actions/showstream.php:74
+#, fuzzy, php-format
+msgid "%1$s tagged %2$s, page %3$d"
 msgstr "الإشعارات الموسومه ب%s"
 
-#: actions/showstream.php:78
+#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$d is the page number.
+#: actions/showstream.php:82
 #, php-format
 msgid "%1$s, page %2$d"
 msgstr "%1$s و الصحاب, صفحه %2$d"
 
-#: actions/showstream.php:120
+#. TRANS: Title for link to notice feed.
+#. TRANS: %1$s is a user nickname, %2$s is a hashtag.
+#: actions/showstream.php:127
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr ""
 
-#: actions/showstream.php:127
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:136
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr ""
 
-#: actions/showstream.php:134
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:145
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr ""
 
-#: actions/showstream.php:141
+#: actions/showstream.php:152
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr ""
 
-#: actions/showstream.php:146
+#. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
+#. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
+#: actions/showstream.php:159
 #, php-format
 msgid "FOAF for %s"
 msgstr ""
 
-#: actions/showstream.php:197
+#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
+#: actions/showstream.php:211
 #, php-format
-msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
+msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr ""
 
-#: actions/showstream.php:202
+#. TRANS: Second sentence of empty list message for a stream for the user themselves.
+#: actions/showstream.php:217
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
 msgstr ""
 
-#: actions/showstream.php:204
+#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:221
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
 "%?status_textarea=%2$s)."
 msgstr ""
 
-#: actions/showstream.php:243
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:264
 #, fuzzy, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4854,7 +4893,9 @@ msgstr ""
 "الآن](%%action.register%%) لتشارك اشعاراتك مع أصدقائك وعائلتك وزملائك! "
 "([اقرأ المزيد](%%doc.help%%))"
 
-#: actions/showstream.php:248
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:271
 #, fuzzy, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4864,7 +4905,8 @@ msgstr ""
 "هنا %%site.name%%، خدمه [التدوين المُصغّر](http://en.wikipedia.org/wiki/Micro-"
 "blogging) المبنيه على البرنامج الحر [StatusNet](http://status.net/)."
 
-#: actions/showstream.php:305
+#. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
+#: actions/showstream.php:328
 #, php-format
 msgid "Repeat of %s"
 msgstr "تكرارات %s"
@@ -4977,35 +5019,42 @@ msgstr "حد النص"
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:56
+#. TRANS: Page title for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:55
 #, fuzzy
 msgid "Site Notice"
 msgstr "إشعار الموقع"
 
-#: actions/sitenoticeadminpanel.php:67
+#. TRANS: Instructions for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:66
 #, fuzzy
 msgid "Edit site-wide message"
 msgstr "رساله جديدة"
 
-#: actions/sitenoticeadminpanel.php:103
+#. TRANS: Server error displayed when saving a site-wide notice was impossible.
+#: actions/sitenoticeadminpanel.php:101
 #, fuzzy
 msgid "Unable to save site notice."
 msgstr "مشكله أثناء حفظ الإشعار."
 
-#: actions/sitenoticeadminpanel.php:113
-msgid "Max length for the site-wide notice is 255 chars."
+#. TRANS: Client error displayed when a site-wide notice was longer than allowed.
+#: actions/sitenoticeadminpanel.php:112
+msgid "Maximum length for the site-wide notice is 255 characters."
 msgstr ""
 
+#. TRANS: Label for site-wide notice text field in admin panel.
 #: actions/sitenoticeadminpanel.php:176
 #, fuzzy
 msgid "Site notice text"
 msgstr "إشعار الموقع"
 
-#: actions/sitenoticeadminpanel.php:178
-msgid "Site-wide notice text (255 chars max; HTML okay)"
+#. TRANS: Tooltip for site-wide notice text field in admin panel.
+#: actions/sitenoticeadminpanel.php:179
+msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:198
+#. TRANS: Title for button to save site notice in admin panel.
+#: actions/sitenoticeadminpanel.php:201
 #, fuzzy
 msgid "Save site notice"
 msgstr "إشعار الموقع"
@@ -5466,76 +5515,94 @@ msgid ""
 msgstr ""
 
 #. TRANS: User admin panel title
-#: actions/useradminpanel.php:60
+#: actions/useradminpanel.php:58
 #, fuzzy
 msgctxt "TITLE"
 msgid "User"
 msgstr "المستخدم"
 
-#: actions/useradminpanel.php:71
+#. TRANS: Instruction for user admin panel.
+#: actions/useradminpanel.php:69
 msgid "User settings for this StatusNet site"
 msgstr ""
 
-#: actions/useradminpanel.php:150
+#. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
+#: actions/useradminpanel.php:147
 msgid "Invalid bio limit. Must be numeric."
 msgstr ""
 
-#: actions/useradminpanel.php:156
-msgid "Invalid welcome text. Max length is 255 characters."
+#. TRANS: Form validation error in user admin panel when welcome text is too long.
+#: actions/useradminpanel.php:154
+#, fuzzy
+msgid "Invalid welcome text. Maximum length is 255 characters."
 msgstr "رساله ترحيب غير صالحه. أقصى طول هو 255 حرف."
 
+#. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
+#. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
 #, php-format
-msgid "Invalid default subscripton: '%1$s' is not user."
+msgid "Invalid default subscripton: '%1$s' is not a user."
 msgstr ""
 
 #. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:106
+#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
 #: lib/personalgroupnav.php:109
 msgid "Profile"
 msgstr "الملف الشخصي"
 
-#: actions/useradminpanel.php:223
+#. TRANS: Field label in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:220
 msgid "Bio Limit"
 msgstr "حد السيرة"
 
-#: actions/useradminpanel.php:224
+#. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:222
 msgid "Maximum length of a profile bio in characters."
 msgstr ""
 
-#: actions/useradminpanel.php:232
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:231
 msgid "New users"
 msgstr "مستخدمون جدد"
 
+#. TRANS: Field label in user admin panel for setting new user welcome text.
 #: actions/useradminpanel.php:236
 msgid "New user welcome"
 msgstr "ترحيب المستخدمين الجدد"
 
-#: actions/useradminpanel.php:237
-msgid "Welcome text for new users (Max 255 chars)."
+#. TRANS: Tooltip in user admin panel for setting new user welcome text.
+#: actions/useradminpanel.php:238
+#, fuzzy
+msgid "Welcome text for new users (maximum 255 characters)."
 msgstr "نص الترحيب بالمستخدمين الجدد (255 حرفًا كحد أقصى)."
 
-#: actions/useradminpanel.php:242
+#. TRANS: Field label in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:244
 msgid "Default subscription"
 msgstr "الاشتراك المبدئي"
 
-#: actions/useradminpanel.php:243
+#. TRANS: Tooltip in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:246
 msgid "Automatically subscribe new users to this user."
 msgstr "أشرك المستخدمين الجدد بهذا المستخدم تلقائيًا."
 
-#: actions/useradminpanel.php:252
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:256
 msgid "Invitations"
 msgstr "الدعوات"
 
-#: actions/useradminpanel.php:257
+#. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:262
 msgid "Invitations enabled"
 msgstr "الدعوات مُفعلة"
 
-#: actions/useradminpanel.php:259
+#. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:265
 msgid "Whether to allow users to invite new users."
 msgstr ""
 
-#: actions/useradminpanel.php:295
+#. TRANS: Title for button to save user settings in user admin panel.
+#: actions/useradminpanel.php:302
 msgid "Save user settings"
 msgstr ""
 
@@ -5726,7 +5793,7 @@ msgid "Plugins"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:831
+#: actions/version.php:198 lib/action.php:880
 msgid "Version"
 msgstr "النسخه"
 
@@ -5934,16 +6001,23 @@ msgstr "تعذّر حفظ الاشتراك."
 msgid "RT @%1$s %2$s"
 msgstr "آر تى @%1$s %2$s"
 
+#. TRANS: Full name of a profile or group followed by nickname in parens
+#: classes/Profile.php:164
+#, fuzzy, php-format
+msgctxt "FANCYNAME"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:791
+#: classes/Profile.php:812
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:800
+#: classes/Profile.php:821
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6090,139 +6164,145 @@ msgstr "%1$s - %2$s"
 msgid "Untitled page"
 msgstr "صفحه غير مُعنونة"
 
+#. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
+#: lib/action.php:310
+msgctxt "TOOLTIP"
+msgid "Show more"
+msgstr ""
+
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:477
+#: lib/action.php:526
 #, fuzzy
 msgid "Primary site navigation"
 msgstr "ضبط الموقع الأساسي"
 
 #. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:483
+#: lib/action.php:532
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "الملف الشخصى ومسار الأصدقاء الزمني"
 
 #. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:486
+#: lib/action.php:535
 #, fuzzy
 msgctxt "MENU"
 msgid "Personal"
 msgstr "شخصية"
 
 #. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:488
+#: lib/action.php:537
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
 msgstr "غير كلمه سرّك"
 
 #. TRANS: Main menu option when logged in for access to user settings
-#: lib/action.php:491
+#: lib/action.php:540
 msgid "Account"
 msgstr "الحساب"
 
 #. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:493
+#: lib/action.php:542
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "كونيكشونات (Connections)"
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:496
+#: lib/action.php:545
 msgid "Connect"
 msgstr "اتصل"
 
 #. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:499
+#: lib/action.php:548
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "ضبط الموقع الأساسي"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:502 lib/groupnav.php:117
+#: lib/action.php:551 lib/groupnav.php:117
 #, fuzzy
 msgctxt "MENU"
 msgid "Admin"
 msgstr "إداري"
 
 #. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:506
+#: lib/action.php:555
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr ""
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:509
+#: lib/action.php:558
 #, fuzzy
 msgctxt "MENU"
 msgid "Invite"
 msgstr "ادعُ"
 
 #. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:515
+#: lib/action.php:564
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "سمه الموقع."
 
 #. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:518
+#: lib/action.php:567
 msgctxt "MENU"
 msgid "Logout"
 msgstr "الشعار"
 
 #. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:523
+#: lib/action.php:572
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "أنشئ مجموعه جديدة"
 
 #. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:526
+#: lib/action.php:575
 #, fuzzy
 msgctxt "MENU"
 msgid "Register"
 msgstr "سجّل"
 
 #. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:529
+#: lib/action.php:578
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "لُج إلى الموقع"
 
 #. TRANS: Main menu option when not logged in to log in
-#: lib/action.php:532
+#: lib/action.php:581
 #, fuzzy
 msgctxt "MENU"
 msgid "Login"
 msgstr "لُج"
 
 #. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:535
+#: lib/action.php:584
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "مساعدة"
 
 #. TRANS: Main menu option for help on the StatusNet site
-#: lib/action.php:538
+#: lib/action.php:587
 #, fuzzy
 msgctxt "MENU"
 msgid "Help"
 msgstr "مساعدة"
 
 #. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:541
+#: lib/action.php:590
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr "ابحث عن أشخاص أو نص"
 
 #. TRANS: Main menu option when logged in or when the StatusNet instance is not private
-#: lib/action.php:544
+#: lib/action.php:593
 #, fuzzy
 msgctxt "MENU"
 msgid "Search"
@@ -6230,69 +6310,70 @@ msgstr "ابحث"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:566 lib/adminpanelaction.php:387
+#: lib/action.php:615 lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "إشعار الموقع"
 
 #. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:633
+#: lib/action.php:682
 msgid "Local views"
 msgstr "المشاهدات المحلية"
 
 #. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:703
+#: lib/action.php:752
 msgid "Page notice"
 msgstr "إشعار الصفحة"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:804
+#: lib/action.php:853
 #, fuzzy
 msgid "Secondary site navigation"
 msgstr "ضبط الموقع الأساسي"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:810
+#: lib/action.php:859
 msgid "Help"
 msgstr "مساعدة"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:813
+#: lib/action.php:862
 msgid "About"
 msgstr "عن"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:816
+#: lib/action.php:865
 msgid "FAQ"
 msgstr "الأسئله المكررة"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:821
+#: lib/action.php:870
 msgid "TOS"
 msgstr "الشروط"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:825
+#: lib/action.php:874
 msgid "Privacy"
 msgstr "خصوصية"
 
-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:828
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+#: lib/action.php:877
 msgid "Source"
 msgstr "المصدر"
 
-#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:834
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+#: lib/action.php:884
 msgid "Contact"
 msgstr "اتصل"
 
-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:837
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+#: lib/action.php:887
 #, fuzzy
 msgid "Badge"
 msgstr "نبّه"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:866
+#: lib/action.php:916
 #, fuzzy
 msgid "StatusNet software license"
 msgstr "رخصه محتوى الموقع"
@@ -6301,7 +6382,7 @@ msgstr "رخصه محتوى الموقع"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:873
+#: lib/action.php:923
 #, fuzzy, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -6311,7 +6392,7 @@ msgstr ""
 "broughtbyurl%%). "
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:876
+#: lib/action.php:926
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr ""
@@ -6320,7 +6401,7 @@ msgstr ""
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:883
+#: lib/action.php:933
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -6332,51 +6413,51 @@ msgstr ""
 "agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:899
+#: lib/action.php:949
 msgid "Site content license"
 msgstr "رخصه محتوى الموقع"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:906
+#: lib/action.php:956
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:913
+#: lib/action.php:963
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:917
+#: lib/action.php:967
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:949
+#: lib/action.php:999
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1285
+#: lib/action.php:1335
 #, fuzzy
 msgid "Pagination"
 msgstr "المنظمه"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1296
+#: lib/action.php:1346
 msgid "After"
 msgstr "بعد"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1306
+#: lib/action.php:1356
 msgid "Before"
 msgstr "قبل"
 
@@ -6737,7 +6818,7 @@ msgid "AJAX error"
 msgstr "خطأ أجاكس"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:233 lib/mailhandler.php:142
+#: lib/channel.php:233 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "اكتمل الأمر"
 
@@ -6754,7 +6835,7 @@ msgstr "لا ملف بهذه الهويه."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:626
+#: lib/command.php:99 lib/command.php:630
 #, fuzzy
 msgid "User has no last notice."
 msgstr "ليس للمستخدم إشعار أخير"
@@ -6825,6 +6906,14 @@ msgstr ""
 msgid "%1$s left group %2$s."
 msgstr ""
 
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: lib/command.php:426
+#, fuzzy, php-format
+msgctxt "WHOIS"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
 #. TRANS: Whois output. %s is the full name of the queried user.
 #: lib/command.php:430
 #, php-format
@@ -6862,138 +6951,150 @@ msgid ""
 "same server."
 msgstr ""
 
-#. TRANS: Message given if content is too long.
+#. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
 #: lib/command.php:488
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] "هذا الملف كبير جدًا. إن أقصى حجم للملفات هو %d."
+msgstr[1] "هذا الملف كبير جدًا. إن أقصى حجم للملفات هو %d."
+msgstr[2] "هذا الملف كبير جدًا. إن أقصى حجم للملفات هو %d."
+msgstr[3] "هذا الملف كبير جدًا. إن أقصى حجم للملفات هو %d."
+msgstr[4] "هذا الملف كبير جدًا. إن أقصى حجم للملفات هو %d."
+msgstr[5] "هذا الملف كبير جدًا. إن أقصى حجم للملفات هو %d."
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:514
+#: lib/command.php:516
 #, fuzzy
 msgid "Error sending direct message."
 msgstr "أنت ممنوع من إرسال رسائل مباشره."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:551
+#: lib/command.php:553
 #, fuzzy, php-format
 msgid "Notice from %s repeated."
 msgstr "الإشعار من %s مكرر"
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:554
+#: lib/command.php:556
 msgid "Error repeating notice."
 msgstr "خطأ تكرار الإشعار."
 
-#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:589
-#, php-format
-msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
+#: lib/command.php:591
+#, fuzzy, php-format
+msgid "Notice too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] "هذا الملف كبير جدًا. إن أقصى حجم للملفات هو %d."
+msgstr[1] "هذا الملف كبير جدًا. إن أقصى حجم للملفات هو %d."
+msgstr[2] "هذا الملف كبير جدًا. إن أقصى حجم للملفات هو %d."
+msgstr[3] "هذا الملف كبير جدًا. إن أقصى حجم للملفات هو %d."
+msgstr[4] "هذا الملف كبير جدًا. إن أقصى حجم للملفات هو %d."
+msgstr[5] "هذا الملف كبير جدًا. إن أقصى حجم للملفات هو %d."
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:600
+#: lib/command.php:604
 #, fuzzy, php-format
 msgid "Reply to %s sent."
 msgstr "رُد على رساله %s"
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:603
+#: lib/command.php:607
 msgid "Error saving notice."
 msgstr "خطأ أثناء حفظ الإشعار."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:650
+#: lib/command.php:654
 msgid "Specify the name of the user to subscribe to."
 msgstr ""
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:659
+#: lib/command.php:663
 msgid "Can't subscribe to OMB profiles by command."
 msgstr ""
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:667
+#: lib/command.php:671
 #, php-format
 msgid "Subscribed to %s."
 msgstr ""
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:688 lib/command.php:799
+#: lib/command.php:692 lib/command.php:803
 msgid "Specify the name of the user to unsubscribe from."
 msgstr ""
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:699
+#: lib/command.php:703
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:719 lib/command.php:745
+#: lib/command.php:723 lib/command.php:749
 #, fuzzy
 msgid "Command not yet implemented."
 msgstr "اكتمل الأمر"
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:723
+#: lib/command.php:727
 #, fuzzy
 msgid "Notification off."
 msgstr "لا رمز تأكيد."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:726
+#: lib/command.php:730
 msgid "Can't turn off notification."
 msgstr ""
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:749
+#: lib/command.php:753
 #, fuzzy
 msgid "Notification on."
 msgstr "لا رمز تأكيد."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:752
+#: lib/command.php:756
 #, fuzzy
 msgid "Can't turn on notification."
 msgstr "مش نافعه تتكرر الملاحظتك بتاعتك."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:766
+#: lib/command.php:770
 msgid "Login command is disabled."
 msgstr ""
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:779
+#: lib/command.php:783
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:808
+#: lib/command.php:812
 #, php-format
 msgid "Unsubscribed %s."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:826
+#: lib/command.php:830
 msgid "You are not subscribed to anyone."
 msgstr "لست مُشتركًا بأى أحد."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:831
+#: lib/command.php:835
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "لست مشتركًا بأحد."
@@ -7005,14 +7106,14 @@ msgstr[5] ""
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:853
+#: lib/command.php:857
 msgid "No one is subscribed to you."
 msgstr "لا أحد مشترك بك."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:858
+#: lib/command.php:862
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "لا أحد مشترك بك."
@@ -7024,14 +7125,14 @@ msgstr[5] ""
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:880
+#: lib/command.php:884
 msgid "You are not a member of any groups."
 msgstr "لست عضوًا فى أى مجموعه."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:885
+#: lib/command.php:889
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "لست عضوًا فى أى مجموعه."
@@ -7042,7 +7143,7 @@ msgstr[4] ""
 msgstr[5] ""
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:900
+#: lib/command.php:904
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -7231,8 +7332,9 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr ""
 
 #: lib/groupeditform.php:163
-msgid "URL of the homepage or blog of the group or topic"
-msgstr ""
+#, fuzzy
+msgid "URL of the homepage or blog of the group or topic."
+msgstr "انت مش بتملك الapplication دى."
 
 #: lib/groupeditform.php:168
 #, fuzzy
@@ -7240,19 +7342,35 @@ msgid "Describe the group or topic"
 msgstr "اوصف الapplication بتاعتك"
 
 #: lib/groupeditform.php:170
-#, php-format
-msgid "Describe the group or topic in %d characters"
-msgstr ""
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d character or less"
+msgid_plural "Describe the group or topic in %d characters or less"
+msgstr[0] "اوصف الapplication بتاعتك"
+msgstr[1] "اوصف الapplication بتاعتك"
+msgstr[2] "اوصف الapplication بتاعتك"
+msgstr[3] "اوصف الapplication بتاعتك"
+msgstr[4] "اوصف الapplication بتاعتك"
+msgstr[5] "اوصف الapplication بتاعتك"
 
-#: lib/groupeditform.php:179
+#: lib/groupeditform.php:182
 msgid ""
-"Location for the group, if any, like \"City, State (or Region), Country\""
+"Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr ""
 
-#: lib/groupeditform.php:187
+#: lib/groupeditform.php:190
 #, php-format
-msgid "Extra nicknames for the group, comma- or space- separated, max %d"
-msgstr ""
+msgid ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"alias allowed."
+msgid_plural ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"aliases allowed."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
 
 #. TRANS: Menu item in the group navigation page.
 #: lib/groupnav.php:86
@@ -7723,7 +7841,7 @@ msgstr "هذا ليس عنوان بريدك الإلكترونى."
 msgid "Sorry, no incoming email allowed."
 msgstr ""
 
-#: lib/mailhandler.php:228
+#: lib/mailhandler.php:229
 #, php-format
 msgid "Unsupported message type: %s"
 msgstr "نوع رساله مش مدعوم: %s"
@@ -8067,16 +8185,17 @@ msgid "Sandbox this user"
 msgstr "أضف هذا المستخدم إلى صندوق الرمل"
 
 #. TRANS: Fieldset legend for the search form.
-#: lib/searchaction.php:121
+#: lib/searchaction.php:120
 msgid "Search site"
 msgstr "ابحث فى الموقع"
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
-#: lib/searchaction.php:129
+#: lib/searchaction.php:128
 msgid "Keyword(s)"
 msgstr "الكلمات المفتاحية"
 
+#. TRANS: Button text for searching site.
 #: lib/searchaction.php:130
 msgctxt "BUTTON"
 msgid "Search"
@@ -8166,8 +8285,8 @@ msgid "The theme file is missing or the upload failed."
 msgstr ""
 
 #: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:278 lib/themeuploader.php:282
-#: lib/themeuploader.php:290 lib/themeuploader.php:297
+#: lib/themeuploader.php:279 lib/themeuploader.php:283
+#: lib/themeuploader.php:291 lib/themeuploader.php:298
 #, fuzzy
 msgid "Failed saving theme."
 msgstr "فشل تحديث الأفتار."
@@ -8178,29 +8297,36 @@ msgstr ""
 
 #: lib/themeuploader.php:166
 #, php-format
-msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
-msgstr ""
+msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
+msgid_plural ""
+"Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
 
-#: lib/themeuploader.php:178
+#: lib/themeuploader.php:179
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr ""
 
-#: lib/themeuploader.php:218
+#: lib/themeuploader.php:219
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
 msgstr ""
 
-#: lib/themeuploader.php:224
+#: lib/themeuploader.php:225
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr ""
 
-#: lib/themeuploader.php:241
+#: lib/themeuploader.php:242
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr ""
 
-#: lib/themeuploader.php:259
+#: lib/themeuploader.php:260
 msgid "Error opening theme archive."
 msgstr "خطأ أثناء منع الحجب."
 
@@ -8404,21 +8530,42 @@ msgstr[3] "هذا الملف كبير جدًا. إن أقصى حجم للملف�
 msgstr[4] "هذا الملف كبير جدًا. إن أقصى حجم للملفات هو %d."
 msgstr[5] "هذا الملف كبير جدًا. إن أقصى حجم للملفات هو %d."
 
-#: scripts/restoreuser.php:82
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: scripts/restoreuser.php:61
 #, php-format
-msgid "Backup file for user %s (%s)"
+msgid "Getting backup from file '%s'."
 msgstr ""
 
-#: scripts/restoreuser.php:88
+#. TRANS: Commandline script output.
+#: scripts/restoreuser.php:91
 #, fuzzy
 msgid "No user specified; using backup user."
 msgstr "ما فيش ID متحدد لليوزر."
 
-#: scripts/restoreuser.php:94
+#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
+#: scripts/restoreuser.php:98
 #, php-format
-msgid "%d entries in backup."
-msgstr ""
+msgid "%d entry in backup."
+msgid_plural "%d entries in backup."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
+#, fuzzy
+#~ msgid "Name is too long (maximum 255 chars)."
+#~ msgstr "الاسم طويل جدا (اكتر حاجه 255 رمز)."
+
+#, fuzzy
+#~ msgid "Organization is too long (maximum 255 chars)."
+#~ msgstr "المنظمه طويله جدا (اكتر حاجه 255 رمز)."
+
+#, fuzzy
+#~ msgid "That's too long. Max notice size is %d chars."
+#~ msgstr "هذا الملف كبير جدًا. إن أقصى حجم للملفات هو %d."
 
 #, fuzzy
-#~ msgid "Description is too long (max %d chars)."
-#~ msgstr "المنظمه طويله جدا (اكتر حاجه %d رمز)."
+#~ msgid " tagged %s"
+#~ msgstr "الإشعارات الموسومه ب%s"
diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po
index 78ce578d2..f3029d880 100644
--- a/locale/bg/LC_MESSAGES/statusnet.po
+++ b/locale/bg/LC_MESSAGES/statusnet.po
@@ -10,17 +10,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-30 23:18+0000\n"
-"PO-Revision-Date: 2010-10-30 23:19:53+0000\n"
+"POT-Creation-Date: 2010-11-02 22:51+0000\n"
+"PO-Revision-Date: 2010-11-02 22:53:00+0000\n"
 "Language-Team: Bulgarian <http://translatewiki.net/wiki/Portal:bg>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r75708); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r75875); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: bg\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2010-10-30 09:48:40+0000\n"
+"X-POT-Import-Date: 2010-10-30 23:42:01+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -77,15 +77,20 @@ msgstr "Запазване настройките за достъп"
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
+#. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
+#. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #: actions/accessadminpanel.php:193 actions/emailsettings.php:228
-#: actions/imsettings.php:187 actions/pathsadminpanel.php:512
-#: actions/profilesettings.php:201 actions/smssettings.php:209
-#: actions/subscriptions.php:246 lib/applicationeditform.php:355
+#: actions/imsettings.php:187 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: lib/applicationeditform.php:355 lib/groupeditform.php:207
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Запазване"
@@ -136,7 +141,7 @@ msgstr "Няма такака страница."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:495 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Няма такъв потребител"
@@ -203,7 +208,9 @@ msgstr ""
 
 #. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:208
+#. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -558,8 +565,11 @@ msgstr "Пълното име е твърде дълго (макс. 255 знак
 #. TRANS: Group edit form validation error.
 #. TRANS: Form validation error in New application form.
 #. TRANS: %d is the maximum number of characters for the description.
+#. TRANS: Group create form validation error.
+#. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:220 actions/editapplication.php:201
 #: actions/editgroup.php:216 actions/newapplication.php:178
+#: actions/newgroup.php:152
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -721,14 +731,14 @@ msgstr "Не сте абонирани за никого."
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:172 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:74
 #: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
 #: actions/groupunblock.php:65 actions/imsettings.php:230
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
-#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/othersettings.php:153 actions/passwordsettings.php:138
 #: actions/profilesettings.php:221 actions/recoverpassword.php:350
 #: actions/register.php:172 actions/remotesubscribe.php:77
 #: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
@@ -901,20 +911,21 @@ msgstr "Не може да изтривате бележки на друг по�
 
 #. TRANS: Client error displayed trying to repeat a non-existing notice through the API.
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
+#. TRANS: Error message displayed trying to delete a non-existing notice.
 #: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/deletenotice.php:58 actions/shownotice.php:92
+#: actions/deletenotice.php:61 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "Няма такава бележка."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:535
+#: actions/apistatusesretweet.php:83 lib/command.php:537
 msgid "Cannot repeat your own notice."
 msgstr "Не можете да повтаряте собствени бележки."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:541
+#: actions/apistatusesretweet.php:92 lib/command.php:543
 msgid "Already repeated that notice."
 msgstr "Вече сте повторили тази бележка."
 
@@ -935,7 +946,8 @@ msgstr ""
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#: actions/apistatusesupdate.php:244
+#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
+#: lib/mailhandler.php:60
 #, fuzzy, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
@@ -950,7 +962,7 @@ msgstr "Не е открит методът в API."
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
-#: actions/apistatusesupdate.php:308
+#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
 #, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
@@ -1161,17 +1173,18 @@ msgstr "Изберете квадратна област от изображен
 msgid "Lost our file data."
 msgstr ""
 
-#: actions/avatarsettings.php:384
+#. TRANS: Success message for having updated a user avatar.
+#: actions/avatarsettings.php:385
 msgid "Avatar updated."
 msgstr "Аватарът е обновен."
 
 #. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
-#: actions/avatarsettings.php:388
+#: actions/avatarsettings.php:389
 msgid "Failed updating avatar."
 msgstr "Неуспешно обновяване на аватара."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:412
+#: actions/avatarsettings.php:413
 msgid "Avatar deleted."
 msgstr "Аватарът е изтрит."
 
@@ -1200,8 +1213,8 @@ msgstr ""
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:154 actions/deleteapplication.php:154
-#: actions/deletegroup.php:220 actions/deletenotice.php:150
+#: actions/block.php:154 actions/deleteapplication.php:157
+#: actions/deletegroup.php:220 actions/deletenotice.php:155
 #: actions/deleteuser.php:152 actions/groupblock.php:178
 msgctxt "BUTTON"
 msgid "No"
@@ -1219,8 +1232,8 @@ msgstr "Да не се блокира този потребител"
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:161 actions/deleteapplication.php:161
-#: actions/deletegroup.php:227 actions/deletenotice.php:157
+#: actions/block.php:161 actions/deleteapplication.php:164
+#: actions/deletegroup.php:227 actions/deletenotice.php:162
 #: actions/deleteuser.php:159 actions/groupblock.php:185
 msgctxt "BUTTON"
 msgid "Yes"
@@ -1338,12 +1351,13 @@ msgstr "Този адрес е вече потвърден."
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
 #. TRANS: Server error thrown on database error updating IM preferences.
 #. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
 #. TRANS: Server error thrown when user profile settings could not be updated.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #: actions/confirmaddress.php:118 actions/emailsettings.php:331
 #: actions/emailsettings.php:477 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:174
+#: actions/imsettings.php:442 actions/othersettings.php:184
 #: actions/profilesettings.php:326 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
@@ -1379,16 +1393,19 @@ msgstr "Разговор"
 msgid "Notices"
 msgstr "Бележки"
 
-#: actions/deleteapplication.php:63
+#. TRANS: Client error displayed trying to delete an application while not logged in.
+#: actions/deleteapplication.php:62
 msgid "You must be logged in to delete an application."
 msgstr "За да изтриете приложение, трябва да сте влезли."
 
+#. TRANS: Client error displayed trying to delete an application that does not exist.
 #: actions/deleteapplication.php:71
 msgid "Application not found."
 msgstr "Приложението не е открито."
 
+#. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
-#: actions/deleteapplication.php:78 actions/editapplication.php:78
+#: actions/deleteapplication.php:79 actions/editapplication.php:78
 #: actions/showapplication.php:94
 msgid "You are not the owner of this application."
 msgstr "Не сте собственик на това приложение."
@@ -1396,15 +1413,18 @@ msgstr "Не сте собственик на това приложение."
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
 #: actions/newapplication.php:114 actions/showapplication.php:118
-#: lib/action.php:1354
+#: lib/action.php:1404
 msgid "There was a problem with your session token."
 msgstr "Имаше проблем със сесията ви в сайта."
 
-#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+#. TRANS: Title for delete application page.
+#. TRANS: Fieldset legend on delete application page.
+#: actions/deleteapplication.php:124 actions/deleteapplication.php:149
 msgid "Delete application"
 msgstr "Изтриване на приложението"
 
-#: actions/deleteapplication.php:149
+#. TRANS: Confirmation text on delete application page.
+#: actions/deleteapplication.php:152
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
 "about the application from the database, including all existing user "
@@ -1412,12 +1432,12 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:158
+#: actions/deleteapplication.php:161
 msgid "Do not delete this application"
 msgstr "Да не се изтрива приложението"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:164
+#: actions/deleteapplication.php:167
 msgid "Delete this application"
 msgstr "Изтриване на това приложение"
 
@@ -1454,13 +1474,14 @@ msgstr "Грешка при обновяване на групата."
 msgid "Deleted group %s"
 msgstr "%1$s напусна групата %2$s"
 
-#. TRANS: Title.
+#. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
 #: actions/deletegroup.php:176 actions/deletegroup.php:202
 #, fuzzy
 msgid "Delete group"
 msgstr "Изтриване на потребител"
 
+#. TRANS: Warning in form for deleleting a group.
 #: actions/deletegroup.php:206
 msgid ""
 "Are you sure you want to delete this group? This will clear all data about "
@@ -1480,10 +1501,11 @@ msgstr "Да не се изтрива бележката"
 msgid "Delete this group"
 msgstr "Изтриване на този потребител"
 
+#. TRANS: Error message displayed trying to delete a notice while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1493,31 +1515,36 @@ msgstr "Изтриване на този потребител"
 msgid "Not logged in."
 msgstr "Не сте влезли в системата."
 
-#: actions/deletenotice.php:74
+#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
+#: actions/deletenotice.php:78
 msgid "Can't delete this notice."
 msgstr "Грешка при изтриване на бележката."
 
-#: actions/deletenotice.php:106
+#. TRANS: Instructions for deleting a notice.
+#: actions/deletenotice.php:110
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
 msgstr "Ще изтриете напълно бележката. Изтриването е невъзвратимо."
 
-#: actions/deletenotice.php:112 actions/deletenotice.php:144
+#. TRANS: Page title when deleting a notice.
+#. TRANS: Fieldset legend for the delete notice form.
+#: actions/deletenotice.php:117 actions/deletenotice.php:148
 msgid "Delete notice"
 msgstr "Изтриване на бележката"
 
-#: actions/deletenotice.php:147
+#. TRANS: Message for the delete notice form.
+#: actions/deletenotice.php:152
 msgid "Are you sure you want to delete this notice?"
 msgstr "Наистина ли искате да изтриете тази бележка?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:154
+#: actions/deletenotice.php:159
 msgid "Do not delete this notice"
 msgstr "Да не се изтрива бележката"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:161 lib/noticelist.php:667
+#: actions/deletenotice.php:166 lib/noticelist.php:667
 msgid "Delete this notice"
 msgstr "Изтриване на бележката"
 
@@ -1686,11 +1713,9 @@ msgstr ""
 
 #. TRANS: Submit button title.
 #: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
-#: actions/othersettings.php:126 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: actions/useradminpanel.php:295 lib/applicationeditform.php:357
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: lib/applicationeditform.php:357 lib/designsettings.php:256
 msgid "Save"
 msgstr "Запазване"
 
@@ -1741,9 +1766,9 @@ msgid "Name is required."
 msgstr "Името е задължително."
 
 #. TRANS: Validation error shown when providing too long a name in the "Edit application" form.
-#: actions/editapplication.php:188
+#: actions/editapplication.php:188 actions/newapplication.php:169
 #, fuzzy
-msgid "Name is too long (max 255 characters)."
+msgid "Name is too long (maximum 255 characters)."
 msgstr "Пълното име е твърде дълго (макс. 255 знака)"
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
@@ -1775,7 +1800,7 @@ msgid "Organization is required."
 msgstr "Описанието е задължително."
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#: actions/editapplication.php:223
+#: actions/editapplication.php:223 actions/newapplication.php:199
 #, fuzzy
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "Името на организацията е твърде дълго (макс. 255 знака)."
@@ -2569,7 +2594,7 @@ msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Публикуване на MicroID за адреса в Jabber/GTalk."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:180
+#: actions/imsettings.php:290 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "Настройките са запазени."
 
@@ -2693,10 +2718,9 @@ msgstr[1] "Вече сте абонирани за следните потреб
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#. TRANS: Whois output.
-#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:145 actions/invite.php:159 lib/command.php:426
-#, php-format
+#: actions/invite.php:145 actions/invite.php:159
+#, fuzzy, php-format
+msgctxt "INVITE"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
@@ -2880,8 +2904,9 @@ msgid ""
 msgstr ""
 
 #: actions/licenseadminpanel.php:156
-msgid "Invalid license title. Max length is 255 characters."
-msgstr ""
+#, fuzzy
+msgid "Invalid license title. Maximum length is 255 characters."
+msgstr "Името на местоположението е твърде дълго (макс. 255 знака)."
 
 #: actions/licenseadminpanel.php:168
 msgid "Invalid license URL."
@@ -3058,21 +3083,11 @@ msgstr "За да редактирате приложение, трябва да
 msgid "Use this form to register a new application."
 msgstr "Използвайте тази бланка за създаване на нова група."
 
-#: actions/newapplication.php:169
-#, fuzzy
-msgid "Name is too long (maximum 255 chars)."
-msgstr "Пълното име е твърде дълго (макс. 255 знака)"
-
 #: actions/newapplication.php:184
 #, fuzzy
 msgid "Source URL is required."
 msgstr "Името е задължително."
 
-#: actions/newapplication.php:199
-#, fuzzy
-msgid "Organization is too long (maximum 255 chars)."
-msgstr "Името на организацията е твърде дълго (макс. 255 знака)."
-
 #: actions/newapplication.php:266 actions/newapplication.php:275
 #, fuzzy
 msgid "Could not create application."
@@ -3093,14 +3108,14 @@ msgid "New message"
 msgstr "Ново съобщение"
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:499
+#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501
 msgid "You can't send a message to this user."
 msgstr "Не може да изпращате съобщения до този потребител."
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
 #: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
-#: lib/command.php:579
+#: lib/command.php:581
 msgid "No content!"
 msgstr "Няма съдържание!"
 
@@ -3109,7 +3124,7 @@ msgid "No recipient specified."
 msgstr "Не е указан получател."
 
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:503
+#: actions/newmessage.php:167 lib/command.php:505
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -3122,12 +3137,12 @@ msgstr "Съобщението е изпратено"
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:511
+#: actions/newmessage.php:188 lib/command.php:513
 #, fuzzy, php-format
 msgid "Direct message to %s sent."
 msgstr "Прякото съобщение до %s е изпратено."
 
-#: actions/newmessage.php:213 actions/newnotice.php:263
+#: actions/newmessage.php:213 actions/newnotice.php:264
 msgid "Ajax Error"
 msgstr "Грешка в Ajax"
 
@@ -3135,17 +3150,7 @@ msgstr "Грешка в Ajax"
 msgid "New notice"
 msgstr "Нова бележка"
 
-#: actions/newnotice.php:159 lib/mailhandler.php:60
-#, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr "Твърде дълго. Може да е най-много %d знака."
-
-#: actions/newnotice.php:183
-#, php-format
-msgid "Max notice size is %d chars, including attachment URL."
-msgstr ""
-
-#: actions/newnotice.php:229
+#: actions/newnotice.php:230
 msgid "Notice posted"
 msgstr "Бележката е публикувана"
 
@@ -3308,36 +3313,46 @@ msgstr "Търсене на хора"
 msgid "Notice Search"
 msgstr "Търсене на бележки"
 
-#: actions/othersettings.php:60
+#: actions/othersettings.php:59
 msgid "Other settings"
 msgstr "Други настройки"
 
+#. TRANS: Instructions for tab "Other" in user profile settings.
 #: actions/othersettings.php:71
 msgid "Manage various other options."
 msgstr "Управление на различни други настройки."
 
-#: actions/othersettings.php:108
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/othersettings.php:111
 msgid " (free service)"
 msgstr " (безплатна услуга)"
 
-#: actions/othersettings.php:116
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/othersettings.php:120
 msgid "Shorten URLs with"
 msgstr "Съкращаване на адресите с"
 
-#: actions/othersettings.php:117
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/othersettings.php:122
 msgid "Automatic shortening service to use."
 msgstr "Услуга за автоматично съкращаване, която да се ползва."
 
-#: actions/othersettings.php:122
+#. TRANS: Label for checkbox.
+#: actions/othersettings.php:128
 msgid "View profile designs"
 msgstr "Редактиране на профила"
 
-#: actions/othersettings.php:123
+#. TRANS: Tooltip for checkbox.
+#: actions/othersettings.php:130
 msgid "Show or hide profile designs."
 msgstr ""
 
-#: actions/othersettings.php:153
-msgid "URL shortening service is too long (max 50 chars)."
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/othersettings.php:162
+#, fuzzy
+msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "Услугата за съкращаване е твърде дълга (може да е до 50 знака)."
 
 #: actions/otp.php:69
@@ -3821,7 +3836,7 @@ msgstr "За мен"
 #. TRANS: Label for group location (dt). Text hidden by default.
 #: actions/profilesettings.php:149 actions/register.php:485
 #: actions/showgroup.php:267 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:177
+#: actions/userauthorization.php:166 lib/groupeditform.php:180
 #: lib/userprofile.php:165
 msgid "Location"
 msgstr "Местоположение"
@@ -4151,7 +4166,8 @@ msgid "Unexpected password reset."
 msgstr "Неочаквано подновяване на паролата."
 
 #: actions/recoverpassword.php:365
-msgid "Password must be 6 chars or more."
+#, fuzzy
+msgid "Password must be 6 characters or more."
 msgstr "Паролата трябва да е от поне 6 знака."
 
 #: actions/recoverpassword.php:369
@@ -4520,7 +4536,7 @@ msgstr "Организация"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:172
+#: lib/applicationeditform.php:208 lib/groupeditform.php:175
 msgid "Description"
 msgstr "Описание"
 
@@ -4665,7 +4681,7 @@ msgid "Note"
 msgstr "Бележка"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:298 lib/groupeditform.php:184
+#: actions/showgroup.php:298 lib/groupeditform.php:187
 msgid "Aliases"
 msgstr "Псевдоними"
 
@@ -4789,60 +4805,84 @@ msgstr "Съобщение от %1$s в %2$s"
 msgid "Notice deleted."
 msgstr "Бележката е изтрита."
 
-#: actions/showstream.php:72
+#. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
+#: actions/showstream.php:70
+#, fuzzy, php-format
+msgid "%1$s tagged %2$s"
+msgstr "%1$s, страница %2$d"
+
+#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#: actions/showstream.php:74
 #, fuzzy, php-format
-msgid " tagged %s"
+msgid "%1$s tagged %2$s, page %3$d"
 msgstr "Бележки с етикет %s"
 
-#: actions/showstream.php:78
+#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$d is the page number.
+#: actions/showstream.php:82
 #, php-format
 msgid "%1$s, page %2$d"
 msgstr "%1$s, страница %2$d"
 
-#: actions/showstream.php:120
+#. TRANS: Title for link to notice feed.
+#. TRANS: %1$s is a user nickname, %2$s is a hashtag.
+#: actions/showstream.php:127
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Емисия с бележки на %s (RSS 1.0)"
 
-#: actions/showstream.php:127
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:136
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "Емисия с бележки на %s (RSS 1.0)"
 
-#: actions/showstream.php:134
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:145
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "Емисия с бележки на %s (RSS 2.0)"
 
-#: actions/showstream.php:141
+#: actions/showstream.php:152
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "Емисия с бележки на %s (Atom)"
 
-#: actions/showstream.php:146
+#. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
+#. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
+#: actions/showstream.php:159
 #, php-format
 msgid "FOAF for %s"
 msgstr "FOAF за %s"
 
-#: actions/showstream.php:197
+#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
+#: actions/showstream.php:211
 #, php-format
-msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
+msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr ""
 
-#: actions/showstream.php:202
+#. TRANS: Second sentence of empty list message for a stream for the user themselves.
+#: actions/showstream.php:217
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
 msgstr ""
 
-#: actions/showstream.php:204
+#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:221
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
 "%?status_textarea=%2$s)."
 msgstr ""
 
-#: actions/showstream.php:243
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:264
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4851,7 +4891,9 @@ msgid ""
 "follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
 
-#: actions/showstream.php:248
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:271
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4859,7 +4901,8 @@ msgid ""
 "[StatusNet](http://status.net/) tool. "
 msgstr ""
 
-#: actions/showstream.php:305
+#. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
+#: actions/showstream.php:328
 #, php-format
 msgid "Repeat of %s"
 msgstr "Повторения на %s"
@@ -4971,33 +5014,40 @@ msgstr ""
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:56
+#. TRANS: Page title for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:55
 msgid "Site Notice"
 msgstr "Бележки"
 
-#: actions/sitenoticeadminpanel.php:67
+#. TRANS: Instructions for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:66
 #, fuzzy
 msgid "Edit site-wide message"
 msgstr "Ново съобщение"
 
-#: actions/sitenoticeadminpanel.php:103
+#. TRANS: Server error displayed when saving a site-wide notice was impossible.
+#: actions/sitenoticeadminpanel.php:101
 #, fuzzy
 msgid "Unable to save site notice."
 msgstr "Грешка при записване настройките за Twitter"
 
-#: actions/sitenoticeadminpanel.php:113
-msgid "Max length for the site-wide notice is 255 chars."
+#. TRANS: Client error displayed when a site-wide notice was longer than allowed.
+#: actions/sitenoticeadminpanel.php:112
+msgid "Maximum length for the site-wide notice is 255 characters."
 msgstr ""
 
+#. TRANS: Label for site-wide notice text field in admin panel.
 #: actions/sitenoticeadminpanel.php:176
 msgid "Site notice text"
 msgstr "Изтриване на бележката"
 
-#: actions/sitenoticeadminpanel.php:178
-msgid "Site-wide notice text (255 chars max; HTML okay)"
+#. TRANS: Tooltip for site-wide notice text field in admin panel.
+#: actions/sitenoticeadminpanel.php:179
+msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:198
+#. TRANS: Title for button to save site notice in admin panel.
+#: actions/sitenoticeadminpanel.php:201
 msgid "Save site notice"
 msgstr "Запазване настройките на сайта"
 
@@ -5455,81 +5505,98 @@ msgid ""
 msgstr ""
 
 #. TRANS: User admin panel title
-#: actions/useradminpanel.php:60
+#: actions/useradminpanel.php:58
 msgctxt "TITLE"
 msgid "User"
 msgstr "Потребител"
 
-#: actions/useradminpanel.php:71
+#. TRANS: Instruction for user admin panel.
+#: actions/useradminpanel.php:69
 msgid "User settings for this StatusNet site"
 msgstr ""
 
-#: actions/useradminpanel.php:150
+#. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
+#: actions/useradminpanel.php:147
 msgid "Invalid bio limit. Must be numeric."
 msgstr ""
 
-#: actions/useradminpanel.php:156
-msgid "Invalid welcome text. Max length is 255 characters."
+#. TRANS: Form validation error in user admin panel when welcome text is too long.
+#: actions/useradminpanel.php:154
+msgid "Invalid welcome text. Maximum length is 255 characters."
 msgstr ""
 
+#. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
+#. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
 #, php-format
-msgid "Invalid default subscripton: '%1$s' is not user."
+msgid "Invalid default subscripton: '%1$s' is not a user."
 msgstr ""
 
 #. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:106
+#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
 #: lib/personalgroupnav.php:109
 msgid "Profile"
 msgstr "Профил"
 
-#: actions/useradminpanel.php:223
+#. TRANS: Field label in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:220
 #, fuzzy
 msgid "Bio Limit"
 msgstr "Ограничения"
 
-#: actions/useradminpanel.php:224
+#. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:222
 msgid "Maximum length of a profile bio in characters."
 msgstr ""
 
-#: actions/useradminpanel.php:232
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:231
 msgid "New users"
 msgstr "Нови потребители"
 
+#. TRANS: Field label in user admin panel for setting new user welcome text.
 #: actions/useradminpanel.php:236
 #, fuzzy
 msgid "New user welcome"
 msgstr "Нови потребители"
 
-#: actions/useradminpanel.php:237
-msgid "Welcome text for new users (Max 255 chars)."
-msgstr ""
+#. TRANS: Tooltip in user admin panel for setting new user welcome text.
+#: actions/useradminpanel.php:238
+#, fuzzy
+msgid "Welcome text for new users (maximum 255 characters)."
+msgstr "Пълното име е твърде дълго (макс. 255 знака)"
 
-#: actions/useradminpanel.php:242
+#. TRANS: Field label in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:244
 #, fuzzy
 msgid "Default subscription"
 msgstr "Всички абонаменти"
 
-#: actions/useradminpanel.php:243
+#. TRANS: Tooltip in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:246
 #, fuzzy
 msgid "Automatically subscribe new users to this user."
 msgstr ""
 "Автоматично абониране за всеки, който се абонира за мен (подходящо за "
 "ботове)."
 
-#: actions/useradminpanel.php:252
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:256
 msgid "Invitations"
 msgstr "Покани"
 
-#: actions/useradminpanel.php:257
+#. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:262
 msgid "Invitations enabled"
 msgstr "Поканите са включени"
 
-#: actions/useradminpanel.php:259
+#. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:265
 msgid "Whether to allow users to invite new users."
 msgstr ""
 
-#: actions/useradminpanel.php:295
+#. TRANS: Title for button to save user settings in user admin panel.
+#: actions/useradminpanel.php:302
 msgid "Save user settings"
 msgstr ""
 
@@ -5728,7 +5795,7 @@ msgid "Plugins"
 msgstr "Приставки"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:831
+#: actions/version.php:198 lib/action.php:880
 msgid "Version"
 msgstr "Версия"
 
@@ -5944,16 +6011,23 @@ msgstr "Грешка при запазване на етикетите."
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
+#. TRANS: Full name of a profile or group followed by nickname in parens
+#: classes/Profile.php:164
+#, fuzzy, php-format
+msgctxt "FANCYNAME"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:791
+#: classes/Profile.php:812
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:800
+#: classes/Profile.php:821
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6103,200 +6177,207 @@ msgstr "%1$s - %2$s"
 msgid "Untitled page"
 msgstr "Неозаглавена страница"
 
+#. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
+#: lib/action.php:310
+msgctxt "TOOLTIP"
+msgid "Show more"
+msgstr ""
+
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:477
+#: lib/action.php:526
 #, fuzzy
 msgid "Primary site navigation"
 msgstr "Основна настройка на сайта"
 
 #. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:483
+#: lib/action.php:532
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr ""
 
 #. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:486
+#: lib/action.php:535
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Лично"
 
 #. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:488
+#: lib/action.php:537
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
 msgstr "Промяна на поща, аватар, парола, профил"
 
 #. TRANS: Main menu option when logged in for access to user settings
-#: lib/action.php:491
+#: lib/action.php:540
 msgid "Account"
 msgstr "Сметка"
 
 #. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:493
+#: lib/action.php:542
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "Свързване към услуги"
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:496
+#: lib/action.php:545
 msgid "Connect"
 msgstr "Свързване"
 
 #. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:499
+#: lib/action.php:548
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "Промяна настройките на сайта"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:502 lib/groupnav.php:117
+#: lib/action.php:551 lib/groupnav.php:117
 #, fuzzy
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Настройки"
 
 #. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:506
+#: lib/action.php:555
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Поканете приятели и колеги да се присъединят към вас в %s"
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:509
+#: lib/action.php:558
 #, fuzzy
 msgctxt "MENU"
 msgid "Invite"
 msgstr "Покани"
 
 #. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:515
+#: lib/action.php:564
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "Излизане от сайта"
 
 #. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:518
+#: lib/action.php:567
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Изход"
 
 #. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:523
+#: lib/action.php:572
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "Създаване на нова сметка"
 
 #. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:526
+#: lib/action.php:575
 msgctxt "MENU"
 msgid "Register"
 msgstr "Регистриране"
 
 #. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:529
+#: lib/action.php:578
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "Влизане в сайта"
 
 #. TRANS: Main menu option when not logged in to log in
-#: lib/action.php:532
+#: lib/action.php:581
 msgctxt "MENU"
 msgid "Login"
 msgstr "Вход"
 
 #. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:535
+#: lib/action.php:584
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Помощ"
 
 #. TRANS: Main menu option for help on the StatusNet site
-#: lib/action.php:538
+#: lib/action.php:587
 msgctxt "MENU"
 msgid "Help"
 msgstr "Помощ"
 
 #. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:541
+#: lib/action.php:590
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr "Търсене за хора или бележки"
 
 #. TRANS: Main menu option when logged in or when the StatusNet instance is not private
-#: lib/action.php:544
+#: lib/action.php:593
 msgctxt "MENU"
 msgid "Search"
 msgstr "Търсене"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:566 lib/adminpanelaction.php:387
+#: lib/action.php:615 lib/adminpanelaction.php:387
 #, fuzzy
 msgid "Site notice"
 msgstr "Нова бележка"
 
 #. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:633
+#: lib/action.php:682
 msgid "Local views"
 msgstr ""
 
 #. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:703
+#: lib/action.php:752
 #, fuzzy
 msgid "Page notice"
 msgstr "Нова бележка"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:804
+#: lib/action.php:853
 msgid "Secondary site navigation"
 msgstr "Основна настройка на сайта"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:810
+#: lib/action.php:859
 msgid "Help"
 msgstr "Помощ"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:813
+#: lib/action.php:862
 msgid "About"
 msgstr "Относно"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:816
+#: lib/action.php:865
 msgid "FAQ"
 msgstr "Въпроси"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:821
+#: lib/action.php:870
 msgid "TOS"
 msgstr "Условия"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:825
+#: lib/action.php:874
 msgid "Privacy"
 msgstr "Поверителност"
 
-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:828
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+#: lib/action.php:877
 msgid "Source"
 msgstr "Изходен код"
 
-#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:834
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+#: lib/action.php:884
 msgid "Contact"
 msgstr "Контакт"
 
-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:837
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+#: lib/action.php:887
 msgid "Badge"
 msgstr "Табелка"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:866
+#: lib/action.php:916
 msgid "StatusNet software license"
 msgstr "Лиценз на програмата StatusNet"
 
@@ -6304,7 +6385,7 @@ msgstr "Лиценз на програмата StatusNet"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:873
+#: lib/action.php:923
 #, fuzzy, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -6314,7 +6395,7 @@ msgstr ""
 "broughtby%%](%%site.broughtbyurl%%). "
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:876
+#: lib/action.php:926
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** е услуга за микроблогване."
@@ -6323,7 +6404,7 @@ msgstr "**%%site.name%%** е услуга за микроблогване."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:883
+#: lib/action.php:933
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -6335,50 +6416,50 @@ msgstr ""
 "licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:899
+#: lib/action.php:949
 msgid "Site content license"
 msgstr "Лиценз на съдържанието"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:906
+#: lib/action.php:956
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:913
+#: lib/action.php:963
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:917
+#: lib/action.php:967
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:949
+#: lib/action.php:999
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1285
+#: lib/action.php:1335
 msgid "Pagination"
 msgstr "Страниране"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1296
+#: lib/action.php:1346
 msgid "After"
 msgstr "След"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1306
+#: lib/action.php:1356
 msgid "Before"
 msgstr "Преди"
 
@@ -6737,7 +6818,7 @@ msgid "AJAX error"
 msgstr "Грешка в Ajax"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:233 lib/mailhandler.php:142
+#: lib/channel.php:233 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "Командата е изпълнена"
 
@@ -6754,7 +6835,7 @@ msgstr "Не е открита бележка с такъв идентифика
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:626
+#: lib/command.php:99 lib/command.php:630
 #, fuzzy
 msgid "User has no last notice."
 msgstr "Потребителят няма последна бележка"
@@ -6824,6 +6905,14 @@ msgstr ""
 msgid "%1$s left group %2$s."
 msgstr ""
 
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: lib/command.php:426
+#, fuzzy, php-format
+msgctxt "WHOIS"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
 #. TRANS: Whois output. %s is the full name of the queried user.
 #: lib/command.php:430
 #, php-format
@@ -6861,139 +6950,146 @@ msgid ""
 "same server."
 msgstr ""
 
-#. TRANS: Message given if content is too long.
+#. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
 #: lib/command.php:488
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] ""
+"Съобщението е твърде дълго. Най-много може да е %1$d знака, а сте въвели %2"
+"$d."
+msgstr[1] ""
 "Съобщението е твърде дълго. Най-много може да е %1$d знака, а сте въвели %2"
 "$d."
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:514
+#: lib/command.php:516
 msgid "Error sending direct message."
 msgstr "Грешка при изпращане на прякото съобщение"
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:551
+#: lib/command.php:553
 #, fuzzy, php-format
 msgid "Notice from %s repeated."
 msgstr "Бележката от %s е повторена"
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:554
+#: lib/command.php:556
 msgid "Error repeating notice."
 msgstr "Грешка при повтаряне на бележката."
 
-#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:589
+#: lib/command.php:591
 #, fuzzy, php-format
-msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
+msgid "Notice too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] ""
+"Съобщението е твърде дълго. Най-много може да е 140 знака, а сте въвели %d."
+msgstr[1] ""
 "Съобщението е твърде дълго. Най-много може да е 140 знака, а сте въвели %d."
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:600
+#: lib/command.php:604
 #, fuzzy, php-format
 msgid "Reply to %s sent."
 msgstr "Отговорът до %s е изпратен"
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:603
+#: lib/command.php:607
 msgid "Error saving notice."
 msgstr "Грешка при записване на бележката."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:650
+#: lib/command.php:654
 #, fuzzy
 msgid "Specify the name of the user to subscribe to."
 msgstr "Уточнете името на потребителя, за когото се абонирате."
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:659
+#: lib/command.php:663
 #, fuzzy
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Не сте абонирани за този профил"
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:667
+#: lib/command.php:671
 #, php-format
 msgid "Subscribed to %s."
 msgstr ""
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:688 lib/command.php:799
+#: lib/command.php:692 lib/command.php:803
 #, fuzzy
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "Уточнете името на потребителя, от когото се отписвате."
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:699
+#: lib/command.php:703
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:719 lib/command.php:745
+#: lib/command.php:723 lib/command.php:749
 msgid "Command not yet implemented."
 msgstr "Командата все още не се поддържа."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:723
+#: lib/command.php:727
 msgid "Notification off."
 msgstr "Уведомлението е изключено."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:726
+#: lib/command.php:730
 msgid "Can't turn off notification."
 msgstr "Грешка при изключване на уведомлението."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:749
+#: lib/command.php:753
 msgid "Notification on."
 msgstr "Уведомлението е включено."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:752
+#: lib/command.php:756
 msgid "Can't turn on notification."
 msgstr "Грешка при включване на уведомлението."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:766
+#: lib/command.php:770
 msgid "Login command is disabled."
 msgstr ""
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:779
+#: lib/command.php:783
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:808
+#: lib/command.php:812
 #, php-format
 msgid "Unsubscribed %s."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:826
+#: lib/command.php:830
 msgid "You are not subscribed to anyone."
 msgstr "Не сте абонирани за никого."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:831
+#: lib/command.php:835
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Вече сте абонирани за следните потребители:"
@@ -7001,14 +7097,14 @@ msgstr[1] "Вече сте абонирани за следните потреб
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:853
+#: lib/command.php:857
 msgid "No one is subscribed to you."
 msgstr "Никой не е абониран за вас."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:858
+#: lib/command.php:862
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Грешка при абониране на друг потребител за вас."
@@ -7016,21 +7112,21 @@ msgstr[1] "Грешка при абониране на друг потребит
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:880
+#: lib/command.php:884
 msgid "You are not a member of any groups."
 msgstr "Не членувате в нито една група."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:885
+#: lib/command.php:889
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Не членувате в тази група."
 msgstr[1] "Не членувате в тази група."
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:900
+#: lib/command.php:904
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -7223,7 +7319,8 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "От 1 до 64 малки букви или цифри, без пунктоация и интервали"
 
 #: lib/groupeditform.php:163
-msgid "URL of the homepage or blog of the group or topic"
+#, fuzzy
+msgid "URL of the homepage or blog of the group or topic."
 msgstr "Адрес на страница, блог или профил в друг сайт на групата"
 
 #: lib/groupeditform.php:168
@@ -7231,20 +7328,29 @@ msgid "Describe the group or topic"
 msgstr "Опишете групата или темата"
 
 #: lib/groupeditform.php:170
-#, php-format
-msgid "Describe the group or topic in %d characters"
-msgstr "Опишете групата или темата в до %d букви"
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d character or less"
+msgid_plural "Describe the group or topic in %d characters or less"
+msgstr[0] "Опишете групата или темата в до %d букви"
+msgstr[1] "Опишете групата или темата в до %d букви"
 
-#: lib/groupeditform.php:179
+#: lib/groupeditform.php:182
+#, fuzzy
 msgid ""
-"Location for the group, if any, like \"City, State (or Region), Country\""
+"Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr ""
 "Къде се намира групата — град, община, държава и т.н. (ако е приложимо)"
 
-#: lib/groupeditform.php:187
+#: lib/groupeditform.php:190
 #, php-format
-msgid "Extra nicknames for the group, comma- or space- separated, max %d"
-msgstr ""
+msgid ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"alias allowed."
+msgid_plural ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"aliases allowed."
+msgstr[0] ""
+msgstr[1] ""
 
 #. TRANS: Menu item in the group navigation page.
 #: lib/groupnav.php:86
@@ -7706,7 +7812,7 @@ msgstr "Това не е вашият входящ адрес."
 msgid "Sorry, no incoming email allowed."
 msgstr "Входящата поща не е разрешена."
 
-#: lib/mailhandler.php:228
+#: lib/mailhandler.php:229
 #, fuzzy, php-format
 msgid "Unsupported message type: %s"
 msgstr "Форматът на файла с изображението не се поддържа."
@@ -8052,16 +8158,17 @@ msgid "Sandbox this user"
 msgstr "Разблокиране на този потребител"
 
 #. TRANS: Fieldset legend for the search form.
-#: lib/searchaction.php:121
+#: lib/searchaction.php:120
 msgid "Search site"
 msgstr "Търсене в сайта"
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
-#: lib/searchaction.php:129
+#: lib/searchaction.php:128
 msgid "Keyword(s)"
 msgstr "Ключови думи"
 
+#. TRANS: Button text for searching site.
 #: lib/searchaction.php:130
 msgctxt "BUTTON"
 msgid "Search"
@@ -8151,8 +8258,8 @@ msgid "The theme file is missing or the upload failed."
 msgstr ""
 
 #: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:278 lib/themeuploader.php:282
-#: lib/themeuploader.php:290 lib/themeuploader.php:297
+#: lib/themeuploader.php:279 lib/themeuploader.php:283
+#: lib/themeuploader.php:291 lib/themeuploader.php:298
 #, fuzzy
 msgid "Failed saving theme."
 msgstr "Неуспешно обновяване на аватара."
@@ -8163,29 +8270,32 @@ msgstr ""
 
 #: lib/themeuploader.php:166
 #, php-format
-msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
-msgstr ""
+msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
+msgid_plural ""
+"Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr[0] ""
+msgstr[1] ""
 
-#: lib/themeuploader.php:178
+#: lib/themeuploader.php:179
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr ""
 
-#: lib/themeuploader.php:218
+#: lib/themeuploader.php:219
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
 msgstr ""
 
-#: lib/themeuploader.php:224
+#: lib/themeuploader.php:225
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr ""
 
-#: lib/themeuploader.php:241
+#: lib/themeuploader.php:242
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr ""
 
-#: lib/themeuploader.php:259
+#: lib/themeuploader.php:260
 msgid "Error opening theme archive."
 msgstr "Грешка при изпращане на прякото съобщение"
 
@@ -8373,20 +8483,37 @@ msgstr[1] ""
 "Съобщението е твърде дълго. Най-много може да е %1$d знака, а сте въвели %2"
 "$d."
 
-#: scripts/restoreuser.php:82
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: scripts/restoreuser.php:61
 #, php-format
-msgid "Backup file for user %s (%s)"
+msgid "Getting backup from file '%s'."
 msgstr ""
 
-#: scripts/restoreuser.php:88
+#. TRANS: Commandline script output.
+#: scripts/restoreuser.php:91
 #, fuzzy
 msgid "No user specified; using backup user."
 msgstr "Не е указана група."
 
-#: scripts/restoreuser.php:94
+#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
+#: scripts/restoreuser.php:98
 #, php-format
-msgid "%d entries in backup."
-msgstr ""
+msgid "%d entry in backup."
+msgid_plural "%d entries in backup."
+msgstr[0] ""
+msgstr[1] ""
 
-#~ msgid "Description is too long (max %d chars)."
-#~ msgstr "Описанието е твърде дълго (до %d символа)."
+#, fuzzy
+#~ msgid "Name is too long (maximum 255 chars)."
+#~ msgstr "Пълното име е твърде дълго (макс. 255 знака)"
+
+#, fuzzy
+#~ msgid "Organization is too long (maximum 255 chars)."
+#~ msgstr "Името на организацията е твърде дълго (макс. 255 знака)."
+
+#~ msgid "That's too long. Max notice size is %d chars."
+#~ msgstr "Твърде дълго. Може да е най-много %d знака."
+
+#, fuzzy
+#~ msgid " tagged %s"
+#~ msgstr "Бележки с етикет %s"
diff --git a/locale/br/LC_MESSAGES/statusnet.po b/locale/br/LC_MESSAGES/statusnet.po
index 93e5c729a..a3f61932e 100644
--- a/locale/br/LC_MESSAGES/statusnet.po
+++ b/locale/br/LC_MESSAGES/statusnet.po
@@ -11,17 +11,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-30 23:18+0000\n"
-"PO-Revision-Date: 2010-10-30 23:19:55+0000\n"
+"POT-Creation-Date: 2010-11-02 22:51+0000\n"
+"PO-Revision-Date: 2010-11-02 22:53:01+0000\n"
 "Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r75708); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r75875); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-POT-Import-Date: 2010-10-30 09:48:40+0000\n"
+"X-POT-Import-Date: 2010-10-30 23:42:01+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -78,15 +78,20 @@ msgstr "Enrollañ an arventennoù moned"
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
+#. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
+#. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #: actions/accessadminpanel.php:193 actions/emailsettings.php:228
-#: actions/imsettings.php:187 actions/pathsadminpanel.php:512
-#: actions/profilesettings.php:201 actions/smssettings.php:209
-#: actions/subscriptions.php:246 lib/applicationeditform.php:355
+#: actions/imsettings.php:187 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: lib/applicationeditform.php:355 lib/groupeditform.php:207
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Enrollañ"
@@ -137,7 +142,7 @@ msgstr "N'eus ket eus ar bajenn-se."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:495 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "N'eus ket eus an implijer-se."
@@ -206,7 +211,9 @@ msgstr ""
 
 #. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:208
+#. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -561,8 +568,11 @@ msgstr "Re hir eo an anv klok (255 arouezenn d'ar muiañ)."
 #. TRANS: Group edit form validation error.
 #. TRANS: Form validation error in New application form.
 #. TRANS: %d is the maximum number of characters for the description.
+#. TRANS: Group create form validation error.
+#. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:220 actions/editapplication.php:201
 #: actions/editgroup.php:216 actions/newapplication.php:178
+#: actions/newgroup.php:152
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -722,14 +732,14 @@ msgstr "N'oc'h ket aotreet."
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:172 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:74
 #: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
 #: actions/groupunblock.php:65 actions/imsettings.php:230
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
-#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/othersettings.php:153 actions/passwordsettings.php:138
 #: actions/profilesettings.php:221 actions/recoverpassword.php:350
 #: actions/register.php:172 actions/remotesubscribe.php:77
 #: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
@@ -903,20 +913,21 @@ msgstr "Ne c'helloc'h ket dilemel statud un implijer all."
 
 #. TRANS: Client error displayed trying to repeat a non-existing notice through the API.
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
+#. TRANS: Error message displayed trying to delete a non-existing notice.
 #: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/deletenotice.php:58 actions/shownotice.php:92
+#: actions/deletenotice.php:61 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "N'eus ket eus an ali-se."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:535
+#: actions/apistatusesretweet.php:83 lib/command.php:537
 msgid "Cannot repeat your own notice."
 msgstr "Ne c'helloc'h ket adlavar ho alioù."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:541
+#: actions/apistatusesretweet.php:92 lib/command.php:543
 msgid "Already repeated that notice."
 msgstr "Kemenn bet adkemeret dija."
 
@@ -937,7 +948,8 @@ msgstr ""
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#: actions/apistatusesupdate.php:244
+#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
+#: lib/mailhandler.php:60
 #, fuzzy, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
@@ -952,7 +964,7 @@ msgstr "N'eo ket bet kavet an hentenn API !"
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
-#: actions/apistatusesupdate.php:308
+#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
 #, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
@@ -1163,17 +1175,18 @@ msgstr "Diuzit ur zonenn gant ur stumm karrez evit tremeniñ ho avatar"
 msgid "Lost our file data."
 msgstr "Kollet eo bet roadennoù."
 
-#: actions/avatarsettings.php:384
+#. TRANS: Success message for having updated a user avatar.
+#: actions/avatarsettings.php:385
 msgid "Avatar updated."
 msgstr "Hizivaet eo bet an avatar."
 
 #. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
-#: actions/avatarsettings.php:388
+#: actions/avatarsettings.php:389
 msgid "Failed updating avatar."
 msgstr "Ur gudenn 'zo bet e-pad hizivadenn an avatar."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:412
+#: actions/avatarsettings.php:413
 msgid "Avatar deleted."
 msgstr "Dilammet eo bet an Avatar."
 
@@ -1202,8 +1215,8 @@ msgstr ""
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:154 actions/deleteapplication.php:154
-#: actions/deletegroup.php:220 actions/deletenotice.php:150
+#: actions/block.php:154 actions/deleteapplication.php:157
+#: actions/deletegroup.php:220 actions/deletenotice.php:155
 #: actions/deleteuser.php:152 actions/groupblock.php:178
 msgctxt "BUTTON"
 msgid "No"
@@ -1221,8 +1234,8 @@ msgstr "Arabat stankañ an implijer-mañ"
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:161 actions/deleteapplication.php:161
-#: actions/deletegroup.php:227 actions/deletenotice.php:157
+#: actions/block.php:161 actions/deleteapplication.php:164
+#: actions/deletegroup.php:227 actions/deletenotice.php:162
 #: actions/deleteuser.php:159 actions/groupblock.php:185
 msgctxt "BUTTON"
 msgid "Yes"
@@ -1340,12 +1353,13 @@ msgstr "Kadarnaet eo bet dija ar chomlec'h-mañ."
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
 #. TRANS: Server error thrown on database error updating IM preferences.
 #. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
 #. TRANS: Server error thrown when user profile settings could not be updated.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #: actions/confirmaddress.php:118 actions/emailsettings.php:331
 #: actions/emailsettings.php:477 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:174
+#: actions/imsettings.php:442 actions/othersettings.php:184
 #: actions/profilesettings.php:326 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
@@ -1381,16 +1395,19 @@ msgstr "Kaozeadenn"
 msgid "Notices"
 msgstr "Ali"
 
-#: actions/deleteapplication.php:63
+#. TRANS: Client error displayed trying to delete an application while not logged in.
+#: actions/deleteapplication.php:62
 msgid "You must be logged in to delete an application."
 msgstr "Rankout a reoc'h bezañ kevreet evit dilemel ur poellad."
 
+#. TRANS: Client error displayed trying to delete an application that does not exist.
 #: actions/deleteapplication.php:71
 msgid "Application not found."
 msgstr "N'eo ket bet kavet ar poellad"
 
+#. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
-#: actions/deleteapplication.php:78 actions/editapplication.php:78
+#: actions/deleteapplication.php:79 actions/editapplication.php:78
 #: actions/showapplication.php:94
 msgid "You are not the owner of this application."
 msgstr "N'oc'h ket perc'henn ar poellad-se."
@@ -1398,15 +1415,18 @@ msgstr "N'oc'h ket perc'henn ar poellad-se."
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
 #: actions/newapplication.php:114 actions/showapplication.php:118
-#: lib/action.php:1354
+#: lib/action.php:1404
 msgid "There was a problem with your session token."
 msgstr "Ur gudenn 'zo bet gant ho jedaouer dalc'h."
 
-#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+#. TRANS: Title for delete application page.
+#. TRANS: Fieldset legend on delete application page.
+#: actions/deleteapplication.php:124 actions/deleteapplication.php:149
 msgid "Delete application"
 msgstr "Dilemel ar poelad"
 
-#: actions/deleteapplication.php:149
+#. TRANS: Confirmation text on delete application page.
+#: actions/deleteapplication.php:152
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
 "about the application from the database, including all existing user "
@@ -1414,12 +1434,12 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:158
+#: actions/deleteapplication.php:161
 msgid "Do not delete this application"
 msgstr "Arabat eo dilemel ar poellad-mañ"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:164
+#: actions/deleteapplication.php:167
 msgid "Delete this application"
 msgstr "Dilemel ar poelad-se"
 
@@ -1455,13 +1475,14 @@ msgstr "Diposubl eo hizivaat ar strollad."
 msgid "Deleted group %s"
 msgstr "%1$s en deus kuitaet ar strollad %2$s"
 
-#. TRANS: Title.
+#. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
 #: actions/deletegroup.php:176 actions/deletegroup.php:202
 #, fuzzy
 msgid "Delete group"
 msgstr "Diverkañ an implijer"
 
+#. TRANS: Warning in form for deleleting a group.
 #: actions/deletegroup.php:206
 msgid ""
 "Are you sure you want to delete this group? This will clear all data about "
@@ -1481,10 +1502,11 @@ msgstr "Arabat dilemel ar c'hemenn-mañ"
 msgid "Delete this group"
 msgstr "Diverkañ an implijer-mañ"
 
+#. TRANS: Error message displayed trying to delete a notice while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1494,31 +1516,36 @@ msgstr "Diverkañ an implijer-mañ"
 msgid "Not logged in."
 msgstr "Nann-luget."
 
-#: actions/deletenotice.php:74
+#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
+#: actions/deletenotice.php:78
 msgid "Can't delete this notice."
 msgstr "Dibosupl eo dilemel ar c'hemenn-mañ."
 
-#: actions/deletenotice.php:106
+#. TRANS: Instructions for deleting a notice.
+#: actions/deletenotice.php:110
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
 msgstr ""
 
-#: actions/deletenotice.php:112 actions/deletenotice.php:144
+#. TRANS: Page title when deleting a notice.
+#. TRANS: Fieldset legend for the delete notice form.
+#: actions/deletenotice.php:117 actions/deletenotice.php:148
 msgid "Delete notice"
 msgstr "Dilemel un ali"
 
-#: actions/deletenotice.php:147
+#. TRANS: Message for the delete notice form.
+#: actions/deletenotice.php:152
 msgid "Are you sure you want to delete this notice?"
 msgstr "Ha sur oc'h ho peus c'hoant dilemel ar c'hemenn-mañ ?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:154
+#: actions/deletenotice.php:159
 msgid "Do not delete this notice"
 msgstr "Arabat dilemel ar c'hemenn-mañ"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:161 lib/noticelist.php:667
+#: actions/deletenotice.php:166 lib/noticelist.php:667
 msgid "Delete this notice"
 msgstr "Dilemel ar c'hemenn-mañ"
 
@@ -1678,11 +1705,9 @@ msgstr "Adlakaat an arventennoù dre ziouer"
 
 #. TRANS: Submit button title.
 #: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
-#: actions/othersettings.php:126 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: actions/useradminpanel.php:295 lib/applicationeditform.php:357
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: lib/applicationeditform.php:357 lib/designsettings.php:256
 msgid "Save"
 msgstr "Enrollañ"
 
@@ -1730,9 +1755,9 @@ msgid "Name is required."
 msgstr "Ret eo lakaat un anv."
 
 #. TRANS: Validation error shown when providing too long a name in the "Edit application" form.
-#: actions/editapplication.php:188
+#: actions/editapplication.php:188 actions/newapplication.php:169
 #, fuzzy
-msgid "Name is too long (max 255 characters)."
+msgid "Name is too long (maximum 255 characters)."
 msgstr "Re hir eo an anv (255 arouezenn d'ar muiañ)."
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
@@ -1761,7 +1786,7 @@ msgid "Organization is required."
 msgstr "Ezhomm 'zo eus an aozadur."
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#: actions/editapplication.php:223
+#: actions/editapplication.php:223 actions/newapplication.php:199
 #, fuzzy
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "Re hir eo an aozadur (255 arouezenn d'ar muiañ)."
@@ -2544,7 +2569,7 @@ msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Embann ur MicroID evit ma chomlec'h Jabber/GTalk."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:180
+#: actions/imsettings.php:290 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "Penndibaboù enrollet"
 
@@ -2666,10 +2691,9 @@ msgstr[1] "Koumanantet oc'h dija d'an implijerien-mañ :"
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#. TRANS: Whois output.
-#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:145 actions/invite.php:159 lib/command.php:426
-#, php-format
+#: actions/invite.php:145 actions/invite.php:159
+#, fuzzy, php-format
+msgctxt "INVITE"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
@@ -2827,8 +2851,9 @@ msgid ""
 msgstr ""
 
 #: actions/licenseadminpanel.php:156
-msgid "Invalid license title. Max length is 255 characters."
-msgstr ""
+#, fuzzy
+msgid "Invalid license title. Maximum length is 255 characters."
+msgstr "Re hir eo al lec'hiadur (255 arouezenn d'ar muiañ)."
 
 #: actions/licenseadminpanel.php:168
 msgid "Invalid license URL."
@@ -3003,20 +3028,10 @@ msgstr "Ret eo deoc'h bezañ luget evit enrollañ ur poellad."
 msgid "Use this form to register a new application."
 msgstr "Implijit ar furmskrid-mañ evit enskrivañ ur poellad nevez."
 
-#: actions/newapplication.php:169
-#, fuzzy
-msgid "Name is too long (maximum 255 chars)."
-msgstr "Re hir eo an anv (255 arouezenn d'ar muiañ)."
-
 #: actions/newapplication.php:184
 msgid "Source URL is required."
 msgstr "Ezhomm 'zo eus ar vammenn URL."
 
-#: actions/newapplication.php:199
-#, fuzzy
-msgid "Organization is too long (maximum 255 chars)."
-msgstr "Re hir eo an aozadur (255 arouezenn d'ar muiañ)."
-
 #: actions/newapplication.php:266 actions/newapplication.php:275
 msgid "Could not create application."
 msgstr "N'eo ket posubl krouiñ ar poellad."
@@ -3036,14 +3051,14 @@ msgid "New message"
 msgstr "Kemennadenn nevez"
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:499
+#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501
 msgid "You can't send a message to this user."
 msgstr "Ne c'helloc'h ket kas kemennadennoù d'an implijer-mañ."
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
 #: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
-#: lib/command.php:579
+#: lib/command.php:581
 msgid "No content!"
 msgstr "Goullo eo !"
 
@@ -3052,7 +3067,7 @@ msgid "No recipient specified."
 msgstr "N'ho peus ket lakaet a resever."
 
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:503
+#: actions/newmessage.php:167 lib/command.php:505
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -3065,12 +3080,12 @@ msgstr "Kemennadenn kaset"
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:511
+#: actions/newmessage.php:188 lib/command.php:513
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Kaset eo bet da %s ar gemennadenn war-eeun."
 
-#: actions/newmessage.php:213 actions/newnotice.php:263
+#: actions/newmessage.php:213 actions/newnotice.php:264
 msgid "Ajax Error"
 msgstr "Fazi Ajax"
 
@@ -3078,17 +3093,7 @@ msgstr "Fazi Ajax"
 msgid "New notice"
 msgstr "Ali nevez"
 
-#: actions/newnotice.php:159 lib/mailhandler.php:60
-#, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr "Re hir eo ! Ment hirañ an ali a zo a %d arouezenn."
-
-#: actions/newnotice.php:183
-#, php-format
-msgid "Max notice size is %d chars, including attachment URL."
-msgstr ""
-
-#: actions/newnotice.php:229
+#: actions/newnotice.php:230
 msgid "Notice posted"
 msgstr "Ali embannet"
 
@@ -3254,38 +3259,47 @@ msgstr "Klask tud"
 msgid "Notice Search"
 msgstr "Klask alioù"
 
-#: actions/othersettings.php:60
+#: actions/othersettings.php:59
 msgid "Other settings"
 msgstr "Arventennoù all"
 
+#. TRANS: Instructions for tab "Other" in user profile settings.
 #: actions/othersettings.php:71
 msgid "Manage various other options."
 msgstr "Dibarzhioù all da gefluniañ."
 
-#: actions/othersettings.php:108
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/othersettings.php:111
 msgid " (free service)"
 msgstr "  (servij digoust)"
 
-#: actions/othersettings.php:116
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/othersettings.php:120
 msgid "Shorten URLs with"
 msgstr ""
 
-#: actions/othersettings.php:117
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/othersettings.php:122
 msgid "Automatic shortening service to use."
 msgstr ""
 
-#: actions/othersettings.php:122
+#. TRANS: Label for checkbox.
+#: actions/othersettings.php:128
 #, fuzzy
 msgid "View profile designs"
 msgstr "Design ar profil"
 
-#: actions/othersettings.php:123
+#. TRANS: Tooltip for checkbox.
+#: actions/othersettings.php:130
 msgid "Show or hide profile designs."
 msgstr "Diskouez pe kuzhat designoù ar profil."
 
-#: actions/othersettings.php:153
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/othersettings.php:162
 #, fuzzy
-msgid "URL shortening service is too long (max 50 chars)."
+msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "Re hir eo ar yezh (255 arouezenn d'ar muiañ)."
 
 #: actions/otp.php:69
@@ -3774,7 +3788,7 @@ msgstr "Buhezskrid"
 #. TRANS: Label for group location (dt). Text hidden by default.
 #: actions/profilesettings.php:149 actions/register.php:485
 #: actions/showgroup.php:267 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:177
+#: actions/userauthorization.php:166 lib/groupeditform.php:180
 #: lib/userprofile.php:165
 msgid "Location"
 msgstr "Lec'hiadur"
@@ -4112,7 +4126,8 @@ msgid "Unexpected password reset."
 msgstr "Adderaouekadur dic'hortoz ar ger-tremen."
 
 #: actions/recoverpassword.php:365
-msgid "Password must be 6 chars or more."
+#, fuzzy
+msgid "Password must be 6 characters or more."
 msgstr "Rankout a ra ar ger-tremen bezañ 6 arouezenn d'an nebeutañ."
 
 #: actions/recoverpassword.php:369
@@ -4466,7 +4481,7 @@ msgstr "Aozadur"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:172
+#: lib/applicationeditform.php:208 lib/groupeditform.php:175
 msgid "Description"
 msgstr "Deskrivadur"
 
@@ -4610,7 +4625,7 @@ msgid "Note"
 msgstr "Notenn"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:298 lib/groupeditform.php:184
+#: actions/showgroup.php:298 lib/groupeditform.php:187
 msgid "Aliases"
 msgstr "Aliasoù"
 
@@ -4739,62 +4754,86 @@ msgstr "Kemenadenn resevet eus %1$s d'an %2$s"
 msgid "Notice deleted."
 msgstr "Ali dilammet."
 
-#: actions/showstream.php:72
-#, php-format
-msgid " tagged %s"
-msgstr " merket %s"
+#. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
+#: actions/showstream.php:70
+#, fuzzy, php-format
+msgid "%1$s tagged %2$s"
+msgstr "%1$s, pajenn %2$d"
+
+#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#: actions/showstream.php:74
+#, fuzzy, php-format
+msgid "%1$s tagged %2$s, page %3$d"
+msgstr "Alioù merket gant %1$s, pajenn %2$d"
 
-#: actions/showstream.php:78
+#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$d is the page number.
+#: actions/showstream.php:82
 #, php-format
 msgid "%1$s, page %2$d"
 msgstr "%1$s, pajenn %2$d"
 
-#: actions/showstream.php:120
+#. TRANS: Title for link to notice feed.
+#. TRANS: %1$s is a user nickname, %2$s is a hashtag.
+#: actions/showstream.php:127
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Neudenn an alioù evit %1$s merket %2$s (RSS 1.0)"
 
-#: actions/showstream.php:127
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:136
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "Neudenn an alioù evit %s (RSS 1.0)"
 
-#: actions/showstream.php:134
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:145
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "Neudenn an alioù evit %s (RSS 2.0)"
 
-#: actions/showstream.php:141
+#: actions/showstream.php:152
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "Gwazh alioù %s (Atom)"
 
-#: actions/showstream.php:146
+#. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
+#. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
+#: actions/showstream.php:159
 #, php-format
 msgid "FOAF for %s"
 msgstr "mignon ur mignon evit %s"
 
-#: actions/showstream.php:197
-#, php-format
-msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
+#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
+#: actions/showstream.php:211
+#, fuzzy, php-format
+msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr ""
 "Hemañ eo al lanvad evit %s hag e vignoned met den n'en deus skrivet tra ebet "
 "evit ar mare."
 
-#: actions/showstream.php:202
+#. TRANS: Second sentence of empty list message for a stream for the user themselves.
+#: actions/showstream.php:217
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
 msgstr ""
 
-#: actions/showstream.php:204
+#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:221
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
 "%?status_textarea=%2$s)."
 msgstr ""
 
-#: actions/showstream.php:243
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:264
 #, fuzzy, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4805,7 +4844,9 @@ msgstr ""
 "%%site.name%% a zo ur servij [micro-blogging](http://br.wikipedia.org/wiki/"
 "Microblog) diazezet war ar meziant frank [StatusNet](http://status.net/)."
 
-#: actions/showstream.php:248
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:271
 #, fuzzy, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4815,7 +4856,8 @@ msgstr ""
 "%%site.name%% a zo ur servij [micro-blogging](http://br.wikipedia.org/wiki/"
 "Microblog) diazezet war ar meziant frank [StatusNet](http://status.net/)."
 
-#: actions/showstream.php:305
+#. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
+#: actions/showstream.php:328
 #, php-format
 msgid "Repeat of %s"
 msgstr "Adkemeret eus %s"
@@ -4928,33 +4970,41 @@ msgstr "Bevenn a doublennoù"
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:56
+#. TRANS: Page title for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:55
 msgid "Site Notice"
 msgstr "Ali al lec'hienn"
 
-#: actions/sitenoticeadminpanel.php:67
+#. TRANS: Instructions for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:66
 msgid "Edit site-wide message"
 msgstr "Kemmañ ur gemennadenn hag a zo diwar-benn al lec'hienn a-bezh"
 
-#: actions/sitenoticeadminpanel.php:103
+#. TRANS: Server error displayed when saving a site-wide notice was impossible.
+#: actions/sitenoticeadminpanel.php:101
 msgid "Unable to save site notice."
 msgstr "Diposubl eo enrollañ ali al lec'hienn."
 
-#: actions/sitenoticeadminpanel.php:113
-msgid "Max length for the site-wide notice is 255 chars."
+#. TRANS: Client error displayed when a site-wide notice was longer than allowed.
+#: actions/sitenoticeadminpanel.php:112
+msgid "Maximum length for the site-wide notice is 255 characters."
 msgstr ""
 
+#. TRANS: Label for site-wide notice text field in admin panel.
 #: actions/sitenoticeadminpanel.php:176
 msgid "Site notice text"
 msgstr "Testenn ali al lec'hienn"
 
-#: actions/sitenoticeadminpanel.php:178
-msgid "Site-wide notice text (255 chars max; HTML okay)"
+#. TRANS: Tooltip for site-wide notice text field in admin panel.
+#: actions/sitenoticeadminpanel.php:179
+#, fuzzy
+msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr ""
 "Testenn an ali diwar-benn al lec'hienn a-bezh (255 arouezenn d'ar muiañ ; "
 "HTML gweredekaet)"
 
-#: actions/sitenoticeadminpanel.php:198
+#. TRANS: Title for button to save site notice in admin panel.
+#: actions/sitenoticeadminpanel.php:201
 msgid "Save site notice"
 msgstr "Enrollañ ali ul lec'hienn"
 
@@ -5418,80 +5468,96 @@ msgstr ""
 "lec'hienn \"%2$s\"."
 
 #. TRANS: User admin panel title
-#: actions/useradminpanel.php:60
+#: actions/useradminpanel.php:58
 msgctxt "TITLE"
 msgid "User"
 msgstr "Implijer"
 
-#: actions/useradminpanel.php:71
+#. TRANS: Instruction for user admin panel.
+#: actions/useradminpanel.php:69
 msgid "User settings for this StatusNet site"
 msgstr ""
 
-#: actions/useradminpanel.php:150
+#. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
+#: actions/useradminpanel.php:147
 msgid "Invalid bio limit. Must be numeric."
 msgstr ""
 
-#: actions/useradminpanel.php:156
-msgid "Invalid welcome text. Max length is 255 characters."
+#. TRANS: Form validation error in user admin panel when welcome text is too long.
+#: actions/useradminpanel.php:154
+msgid "Invalid welcome text. Maximum length is 255 characters."
 msgstr ""
 
+#. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
+#. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
 #, php-format
-msgid "Invalid default subscripton: '%1$s' is not user."
+msgid "Invalid default subscripton: '%1$s' is not a user."
 msgstr ""
 
 #. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:106
+#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
 #: lib/personalgroupnav.php:109
 msgid "Profile"
 msgstr "Profil"
 
-#: actions/useradminpanel.php:223
+#. TRANS: Field label in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:220
 msgid "Bio Limit"
 msgstr "Bevenn ar bio"
 
-#: actions/useradminpanel.php:224
+#. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:222
 msgid "Maximum length of a profile bio in characters."
 msgstr ""
 
-#: actions/useradminpanel.php:232
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:231
 msgid "New users"
 msgstr "Implijerien nevez"
 
+#. TRANS: Field label in user admin panel for setting new user welcome text.
 #: actions/useradminpanel.php:236
 msgid "New user welcome"
 msgstr "Degemer an implijerien nevez"
 
-#: actions/useradminpanel.php:237
+#. TRANS: Tooltip in user admin panel for setting new user welcome text.
+#: actions/useradminpanel.php:238
 #, fuzzy
-msgid "Welcome text for new users (Max 255 chars)."
+msgid "Welcome text for new users (maximum 255 characters)."
 msgstr "Re hir eo an anv (255 arouezenn d'ar muiañ)."
 
-#: actions/useradminpanel.php:242
+#. TRANS: Field label in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:244
 msgid "Default subscription"
 msgstr "Koumanantoù dre ziouer"
 
-#: actions/useradminpanel.php:243
+#. TRANS: Tooltip in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:246
 #, fuzzy
 msgid "Automatically subscribe new users to this user."
 msgstr ""
 "En em enskrivañ ez emgefre d'an holl re hag en em goumanant din (erbedet "
 "evit an implijerien nann-denel)"
 
-#: actions/useradminpanel.php:252
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:256
 msgid "Invitations"
 msgstr "Pedadennoù"
 
-#: actions/useradminpanel.php:257
+#. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:262
 msgid "Invitations enabled"
 msgstr "Pedadennoù gweredekaet"
 
-#: actions/useradminpanel.php:259
+#. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:265
 #, fuzzy
 msgid "Whether to allow users to invite new users."
 msgstr "Ma rankomp merañ an dalc'hoù hon unan."
 
-#: actions/useradminpanel.php:295
+#. TRANS: Title for button to save user settings in user admin panel.
+#: actions/useradminpanel.php:302
 msgid "Save user settings"
 msgstr "Enrollañ arventennoù an implijer"
 
@@ -5679,7 +5745,7 @@ msgid "Plugins"
 msgstr "Pluginoù"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:831
+#: actions/version.php:198 lib/action.php:880
 msgid "Version"
 msgstr "Stumm"
 
@@ -5886,16 +5952,23 @@ msgstr "Dibosupl eo enrollañ titouroù ar strollad lec'hel."
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
+#. TRANS: Full name of a profile or group followed by nickname in parens
+#: classes/Profile.php:164
+#, fuzzy, php-format
+msgctxt "FANCYNAME"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:791
+#: classes/Profile.php:812
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:800
+#: classes/Profile.php:821
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6040,196 +6113,203 @@ msgstr "%1$s - %2$s"
 msgid "Untitled page"
 msgstr "Pajenn hep anv"
 
+#. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
+#: lib/action.php:310
+msgctxt "TOOLTIP"
+msgid "Show more"
+msgstr ""
+
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:477
+#: lib/action.php:526
 #, fuzzy
 msgid "Primary site navigation"
 msgstr "Arventennoù diazez al lec'hienn"
 
 #. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:483
+#: lib/action.php:532
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr ""
 
 #. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:486
+#: lib/action.php:535
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Personel"
 
 #. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:488
+#: lib/action.php:537
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
 msgstr "Kemmañ ho chomlec'h postel, hoc'h avatar, ho ger-tremen, ho profil"
 
 #. TRANS: Main menu option when logged in for access to user settings
-#: lib/action.php:491
+#: lib/action.php:540
 msgid "Account"
 msgstr "Kont"
 
 #. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:493
+#: lib/action.php:542
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "Liammañ d'ar servijoù"
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:496
+#: lib/action.php:545
 msgid "Connect"
 msgstr "Kevreañ"
 
 #. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:499
+#: lib/action.php:548
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "Kemmañ arventennoù al lec'hienn"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:502 lib/groupnav.php:117
+#: lib/action.php:551 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Merañ"
 
 #. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:506
+#: lib/action.php:555
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Pediñ mignoned hag kenseurted da zont ganeoc'h war %s"
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:509
+#: lib/action.php:558
 msgctxt "MENU"
 msgid "Invite"
 msgstr "Pediñ"
 
 #. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:515
+#: lib/action.php:564
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "Digevreañ diouzh al lec'hienn"
 
 #. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:518
+#: lib/action.php:567
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Digevreañ"
 
 #. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:523
+#: lib/action.php:572
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "Krouiñ ur gont"
 
 #. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:526
+#: lib/action.php:575
 msgctxt "MENU"
 msgid "Register"
 msgstr "En em enskrivañ"
 
 #. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:529
+#: lib/action.php:578
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "Kevreañ d'al lec'hienn"
 
 #. TRANS: Main menu option when not logged in to log in
-#: lib/action.php:532
+#: lib/action.php:581
 msgctxt "MENU"
 msgid "Login"
 msgstr "Kevreañ"
 
 #. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:535
+#: lib/action.php:584
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Sikour din !"
 
 #. TRANS: Main menu option for help on the StatusNet site
-#: lib/action.php:538
+#: lib/action.php:587
 msgctxt "MENU"
 msgid "Help"
 msgstr "Skoazell"
 
 #. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:541
+#: lib/action.php:590
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr "Klask tud pe un tamm testenn"
 
 #. TRANS: Main menu option when logged in or when the StatusNet instance is not private
-#: lib/action.php:544
+#: lib/action.php:593
 msgctxt "MENU"
 msgid "Search"
 msgstr "Klask"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:566 lib/adminpanelaction.php:387
+#: lib/action.php:615 lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "Ali al lec'hienn"
 
 #. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:633
+#: lib/action.php:682
 msgid "Local views"
 msgstr "Selloù lec'hel"
 
 #. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:703
+#: lib/action.php:752
 msgid "Page notice"
 msgstr "Ali ar bajenn"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:804
+#: lib/action.php:853
 #, fuzzy
 msgid "Secondary site navigation"
 msgstr "Arventennoù diazez al lec'hienn"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:810
+#: lib/action.php:859
 msgid "Help"
 msgstr "Skoazell"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:813
+#: lib/action.php:862
 msgid "About"
 msgstr "Diwar-benn"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:816
+#: lib/action.php:865
 msgid "FAQ"
 msgstr "FAG"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:821
+#: lib/action.php:870
 msgid "TOS"
 msgstr "AIH"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:825
+#: lib/action.php:874
 msgid "Privacy"
 msgstr "Prevezded"
 
-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:828
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+#: lib/action.php:877
 msgid "Source"
 msgstr "Mammenn"
 
-#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:834
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+#: lib/action.php:884
 msgid "Contact"
 msgstr "Darempred"
 
-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:837
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+#: lib/action.php:887
 msgid "Badge"
 msgstr "Badj"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:866
+#: lib/action.php:916
 msgid "StatusNet software license"
 msgstr "Aotre-implijout ar meziant StatusNet"
 
@@ -6237,7 +6317,7 @@ msgstr "Aotre-implijout ar meziant StatusNet"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:873
+#: lib/action.php:923
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -6245,7 +6325,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:876
+#: lib/action.php:926
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** a zo ur servij microblogging."
@@ -6254,7 +6334,7 @@ msgstr "**%%site.name%%** a zo ur servij microblogging."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:883
+#: lib/action.php:933
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -6263,50 +6343,50 @@ msgid ""
 msgstr ""
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:899
+#: lib/action.php:949
 msgid "Site content license"
 msgstr "Aotre-implijout diwar-benn danvez al lec'hienn"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:906
+#: lib/action.php:956
 #, fuzzy, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "Kompren a ran ez eo prevez danvez ha roadennoù %1$s."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:913
+#: lib/action.php:963
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:917
+#: lib/action.php:967
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:949
+#: lib/action.php:999
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1285
+#: lib/action.php:1335
 msgid "Pagination"
 msgstr "Pajennadur"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1296
+#: lib/action.php:1346
 msgid "After"
 msgstr "War-lerc'h"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1306
+#: lib/action.php:1356
 msgid "Before"
 msgstr "Kent"
 
@@ -6651,7 +6731,7 @@ msgid "AJAX error"
 msgstr "Fazi Ajax"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:233 lib/mailhandler.php:142
+#: lib/channel.php:233 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "Urzhiad bet klokaet"
 
@@ -6667,7 +6747,7 @@ msgstr ""
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:626
+#: lib/command.php:99 lib/command.php:630
 msgid "User has no last notice."
 msgstr ""
 
@@ -6737,6 +6817,14 @@ msgstr ""
 msgid "%1$s left group %2$s."
 msgstr ""
 
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: lib/command.php:426
+#, fuzzy, php-format
+msgctxt "WHOIS"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
 #. TRANS: Whois output. %s is the full name of the queried user.
 #: lib/command.php:430
 #, php-format
@@ -6774,138 +6862,148 @@ msgid ""
 "same server."
 msgstr ""
 
-#. TRANS: Message given if content is too long.
+#. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
 #: lib/command.php:488
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] ""
+"Re hir eo ar gemennadenn - ar ment brasañ a zo %1$d arouezenn, %2$d "
+"arouezenn ho peus lakaet."
+msgstr[1] ""
 "Re hir eo ar gemennadenn - ar ment brasañ a zo %1$d arouezenn, %2$d "
 "arouezenn ho peus lakaet."
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:514
+#: lib/command.php:516
 msgid "Error sending direct message."
 msgstr "Ur gudenn 'zo bet pa veze kaset ho kemennadenn."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:551
+#: lib/command.php:553
 #, php-format
 msgid "Notice from %s repeated."
 msgstr ""
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:554
+#: lib/command.php:556
 #, fuzzy
 msgid "Error repeating notice."
 msgstr "Fazi en ur hizivaat ar profil a-bell."
 
-#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:589
-#, php-format
-msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
+#: lib/command.php:591
+#, fuzzy, php-format
+msgid "Notice too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] ""
+"Re hir eo ar gemennadenn - ar ment brasañ a zo %1$d arouezenn, %2$d "
+"arouezenn ho peus lakaet."
+msgstr[1] ""
+"Re hir eo ar gemennadenn - ar ment brasañ a zo %1$d arouezenn, %2$d "
+"arouezenn ho peus lakaet."
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:600
+#: lib/command.php:604
 #, php-format
 msgid "Reply to %s sent."
 msgstr ""
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:603
+#: lib/command.php:607
 #, fuzzy
 msgid "Error saving notice."
 msgstr "Ur gudenn 'zo bet pa veze enrollet an ali."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:650
+#: lib/command.php:654
 msgid "Specify the name of the user to subscribe to."
 msgstr ""
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:659
+#: lib/command.php:663
 msgid "Can't subscribe to OMB profiles by command."
 msgstr ""
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:667
+#: lib/command.php:671
 #, php-format
 msgid "Subscribed to %s."
 msgstr "Koumanantet da %s."
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:688 lib/command.php:799
+#: lib/command.php:692 lib/command.php:803
 msgid "Specify the name of the user to unsubscribe from."
 msgstr ""
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:699
+#: lib/command.php:703
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:719 lib/command.php:745
+#: lib/command.php:723 lib/command.php:749
 #, fuzzy
 msgid "Command not yet implemented."
 msgstr "Digarezit, n'eo ket bet emplementet an urzhiad-mañ c'hoazh."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:723
+#: lib/command.php:727
 msgid "Notification off."
 msgstr "Kemennoù diweredekaet."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:726
+#: lib/command.php:730
 msgid "Can't turn off notification."
 msgstr "Dibosupl eo diweredekaat ar c'hemennoù."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:749
+#: lib/command.php:753
 msgid "Notification on."
 msgstr "Kemennoù gweredekaet"
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:752
+#: lib/command.php:756
 msgid "Can't turn on notification."
 msgstr "Dibosupl eo gweredekaat ar c'hemennoù."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:766
+#: lib/command.php:770
 msgid "Login command is disabled."
 msgstr ""
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:779
+#: lib/command.php:783
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:808
+#: lib/command.php:812
 #, php-format
 msgid "Unsubscribed %s."
 msgstr "Digoumanatet %s."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:826
+#: lib/command.php:830
 msgid "You are not subscribed to anyone."
 msgstr "N'hoc'h ket koumanantet da zen ebet."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:831
+#: lib/command.php:835
 #, fuzzy
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
@@ -6914,14 +7012,14 @@ msgstr[1] "You are subscribed to these people:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:853
+#: lib/command.php:857
 msgid "No one is subscribed to you."
 msgstr "Den n'eo koumanantet deoc'h."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:858
+#: lib/command.php:862
 #, fuzzy
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
@@ -6930,14 +7028,14 @@ msgstr[1] "These people are subscribed to you:"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:880
+#: lib/command.php:884
 msgid "You are not a member of any groups."
 msgstr "N'oc'h ezel eus strollad ebet."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:885
+#: lib/command.php:889
 #, fuzzy
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
@@ -6945,7 +7043,7 @@ msgstr[0] "You are a member of this group:"
 msgstr[1] "You are a member of these groups:"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:900
+#: lib/command.php:904
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -7138,7 +7236,7 @@ msgstr "1 da 64 lizherenn vihan pe sifr, hep poentaouiñ nag esaouenn"
 
 #: lib/groupeditform.php:163
 #, fuzzy
-msgid "URL of the homepage or blog of the group or topic"
+msgid "URL of the homepage or blog of the group or topic."
 msgstr "URL pajenn degemer ar poellad-mañ"
 
 #: lib/groupeditform.php:168
@@ -7148,19 +7246,27 @@ msgstr "Deskrivit ho poellad"
 
 #: lib/groupeditform.php:170
 #, fuzzy, php-format
-msgid "Describe the group or topic in %d characters"
-msgstr "Diskrivit ho poellad gant %d arouezenn"
+msgid "Describe the group or topic in %d character or less"
+msgid_plural "Describe the group or topic in %d characters or less"
+msgstr[0] "Diskrivit ho poellad gant %d arouezenn"
+msgstr[1] "Diskrivit ho poellad gant %d arouezenn"
 
-#: lib/groupeditform.php:179
+#: lib/groupeditform.php:182
 #, fuzzy
 msgid ""
-"Location for the group, if any, like \"City, State (or Region), Country\""
+"Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr "El lec'h m'emaoc'h, da skouer \"Kêr, Stad (pe Rannvro), Bro\""
 
-#: lib/groupeditform.php:187
+#: lib/groupeditform.php:190
 #, php-format
-msgid "Extra nicknames for the group, comma- or space- separated, max %d"
-msgstr ""
+msgid ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"alias allowed."
+msgid_plural ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"aliases allowed."
+msgstr[0] ""
+msgstr[1] ""
 
 #. TRANS: Menu item in the group navigation page.
 #: lib/groupnav.php:86
@@ -7622,7 +7728,7 @@ msgstr "N'eo ket ho postel."
 msgid "Sorry, no incoming email allowed."
 msgstr "Chomlec'h postel ebet o tont."
 
-#: lib/mailhandler.php:228
+#: lib/mailhandler.php:229
 #, fuzzy, php-format
 msgid "Unsupported message type: %s"
 msgstr "Diembreget eo ar furmad-se."
@@ -7969,16 +8075,17 @@ msgid "Sandbox this user"
 msgstr "Distankañ an implijer-mañ"
 
 #. TRANS: Fieldset legend for the search form.
-#: lib/searchaction.php:121
+#: lib/searchaction.php:120
 msgid "Search site"
 msgstr "Klask el lec'hienn"
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
-#: lib/searchaction.php:129
+#: lib/searchaction.php:128
 msgid "Keyword(s)"
 msgstr "Ger(ioù) alc'hwez"
 
+#. TRANS: Button text for searching site.
 #: lib/searchaction.php:130
 msgctxt "BUTTON"
 msgid "Search"
@@ -8069,8 +8176,8 @@ msgid "The theme file is missing or the upload failed."
 msgstr ""
 
 #: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:278 lib/themeuploader.php:282
-#: lib/themeuploader.php:290 lib/themeuploader.php:297
+#: lib/themeuploader.php:279 lib/themeuploader.php:283
+#: lib/themeuploader.php:291 lib/themeuploader.php:298
 #, fuzzy
 msgid "Failed saving theme."
 msgstr "Ur gudenn 'zo bet e-pad hizivadenn an avatar."
@@ -8081,29 +8188,32 @@ msgstr ""
 
 #: lib/themeuploader.php:166
 #, php-format
-msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
-msgstr ""
+msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
+msgid_plural ""
+"Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr[0] ""
+msgstr[1] ""
 
-#: lib/themeuploader.php:178
+#: lib/themeuploader.php:179
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr ""
 
-#: lib/themeuploader.php:218
+#: lib/themeuploader.php:219
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
 msgstr ""
 
-#: lib/themeuploader.php:224
+#: lib/themeuploader.php:225
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr ""
 
-#: lib/themeuploader.php:241
+#: lib/themeuploader.php:242
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr ""
 
-#: lib/themeuploader.php:259
+#: lib/themeuploader.php:260
 #, fuzzy
 msgid "Error opening theme archive."
 msgstr "Fazi en ur hizivaat ar profil a-bell."
@@ -8293,23 +8403,36 @@ msgstr[1] ""
 "Re hir eo ar gemennadenn - ar ment brasañ a zo %1$d arouezenn, %2$d "
 "arouezenn ho peus lakaet."
 
-#: scripts/restoreuser.php:82
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: scripts/restoreuser.php:61
 #, php-format
-msgid "Backup file for user %s (%s)"
+msgid "Getting backup from file '%s'."
 msgstr ""
 
-#: scripts/restoreuser.php:88
+#. TRANS: Commandline script output.
+#: scripts/restoreuser.php:91
 #, fuzzy
 msgid "No user specified; using backup user."
 msgstr "N'eus bet diferet ID implijer ebet."
 
-#: scripts/restoreuser.php:94
+#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
+#: scripts/restoreuser.php:98
 #, php-format
-msgid "%d entries in backup."
-msgstr ""
+msgid "%d entry in backup."
+msgid_plural "%d entries in backup."
+msgstr[0] ""
+msgstr[1] ""
+
+#, fuzzy
+#~ msgid "Name is too long (maximum 255 chars)."
+#~ msgstr "Re hir eo an anv (255 arouezenn d'ar muiañ)."
+
+#, fuzzy
+#~ msgid "Organization is too long (maximum 255 chars)."
+#~ msgstr "Re hir eo an aozadur (255 arouezenn d'ar muiañ)."
 
-#~ msgid "Description is too long (max %d chars)."
-#~ msgstr "Re hir eo an deskrivadur (%d arouezenn d'ar muiañ)."
+#~ msgid "That's too long. Max notice size is %d chars."
+#~ msgstr "Re hir eo ! Ment hirañ an ali a zo a %d arouezenn."
 
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "Re a aliasoù ! %d d'ar muiañ."
+#~ msgid " tagged %s"
+#~ msgstr " merket %s"
diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po
index 78a49f197..80f1e8597 100644
--- a/locale/ca/LC_MESSAGES/statusnet.po
+++ b/locale/ca/LC_MESSAGES/statusnet.po
@@ -2,6 +2,7 @@
 # Expored from translatewiki.net
 #
 # Author: Aleator
+# Author: Martorell
 # Author: McDutchie
 # Author: Paucabot
 # Author: SMP
@@ -13,17 +14,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-30 23:18+0000\n"
-"PO-Revision-Date: 2010-10-30 23:19:57+0000\n"
+"POT-Creation-Date: 2010-11-02 22:51+0000\n"
+"PO-Revision-Date: 2010-11-02 22:53:08+0000\n"
 "Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r75708); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r75875); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2010-10-30 09:48:40+0000\n"
+"X-POT-Import-Date: 2010-10-30 23:42:01+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -82,15 +83,20 @@ msgstr "Desa els paràmetres d'accés"
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
+#. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
+#. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #: actions/accessadminpanel.php:193 actions/emailsettings.php:228
-#: actions/imsettings.php:187 actions/pathsadminpanel.php:512
-#: actions/profilesettings.php:201 actions/smssettings.php:209
-#: actions/subscriptions.php:246 lib/applicationeditform.php:355
+#: actions/imsettings.php:187 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: lib/applicationeditform.php:355 lib/groupeditform.php:207
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Desa"
@@ -141,7 +147,7 @@ msgstr "No existeix la pàgina."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:495 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "No existeix l'usuari."
@@ -214,7 +220,9 @@ msgstr ""
 
 #. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:208
+#. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -572,8 +580,11 @@ msgstr "El vostre nom sencer és massa llarg (màx. 255 caràcters)."
 #. TRANS: Group edit form validation error.
 #. TRANS: Form validation error in New application form.
 #. TRANS: %d is the maximum number of characters for the description.
+#. TRANS: Group create form validation error.
+#. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:220 actions/editapplication.php:201
 #: actions/editgroup.php:216 actions/newapplication.php:178
+#: actions/newgroup.php:152
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -733,14 +744,14 @@ msgstr "No esteu autoritzat."
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:172 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:74
 #: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
 #: actions/groupunblock.php:65 actions/imsettings.php:230
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
-#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/othersettings.php:153 actions/passwordsettings.php:138
 #: actions/profilesettings.php:221 actions/recoverpassword.php:350
 #: actions/register.php:172 actions/remotesubscribe.php:77
 #: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
@@ -920,20 +931,21 @@ msgstr "No podeu eliminar l'estat d'un altre usuari."
 
 #. TRANS: Client error displayed trying to repeat a non-existing notice through the API.
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
+#. TRANS: Error message displayed trying to delete a non-existing notice.
 #: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/deletenotice.php:58 actions/shownotice.php:92
+#: actions/deletenotice.php:61 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "No existeix aquest avís."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:535
+#: actions/apistatusesretweet.php:83 lib/command.php:537
 msgid "Cannot repeat your own notice."
 msgstr "No podeu repetir els vostres propis avisos."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:541
+#: actions/apistatusesretweet.php:92 lib/command.php:543
 msgid "Already repeated that notice."
 msgstr "Avís duplicat."
 
@@ -954,7 +966,8 @@ msgstr "El client ha de proporcionar un paràmetre 'status' amb un valor."
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#: actions/apistatusesupdate.php:244
+#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
+#: lib/mailhandler.php:60
 #, fuzzy, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
@@ -969,7 +982,7 @@ msgstr "No s'ha trobat el mètode API!"
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
-#: actions/apistatusesupdate.php:308
+#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
 #, fuzzy, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
@@ -1184,17 +1197,18 @@ msgstr ""
 msgid "Lost our file data."
 msgstr "S'ha perdut el nostre fitxer de dades."
 
-#: actions/avatarsettings.php:384
+#. TRANS: Success message for having updated a user avatar.
+#: actions/avatarsettings.php:385
 msgid "Avatar updated."
 msgstr "Avatar actualitzat."
 
 #. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
-#: actions/avatarsettings.php:388
+#: actions/avatarsettings.php:389
 msgid "Failed updating avatar."
 msgstr "Error en actualitzar avatar."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:412
+#: actions/avatarsettings.php:413
 msgid "Avatar deleted."
 msgstr "S'ha eliminat l'avatar."
 
@@ -1226,8 +1240,8 @@ msgstr ""
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:154 actions/deleteapplication.php:154
-#: actions/deletegroup.php:220 actions/deletenotice.php:150
+#: actions/block.php:154 actions/deleteapplication.php:157
+#: actions/deletegroup.php:220 actions/deletenotice.php:155
 #: actions/deleteuser.php:152 actions/groupblock.php:178
 msgctxt "BUTTON"
 msgid "No"
@@ -1245,8 +1259,8 @@ msgstr "No bloquis l'usuari"
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:161 actions/deleteapplication.php:161
-#: actions/deletegroup.php:227 actions/deletenotice.php:157
+#: actions/block.php:161 actions/deleteapplication.php:164
+#: actions/deletegroup.php:227 actions/deletenotice.php:162
 #: actions/deleteuser.php:159 actions/groupblock.php:185
 msgctxt "BUTTON"
 msgid "Yes"
@@ -1363,12 +1377,13 @@ msgstr "Aquesta adreça ja ha estat confirmada."
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
 #. TRANS: Server error thrown on database error updating IM preferences.
 #. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
 #. TRANS: Server error thrown when user profile settings could not be updated.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #: actions/confirmaddress.php:118 actions/emailsettings.php:331
 #: actions/emailsettings.php:477 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:174
+#: actions/imsettings.php:442 actions/othersettings.php:184
 #: actions/profilesettings.php:326 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
@@ -1404,16 +1419,19 @@ msgstr "Conversa"
 msgid "Notices"
 msgstr "Avisos"
 
-#: actions/deleteapplication.php:63
+#. TRANS: Client error displayed trying to delete an application while not logged in.
+#: actions/deleteapplication.php:62
 msgid "You must be logged in to delete an application."
 msgstr "Heu d'haver iniciat una sessió per eliminar una aplicació."
 
+#. TRANS: Client error displayed trying to delete an application that does not exist.
 #: actions/deleteapplication.php:71
 msgid "Application not found."
 msgstr "No s'ha trobat l'aplicació."
 
+#. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
-#: actions/deleteapplication.php:78 actions/editapplication.php:78
+#: actions/deleteapplication.php:79 actions/editapplication.php:78
 #: actions/showapplication.php:94
 msgid "You are not the owner of this application."
 msgstr "No sou el propietari d'aquesta aplicació."
@@ -1421,15 +1439,18 @@ msgstr "No sou el propietari d'aquesta aplicació."
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
 #: actions/newapplication.php:114 actions/showapplication.php:118
-#: lib/action.php:1354
+#: lib/action.php:1404
 msgid "There was a problem with your session token."
 msgstr "S'ha produït un problema amb el testimoni de la vostra sessió."
 
-#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+#. TRANS: Title for delete application page.
+#. TRANS: Fieldset legend on delete application page.
+#: actions/deleteapplication.php:124 actions/deleteapplication.php:149
 msgid "Delete application"
 msgstr "Elimina l'aplicació"
 
-#: actions/deleteapplication.php:149
+#. TRANS: Confirmation text on delete application page.
+#: actions/deleteapplication.php:152
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
 "about the application from the database, including all existing user "
@@ -1440,12 +1461,12 @@ msgstr ""
 "existents."
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:158
+#: actions/deleteapplication.php:161
 msgid "Do not delete this application"
 msgstr "No eliminis l'aplicació"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:164
+#: actions/deleteapplication.php:167
 msgid "Delete this application"
 msgstr "Elimina aquesta aplicació"
 
@@ -1481,12 +1502,13 @@ msgstr "No s'ha pogut eliminar el grup %s."
 msgid "Deleted group %s"
 msgstr "S'ha eliminat el grup %s"
 
-#. TRANS: Title.
+#. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
 #: actions/deletegroup.php:176 actions/deletegroup.php:202
 msgid "Delete group"
 msgstr "Elimina el grup"
 
+#. TRANS: Warning in form for deleleting a group.
 #: actions/deletegroup.php:206
 #, fuzzy
 msgid ""
@@ -1507,10 +1529,11 @@ msgstr "No eliminis aquest grup"
 msgid "Delete this group"
 msgstr "Elimina aquest grup"
 
+#. TRANS: Error message displayed trying to delete a notice while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1520,11 +1543,13 @@ msgstr "Elimina aquest grup"
 msgid "Not logged in."
 msgstr "No heu iniciat una sessió."
 
-#: actions/deletenotice.php:74
+#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
+#: actions/deletenotice.php:78
 msgid "Can't delete this notice."
 msgstr "No es pot eliminar l'avís."
 
-#: actions/deletenotice.php:106
+#. TRANS: Instructions for deleting a notice.
+#: actions/deletenotice.php:110
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
@@ -1532,21 +1557,24 @@ msgstr ""
 "Esteu a punt d'eliminar permanentment un avís. Una vegada fet, no es podrà "
 "desfer."
 
-#: actions/deletenotice.php:112 actions/deletenotice.php:144
+#. TRANS: Page title when deleting a notice.
+#. TRANS: Fieldset legend for the delete notice form.
+#: actions/deletenotice.php:117 actions/deletenotice.php:148
 msgid "Delete notice"
 msgstr "Elimina l'avís"
 
-#: actions/deletenotice.php:147
+#. TRANS: Message for the delete notice form.
+#: actions/deletenotice.php:152
 msgid "Are you sure you want to delete this notice?"
 msgstr "Esteu segur que voleu eliminar aquest avís?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:154
+#: actions/deletenotice.php:159
 msgid "Do not delete this notice"
 msgstr "No eliminis aquest avís"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:161 lib/noticelist.php:667
+#: actions/deletenotice.php:166 lib/noticelist.php:667
 msgid "Delete this notice"
 msgstr "Elimina aquest avís"
 
@@ -1708,11 +1736,9 @@ msgstr "Torna a restaurar al valor per defecte"
 
 #. TRANS: Submit button title.
 #: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
-#: actions/othersettings.php:126 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: actions/useradminpanel.php:295 lib/applicationeditform.php:357
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: lib/applicationeditform.php:357 lib/designsettings.php:256
 msgid "Save"
 msgstr "Desa"
 
@@ -1760,8 +1786,9 @@ msgid "Name is required."
 msgstr "Cal un nom."
 
 #. TRANS: Validation error shown when providing too long a name in the "Edit application" form.
-#: actions/editapplication.php:188
-msgid "Name is too long (max 255 characters)."
+#: actions/editapplication.php:188 actions/newapplication.php:169
+#, fuzzy
+msgid "Name is too long (maximum 255 characters)."
 msgstr "El nom és massa llarg (màx. 255 caràcters)."
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
@@ -1790,7 +1817,7 @@ msgid "Organization is required."
 msgstr "Cal una organització."
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#: actions/editapplication.php:223
+#: actions/editapplication.php:223 actions/newapplication.php:199
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "El camp organització és massa llarg (màx. 255 caràcters)."
 
@@ -2586,10 +2613,10 @@ msgstr ""
 #. TRANS: Checkbox label in IM preferences form.
 #: actions/imsettings.php:182
 msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr "Publica una MicroID per a la meva direcció de Jabber/GTalk."
+msgstr "Publica una MicroID per al meu compte de Jabber/GTalk."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:180
+#: actions/imsettings.php:290 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "S'han desat les preferències."
 
@@ -2714,10 +2741,9 @@ msgstr[1] "Ja estàs subscrit a aquests usuaris:"
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#. TRANS: Whois output.
-#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:145 actions/invite.php:159 lib/command.php:426
-#, php-format
+#: actions/invite.php:145 actions/invite.php:159
+#, fuzzy, php-format
+msgctxt "INVITE"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
@@ -2904,7 +2930,8 @@ msgstr ""
 "«Tots els drets reservats»."
 
 #: actions/licenseadminpanel.php:156
-msgid "Invalid license title. Max length is 255 characters."
+#, fuzzy
+msgid "Invalid license title. Maximum length is 255 characters."
 msgstr ""
 "El títol de la llicència no és vàlid. La longitud màxima és 255 caràcters."
 
@@ -3082,20 +3109,10 @@ msgstr "Heu d'haver iniciat una sessió per registrar-hi una aplicació."
 msgid "Use this form to register a new application."
 msgstr "Utilitzeu aquest formulari per crear una nova aplicació."
 
-#: actions/newapplication.php:169
-#, fuzzy
-msgid "Name is too long (maximum 255 chars)."
-msgstr "El nom és massa llarg (màx. 255 caràcters)."
-
 #: actions/newapplication.php:184
 msgid "Source URL is required."
 msgstr "URL d'origen requerida."
 
-#: actions/newapplication.php:199
-#, fuzzy
-msgid "Organization is too long (maximum 255 chars)."
-msgstr "El camp organització és massa llarg (màx. 255 caràcters)."
-
 #: actions/newapplication.php:266 actions/newapplication.php:275
 msgid "Could not create application."
 msgstr "No s'ha pogut crear l'aplicació."
@@ -3115,14 +3132,14 @@ msgid "New message"
 msgstr "Nou missatge"
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:499
+#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501
 msgid "You can't send a message to this user."
 msgstr "No podeu enviar un misssatge a aquest usuari."
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
 #: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
-#: lib/command.php:579
+#: lib/command.php:581
 msgid "No content!"
 msgstr "Cap contingut!"
 
@@ -3131,7 +3148,7 @@ msgid "No recipient specified."
 msgstr "No has especificat el destinatari."
 
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:503
+#: actions/newmessage.php:167 lib/command.php:505
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "No t'enviïs missatges a tu mateix, simplement dir-te això."
@@ -3142,12 +3159,12 @@ msgstr "S'ha enviat el missatge"
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:511
+#: actions/newmessage.php:188 lib/command.php:513
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "S'ha enviat un missatge directe a %s."
 
-#: actions/newmessage.php:213 actions/newnotice.php:263
+#: actions/newmessage.php:213 actions/newnotice.php:264
 msgid "Ajax Error"
 msgstr "Ajax Error"
 
@@ -3155,17 +3172,7 @@ msgstr "Ajax Error"
 msgid "New notice"
 msgstr "Nou avís"
 
-#: actions/newnotice.php:159 lib/mailhandler.php:60
-#, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr "Massa llarg. La longitud màxima és de %d caràcters."
-
-#: actions/newnotice.php:183
-#, php-format
-msgid "Max notice size is %d chars, including attachment URL."
-msgstr "La mida màxima de l'avís és %d caràcters, incloent l'URL de l'adjunt."
-
-#: actions/newnotice.php:229
+#: actions/newnotice.php:230
 msgid "Notice posted"
 msgstr "S'ha publicat l'avís"
 
@@ -3336,36 +3343,46 @@ msgstr "Cerca de gent"
 msgid "Notice Search"
 msgstr "Cerca d'avisos"
 
-#: actions/othersettings.php:60
+#: actions/othersettings.php:59
 msgid "Other settings"
 msgstr "Altres paràmetres"
 
+#. TRANS: Instructions for tab "Other" in user profile settings.
 #: actions/othersettings.php:71
 msgid "Manage various other options."
 msgstr "Gestiona altres opcions diferents."
 
-#: actions/othersettings.php:108
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/othersettings.php:111
 msgid " (free service)"
 msgstr " (servei gratuït)"
 
-#: actions/othersettings.php:116
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/othersettings.php:120
 msgid "Shorten URLs with"
 msgstr "Escurça els URL amb"
 
-#: actions/othersettings.php:117
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/othersettings.php:122
 msgid "Automatic shortening service to use."
 msgstr "Servei d'auto-escurçament a utilitzar."
 
-#: actions/othersettings.php:122
+#. TRANS: Label for checkbox.
+#: actions/othersettings.php:128
 msgid "View profile designs"
 msgstr "Visualitza els dissenys de perfil"
 
-#: actions/othersettings.php:123
+#. TRANS: Tooltip for checkbox.
+#: actions/othersettings.php:130
 msgid "Show or hide profile designs."
 msgstr "Mostra o amaga els dissenys de perfil."
 
-#: actions/othersettings.php:153
-msgid "URL shortening service is too long (max 50 chars)."
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/othersettings.php:162
+#, fuzzy
+msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr ""
 "El servei d'auto-escurçament d'URL és massa llarga (màx. 50 caràcters)."
 
@@ -3857,7 +3874,7 @@ msgstr "Biografia"
 #. TRANS: Label for group location (dt). Text hidden by default.
 #: actions/profilesettings.php:149 actions/register.php:485
 #: actions/showgroup.php:267 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:177
+#: actions/userauthorization.php:166 lib/groupeditform.php:180
 #: lib/userprofile.php:165
 msgid "Location"
 msgstr "Ubicació"
@@ -3870,7 +3887,7 @@ msgstr "On us trobeu, per exemple «ciutat, comarca (o illa), país»"
 #. TRANS: Checkbox label in form for profile settings.
 #: actions/profilesettings.php:157
 msgid "Share my current location when posting notices"
-msgstr "Comparteix la meva ubicació actual en enviar avisos"
+msgstr "Comparteix la ubicació on estic en enviar avisos"
 
 #. TRANS: Field label in form for profile settings.
 #: actions/profilesettings.php:165 actions/tagother.php:149
@@ -4201,7 +4218,8 @@ msgid "Unexpected password reset."
 msgstr "Restabliment de contrasenya inesperat."
 
 #: actions/recoverpassword.php:365
-msgid "Password must be 6 chars or more."
+#, fuzzy
+msgid "Password must be 6 characters or more."
 msgstr "La contrasenya ha de tenir 6 o més caràcters."
 
 #: actions/recoverpassword.php:369
@@ -4578,7 +4596,7 @@ msgstr "Organització"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:172
+#: lib/applicationeditform.php:208 lib/groupeditform.php:175
 msgid "Description"
 msgstr "Descripció"
 
@@ -4729,7 +4747,7 @@ msgid "Note"
 msgstr "Avisos"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:298 lib/groupeditform.php:184
+#: actions/showgroup.php:298 lib/groupeditform.php:187
 msgid "Aliases"
 msgstr "Àlies"
 
@@ -4862,48 +4880,68 @@ msgstr "Missatge de %1$s a %2$s"
 msgid "Notice deleted."
 msgstr "S'ha eliminat l'avís."
 
-#: actions/showstream.php:72
-#, php-format
-msgid " tagged %s"
-msgstr " etiquetats amb %s"
+#. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
+#: actions/showstream.php:70
+#, fuzzy, php-format
+msgid "%1$s tagged %2$s"
+msgstr "%1$s, pàgina %2$d"
 
-#: actions/showstream.php:78
+#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#: actions/showstream.php:74
+#, fuzzy, php-format
+msgid "%1$s tagged %2$s, page %3$d"
+msgstr "Avisos etiquetats amb %1$s, pàgina %2$d"
+
+#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$d is the page number.
+#: actions/showstream.php:82
 #, php-format
 msgid "%1$s, page %2$d"
 msgstr "%1$s, pàgina %2$d"
 
-#: actions/showstream.php:120
+#. TRANS: Title for link to notice feed.
+#. TRANS: %1$s is a user nickname, %2$s is a hashtag.
+#: actions/showstream.php:127
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Canal d'avisos de %1$s etiquetats amb %2$s (RSS 1.0)"
 
-#: actions/showstream.php:127
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:136
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "Canal d'avisos de %s (RSS 1.0)"
 
-#: actions/showstream.php:134
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:145
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "Canal d'avisos de %s (RSS 2.0)"
 
-#: actions/showstream.php:141
+#: actions/showstream.php:152
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "Canal d'avisos de %s (Atom)"
 
-#: actions/showstream.php:146
+#. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
+#. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
+#: actions/showstream.php:159
 #, php-format
 msgid "FOAF for %s"
 msgstr "FOAF de %s"
 
-#: actions/showstream.php:197
-#, php-format
-msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
+#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
+#: actions/showstream.php:211
+#, fuzzy, php-format
+msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr ""
 "Aquesta és la línia temporal de %1$s, però %2$s no hi ha enviat res encara."
 
-#: actions/showstream.php:202
+#. TRANS: Second sentence of empty list message for a stream for the user themselves.
+#: actions/showstream.php:217
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -4911,7 +4949,9 @@ msgstr ""
 "Heu vist res interessant recentment? No heu enviat cap avís encara, ara "
 "podria ser un bon moment per començar :)"
 
-#: actions/showstream.php:204
+#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:221
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -4920,7 +4960,9 @@ msgstr ""
 "Sigueu el primer en [enviar sobre aquest tema](%%%%action.newnotice%%%%?"
 "status_textarea=%s)!"
 
-#: actions/showstream.php:243
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:264
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4935,7 +4977,9 @@ msgstr ""
 "seguir els avisos de **%s** i molt més! ([Més informació...](%%%%doc.help%%%"
 "%))"
 
-#: actions/showstream.php:248
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:271
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4946,7 +4990,8 @@ msgstr ""
 "ca.wikipedia.org/wiki/Microblogging) basat en l'eina lliure [StatusNet]"
 "(http://status.net/). "
 
-#: actions/showstream.php:305
+#. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
+#: actions/showstream.php:328
 #, php-format
 msgid "Repeat of %s"
 msgstr "Repetició de %s"
@@ -5060,31 +5105,40 @@ msgstr ""
 "Quant de temps cal que esperin els usuaris (en segons) per enviar el mateix "
 "de nou."
 
-#: actions/sitenoticeadminpanel.php:56
+#. TRANS: Page title for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:55
 msgid "Site Notice"
 msgstr "Avís del lloc"
 
-#: actions/sitenoticeadminpanel.php:67
+#. TRANS: Instructions for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:66
 msgid "Edit site-wide message"
 msgstr "Edita el missatge de tot el lloc"
 
-#: actions/sitenoticeadminpanel.php:103
+#. TRANS: Server error displayed when saving a site-wide notice was impossible.
+#: actions/sitenoticeadminpanel.php:101
 msgid "Unable to save site notice."
 msgstr "No s'ha pogut desar l'avís del lloc."
 
-#: actions/sitenoticeadminpanel.php:113
-msgid "Max length for the site-wide notice is 255 chars."
+#. TRANS: Client error displayed when a site-wide notice was longer than allowed.
+#: actions/sitenoticeadminpanel.php:112
+#, fuzzy
+msgid "Maximum length for the site-wide notice is 255 characters."
 msgstr "La mida màxima per als avisos de tot el lloc és de 255 caràcters."
 
+#. TRANS: Label for site-wide notice text field in admin panel.
 #: actions/sitenoticeadminpanel.php:176
 msgid "Site notice text"
 msgstr "Text de l'avís del lloc"
 
-#: actions/sitenoticeadminpanel.php:178
-msgid "Site-wide notice text (255 chars max; HTML okay)"
+#. TRANS: Tooltip for site-wide notice text field in admin panel.
+#: actions/sitenoticeadminpanel.php:179
+#, fuzzy
+msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr "Text d'avís de tot el lloc (màxim 255 caràcters, es permet l'HTML)"
 
-#: actions/sitenoticeadminpanel.php:198
+#. TRANS: Title for button to save site notice in admin panel.
+#: actions/sitenoticeadminpanel.php:201
 msgid "Save site notice"
 msgstr "Desa l'avís del lloc"
 
@@ -5554,76 +5608,94 @@ msgstr ""
 "llicència del lloc, «%2$s»."
 
 #. TRANS: User admin panel title
-#: actions/useradminpanel.php:60
+#: actions/useradminpanel.php:58
 msgctxt "TITLE"
 msgid "User"
 msgstr "Usuari"
 
-#: actions/useradminpanel.php:71
+#. TRANS: Instruction for user admin panel.
+#: actions/useradminpanel.php:69
 msgid "User settings for this StatusNet site"
 msgstr "Paràmetres d'usuari d'aquest lloc basat en StatusNet"
 
-#: actions/useradminpanel.php:150
+#. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
+#: actions/useradminpanel.php:147
 msgid "Invalid bio limit. Must be numeric."
 msgstr "El límit de la biografia no és vàlid. Cal que sigui numèric."
 
-#: actions/useradminpanel.php:156
-msgid "Invalid welcome text. Max length is 255 characters."
+#. TRANS: Form validation error in user admin panel when welcome text is too long.
+#: actions/useradminpanel.php:154
+#, fuzzy
+msgid "Invalid welcome text. Maximum length is 255 characters."
 msgstr ""
 "El text de benvinguda no és vàlid. La longitud màxima és de 255 caràcters."
 
+#. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
+#. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
-#, php-format
-msgid "Invalid default subscripton: '%1$s' is not user."
+#, fuzzy, php-format
+msgid "Invalid default subscripton: '%1$s' is not a user."
 msgstr "La subscripció per defecte no és vàlida: «%1$s» no és cap usuari."
 
 #. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:106
+#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
 #: lib/personalgroupnav.php:109
 msgid "Profile"
 msgstr "Perfil"
 
-#: actions/useradminpanel.php:223
+#. TRANS: Field label in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:220
 msgid "Bio Limit"
 msgstr "Límit de la biografia"
 
-#: actions/useradminpanel.php:224
+#. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:222
 msgid "Maximum length of a profile bio in characters."
 msgstr "Límit màxim de la biografia d'un perfil (en caràcters)."
 
-#: actions/useradminpanel.php:232
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:231
 msgid "New users"
 msgstr "Usuaris nous"
 
+#. TRANS: Field label in user admin panel for setting new user welcome text.
 #: actions/useradminpanel.php:236
 msgid "New user welcome"
 msgstr "Benvinguda als usuaris nous"
 
-#: actions/useradminpanel.php:237
-msgid "Welcome text for new users (Max 255 chars)."
+#. TRANS: Tooltip in user admin panel for setting new user welcome text.
+#: actions/useradminpanel.php:238
+#, fuzzy
+msgid "Welcome text for new users (maximum 255 characters)."
 msgstr "Text de benvinguda per a nous usuaris (màx. 255 caràcters)."
 
-#: actions/useradminpanel.php:242
+#. TRANS: Field label in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:244
 msgid "Default subscription"
 msgstr "Subscripció per defecte"
 
-#: actions/useradminpanel.php:243
+#. TRANS: Tooltip in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:246
 msgid "Automatically subscribe new users to this user."
 msgstr "Subscriviu automàticament els usuaris nous a aquest usuari."
 
-#: actions/useradminpanel.php:252
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:256
 msgid "Invitations"
 msgstr "Invitacions"
 
-#: actions/useradminpanel.php:257
+#. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:262
 msgid "Invitations enabled"
 msgstr "S'han habilitat les invitacions"
 
-#: actions/useradminpanel.php:259
+#. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:265
 msgid "Whether to allow users to invite new users."
 msgstr "Si es permet als usuaris invitar-ne de nous."
 
-#: actions/useradminpanel.php:295
+#. TRANS: Title for button to save user settings in user admin panel.
+#: actions/useradminpanel.php:302
 msgid "Save user settings"
 msgstr "Desa els paràmetres d'usuari"
 
@@ -5834,7 +5906,7 @@ msgid "Plugins"
 msgstr "Connectors"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:831
+#: actions/version.php:198 lib/action.php:880
 msgid "Version"
 msgstr "Versió"
 
@@ -6046,16 +6118,23 @@ msgstr "No s'ha pogut desar la resposta de %1$d, %2$d."
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
+#. TRANS: Full name of a profile or group followed by nickname in parens
+#: classes/Profile.php:164
+#, fuzzy, php-format
+msgctxt "FANCYNAME"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:791
+#: classes/Profile.php:812
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr "No es pot revocar el rol «%1$s» de l'usuari #%2$d; no existeix."
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:800
+#: classes/Profile.php:821
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6202,194 +6281,201 @@ msgstr "%1$s - %2$s"
 msgid "Untitled page"
 msgstr "Pàgina sense titol"
 
+#. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
+#: lib/action.php:310
+msgctxt "TOOLTIP"
+msgid "Show more"
+msgstr ""
+
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:477
+#: lib/action.php:526
 msgid "Primary site navigation"
 msgstr "Navegació primària del lloc"
 
 #. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:483
+#: lib/action.php:532
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "Perfil personal i línia temporal dels amics"
 
 #. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:486
+#: lib/action.php:535
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Personal"
 
 #. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:488
+#: lib/action.php:537
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
 msgstr "Canvia l'adreça electrònica, l'avatar, la contrasenya o el perfil"
 
 #. TRANS: Main menu option when logged in for access to user settings
-#: lib/action.php:491
+#: lib/action.php:540
 msgid "Account"
 msgstr "Compte"
 
 #. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:493
+#: lib/action.php:542
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "Connecta als serveis"
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:496
+#: lib/action.php:545
 msgid "Connect"
 msgstr "Connexió"
 
 #. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:499
+#: lib/action.php:548
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "Canvia la configuració del lloc"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:502 lib/groupnav.php:117
+#: lib/action.php:551 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Administrador"
 
 #. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:506
+#: lib/action.php:555
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Convida amics i coneguts perquè participin a %s"
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:509
+#: lib/action.php:558
 msgctxt "MENU"
 msgid "Invite"
 msgstr "Convida"
 
 #. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:515
+#: lib/action.php:564
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "Finalitza la sessió del lloc"
 
 #. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:518
+#: lib/action.php:567
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Finalitza la sessió"
 
 #. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:523
+#: lib/action.php:572
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "Crea un compte"
 
 #. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:526
+#: lib/action.php:575
 msgctxt "MENU"
 msgid "Register"
 msgstr "Registre"
 
 #. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:529
+#: lib/action.php:578
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "Inicia una sessió al lloc"
 
 #. TRANS: Main menu option when not logged in to log in
-#: lib/action.php:532
+#: lib/action.php:581
 msgctxt "MENU"
 msgid "Login"
 msgstr "Inici de sessió"
 
 #. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:535
+#: lib/action.php:584
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Ajuda'm!"
 
 #. TRANS: Main menu option for help on the StatusNet site
-#: lib/action.php:538
+#: lib/action.php:587
 msgctxt "MENU"
 msgid "Help"
 msgstr "Ajuda"
 
 #. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:541
+#: lib/action.php:590
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr "Cerca gent o text"
 
 #. TRANS: Main menu option when logged in or when the StatusNet instance is not private
-#: lib/action.php:544
+#: lib/action.php:593
 msgctxt "MENU"
 msgid "Search"
 msgstr "Cerca"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:566 lib/adminpanelaction.php:387
+#: lib/action.php:615 lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "Avís del lloc"
 
 #. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:633
+#: lib/action.php:682
 msgid "Local views"
 msgstr "Vistes locals"
 
 #. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:703
+#: lib/action.php:752
 msgid "Page notice"
 msgstr "Avís de pàgina"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:804
+#: lib/action.php:853
 msgid "Secondary site navigation"
 msgstr "Navegació del lloc secundària"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:810
+#: lib/action.php:859
 msgid "Help"
 msgstr "Ajuda"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:813
+#: lib/action.php:862
 msgid "About"
 msgstr "Quant a"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:816
+#: lib/action.php:865
 msgid "FAQ"
 msgstr "Preguntes més freqüents"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:821
+#: lib/action.php:870
 msgid "TOS"
 msgstr "Termes del servei"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:825
+#: lib/action.php:874
 msgid "Privacy"
 msgstr "Privadesa"
 
-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:828
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+#: lib/action.php:877
 msgid "Source"
 msgstr "Font"
 
-#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:834
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+#: lib/action.php:884
 msgid "Contact"
 msgstr "Contacte"
 
-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:837
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+#: lib/action.php:887
 msgid "Badge"
 msgstr "Insígnia"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:866
+#: lib/action.php:916
 msgid "StatusNet software license"
 msgstr "Llicència del programari StatusNet"
 
@@ -6397,7 +6483,7 @@ msgstr "Llicència del programari StatusNet"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:873
+#: lib/action.php:923
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -6407,7 +6493,7 @@ msgstr ""
 "site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:876
+#: lib/action.php:926
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** és un servei de microblogging."
@@ -6416,7 +6502,7 @@ msgstr "**%%site.name%%** és un servei de microblogging."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:883
+#: lib/action.php:933
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -6428,27 +6514,27 @@ msgstr ""
 "org/licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:899
+#: lib/action.php:949
 msgid "Site content license"
 msgstr "Llicència de contingut del lloc"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:906
+#: lib/action.php:956
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "El contingut i les dades de %1$s són privades i confidencials."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:913
+#: lib/action.php:963
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 "El contingut i les dades són copyright de %1$s. Tots els drets reservats."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:917
+#: lib/action.php:967
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "El contingut i les dades són copyright dels col·laboradors. Tots els drets "
@@ -6456,7 +6542,7 @@ msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:949
+#: lib/action.php:999
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
@@ -6464,19 +6550,19 @@ msgstr ""
 "llicència %2$s."
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1285
+#: lib/action.php:1335
 msgid "Pagination"
 msgstr "Paginació"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1296
+#: lib/action.php:1346
 msgid "After"
 msgstr "Posteriors"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1306
+#: lib/action.php:1356
 msgid "Before"
 msgstr "Anteriors"
 
@@ -6824,7 +6910,7 @@ msgid "AJAX error"
 msgstr "Ajax Error"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:233 lib/mailhandler.php:142
+#: lib/channel.php:233 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "Comanda completada"
 
@@ -6840,7 +6926,7 @@ msgstr "No existeix cap avís amb aquest identificador."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:626
+#: lib/command.php:99 lib/command.php:630
 msgid "User has no last notice."
 msgstr "L'usuari no té un darrer avís."
 
@@ -6909,6 +6995,14 @@ msgstr "%1$s s'ha unit al grup %2$s."
 msgid "%1$s left group %2$s."
 msgstr "%1$s ha deixat el grup %2$s."
 
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: lib/command.php:426
+#, fuzzy, php-format
+msgctxt "WHOIS"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
 #. TRANS: Whois output. %s is the full name of the queried user.
 #: lib/command.php:430
 #, php-format
@@ -6948,114 +7042,121 @@ msgstr ""
 "%s és un perfil remot; només podeu enviar missatges directess a usuaris del "
 "mateix servidor."
 
-#. TRANS: Message given if content is too long.
+#. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
 #: lib/command.php:488
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] ""
+"El missatge és massa llarg - el màxim és %1$d caràcters, i n'heu enviat %2$d."
+msgstr[1] ""
 "El missatge és massa llarg - el màxim és %1$d caràcters, i n'heu enviat %2$d."
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:514
+#: lib/command.php:516
 msgid "Error sending direct message."
 msgstr "S'ha produït un error en enviar el missatge directe."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:551
+#: lib/command.php:553
 #, php-format
 msgid "Notice from %s repeated."
 msgstr "S'ha repetit l'avís de %s."
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:554
+#: lib/command.php:556
 msgid "Error repeating notice."
 msgstr "S'ha produït un error en repetir l'avís."
 
-#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:589
-#, php-format
-msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
-msgstr "L'avís és massa llarg - el màxim és %1$d caràcters, n'heu enviat %2$d."
+#: lib/command.php:591
+#, fuzzy, php-format
+msgid "Notice too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] ""
+"L'avís és massa llarg - el màxim és %1$d caràcters, n'heu enviat %2$d."
+msgstr[1] ""
+"L'avís és massa llarg - el màxim és %1$d caràcters, n'heu enviat %2$d."
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:600
+#: lib/command.php:604
 #, php-format
 msgid "Reply to %s sent."
 msgstr "S'ha enviat la resposta a %s."
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:603
+#: lib/command.php:607
 msgid "Error saving notice."
 msgstr "S'ha produït un error en desar l'avís."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:650
+#: lib/command.php:654
 msgid "Specify the name of the user to subscribe to."
 msgstr "Especifiqueu el nom de l'usuari al qual voleu subscriure-us."
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:659
+#: lib/command.php:663
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "No es pot subscriure a perfils de OMB amb ordres."
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:667
+#: lib/command.php:671
 #, php-format
 msgid "Subscribed to %s."
 msgstr "Subscrit a %s."
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:688 lib/command.php:799
+#: lib/command.php:692 lib/command.php:803
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "Especifiqueu el nom de l'usuari del qui voleu deixar la subscripció."
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:699
+#: lib/command.php:703
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr "S'ha deixat d'estar subscrit a %s."
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:719 lib/command.php:745
+#: lib/command.php:723 lib/command.php:749
 msgid "Command not yet implemented."
 msgstr "Comanda encara no implementada."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:723
+#: lib/command.php:727
 msgid "Notification off."
 msgstr "Avisos desactivats."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:726
+#: lib/command.php:730
 msgid "Can't turn off notification."
 msgstr "No es poden desactivar els avisos."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:749
+#: lib/command.php:753
 msgid "Notification on."
 msgstr "Avisos activitats."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:752
+#: lib/command.php:756
 msgid "Can't turn on notification."
 msgstr "No es poden activar els avisos."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:766
+#: lib/command.php:770
 msgid "Login command is disabled."
 msgstr "L'ordre d'inici de sessió no està habilitada."
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:779
+#: lib/command.php:783
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
@@ -7064,20 +7165,20 @@ msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:808
+#: lib/command.php:812
 #, php-format
 msgid "Unsubscribed %s."
 msgstr "S'ha cancel·lat la subscripció de %s."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:826
+#: lib/command.php:830
 msgid "You are not subscribed to anyone."
 msgstr "No esteu subscrit a ningú."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:831
+#: lib/command.php:835
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Ja estàs subscrit a aquests usuaris:"
@@ -7085,14 +7186,14 @@ msgstr[1] "Ja estàs subscrit a aquests usuaris:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:853
+#: lib/command.php:857
 msgid "No one is subscribed to you."
 msgstr "Ningú no us ha subscrit."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:858
+#: lib/command.php:862
 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."
@@ -7100,21 +7201,21 @@ msgstr[1] "No pots subscriure a un altre a tu mateix."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:880
+#: lib/command.php:884
 msgid "You are not a member of any groups."
 msgstr "No sou membre de cap grup."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:885
+#: lib/command.php:889
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Sou un membre d'aquest grup:"
 msgstr[1] "Sou un membre d'aquests grups:"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:900
+#: lib/command.php:904
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -7346,7 +7447,8 @@ msgstr ""
 "1-64 lletres en minúscula o números, sense signes de puntuació o espais"
 
 #: lib/groupeditform.php:163
-msgid "URL of the homepage or blog of the group or topic"
+#, fuzzy
+msgid "URL of the homepage or blog of the group or topic."
 msgstr "URL del teu web, blog del grup o de la temàtica"
 
 #: lib/groupeditform.php:168
@@ -7354,20 +7456,31 @@ msgid "Describe the group or topic"
 msgstr "Descriviu el grup o la temàtica"
 
 #: lib/groupeditform.php:170
-#, php-format
-msgid "Describe the group or topic in %d characters"
-msgstr "Descriviu el grup o la temàtica en %d caràcters"
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d character or less"
+msgid_plural "Describe the group or topic in %d characters or less"
+msgstr[0] "Descriviu el grup o la temàtica en %d caràcters"
+msgstr[1] "Descriviu el grup o la temàtica en %d caràcters"
 
-#: lib/groupeditform.php:179
+#: lib/groupeditform.php:182
+#, fuzzy
 msgid ""
-"Location for the group, if any, like \"City, State (or Region), Country\""
+"Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr ""
 "Ubicació del grup, si s'hi adiu cap, com ara «ciutat, comarca (o illa), país»"
 
-#: lib/groupeditform.php:187
-#, php-format
-msgid "Extra nicknames for the group, comma- or space- separated, max %d"
-msgstr "Sobrenoms addicionals del grup, separats amb comes o espais, màx. %d"
+#: lib/groupeditform.php:190
+#, fuzzy, php-format
+msgid ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"alias allowed."
+msgid_plural ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"aliases allowed."
+msgstr[0] ""
+"Sobrenoms addicionals del grup, separats amb comes o espais, màx. %d"
+msgstr[1] ""
+"Sobrenoms addicionals del grup, separats amb comes o espais, màx. %d"
 
 #. TRANS: Menu item in the group navigation page.
 #: lib/groupnav.php:86
@@ -7922,7 +8035,7 @@ msgstr "Ho sentim, aquesta no és la vostra adreça electrònica d'entrada."
 msgid "Sorry, no incoming email allowed."
 msgstr "Ho sentim, no s'hi permet correu d'entrada."
 
-#: lib/mailhandler.php:228
+#: lib/mailhandler.php:229
 #, php-format
 msgid "Unsupported message type: %s"
 msgstr "Tipus de missatge no permès: %s"
@@ -8042,11 +8155,11 @@ msgstr "Adjunta un fitxer"
 
 #: lib/noticeform.php:213
 msgid "Share my location"
-msgstr "Comparteix la meva ubicació"
+msgstr "Comparteix la ubicació on estic"
 
 #: lib/noticeform.php:216
 msgid "Do not share my location"
-msgstr "No comparteixis la meva ubicació"
+msgstr "Amaga la ubicació on estic"
 
 #: lib/noticeform.php:217
 msgid ""
@@ -8273,16 +8386,17 @@ msgid "Sandbox this user"
 msgstr "Posa l'usuari a l'entorn de proves"
 
 #. TRANS: Fieldset legend for the search form.
-#: lib/searchaction.php:121
+#: lib/searchaction.php:120
 msgid "Search site"
 msgstr "Cerca al lloc"
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
-#: lib/searchaction.php:129
+#: lib/searchaction.php:128
 msgid "Keyword(s)"
 msgstr "Paraules clau"
 
+#. TRANS: Button text for searching site.
 #: lib/searchaction.php:130
 msgctxt "BUTTON"
 msgid "Search"
@@ -8372,8 +8486,8 @@ msgid "The theme file is missing or the upload failed."
 msgstr "Manca el fitxer del tema o la pujada ha fallat."
 
 #: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:278 lib/themeuploader.php:282
-#: lib/themeuploader.php:290 lib/themeuploader.php:297
+#: lib/themeuploader.php:279 lib/themeuploader.php:283
+#: lib/themeuploader.php:291 lib/themeuploader.php:298
 msgid "Failed saving theme."
 msgstr "Ha fallat el desament del tema."
 
@@ -8382,16 +8496,20 @@ msgid "Invalid theme: bad directory structure."
 msgstr "El tema no és vàlid: l'estructura del directori no és correcta"
 
 #: lib/themeuploader.php:166
-#, php-format
-msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
-msgstr ""
+#, fuzzy, php-format
+msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
+msgid_plural ""
+"Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr[0] ""
+"El tema pujat és massa gran; ha de tenir menys de %d bytes descomprimit."
+msgstr[1] ""
 "El tema pujat és massa gran; ha de tenir menys de %d bytes descomprimit."
 
-#: lib/themeuploader.php:178
+#: lib/themeuploader.php:179
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr "L'arxiu del tema no és vàlid: manca el fitxer css/display.css"
 
-#: lib/themeuploader.php:218
+#: lib/themeuploader.php:219
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
@@ -8399,16 +8517,16 @@ msgstr ""
 "El tema conté un fitxer o un nom de carpeta que no és vàlida. Feu servir "
 "només lletres ASCII, dígits, caràcters de subratllat i el símbol de menys."
 
-#: lib/themeuploader.php:224
+#: lib/themeuploader.php:225
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr "El tema conté uns noms d'extensió de fitxer que no són segurs."
 
-#: lib/themeuploader.php:241
+#: lib/themeuploader.php:242
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr "El tema conté un tipus de fitxer «.%s», que no està permès."
 
-#: lib/themeuploader.php:259
+#: lib/themeuploader.php:260
 msgid "Error opening theme archive."
 msgstr "S'ha produït un error en obrir l'arxiu del tema."
 
@@ -8591,22 +8709,42 @@ msgstr[0] ""
 msgstr[1] ""
 "El missatge és massa llarg - el màxim és %1$d caràcters, i n'heu enviat %2$d."
 
-#: scripts/restoreuser.php:82
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: scripts/restoreuser.php:61
 #, php-format
-msgid "Backup file for user %s (%s)"
-msgstr "Fitxer de còpia de seguretat de l'usuari %s (%s)"
+msgid "Getting backup from file '%s'."
+msgstr ""
 
-#: scripts/restoreuser.php:88
+#. TRANS: Commandline script output.
+#: scripts/restoreuser.php:91
 msgid "No user specified; using backup user."
 msgstr "No s'ha especificat cap usuari; s'utilitza l'usuari de reserva."
 
-#: scripts/restoreuser.php:94
-#, php-format
-msgid "%d entries in backup."
-msgstr "%d entrades a la còpia de seguretat."
+#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
+#: scripts/restoreuser.php:98
+#, fuzzy, php-format
+msgid "%d entry in backup."
+msgid_plural "%d entries in backup."
+msgstr[0] "%d entrades a la còpia de seguretat."
+msgstr[1] "%d entrades a la còpia de seguretat."
+
+#, fuzzy
+#~ msgid "Name is too long (maximum 255 chars)."
+#~ msgstr "El nom és massa llarg (màx. 255 caràcters)."
+
+#, fuzzy
+#~ msgid "Organization is too long (maximum 255 chars)."
+#~ msgstr "El camp organització és massa llarg (màx. 255 caràcters)."
+
+#~ msgid "That's too long. Max notice size is %d chars."
+#~ msgstr "Massa llarg. La longitud màxima és de %d caràcters."
+
+#~ msgid "Max notice size is %d chars, including attachment URL."
+#~ msgstr ""
+#~ "La mida màxima de l'avís és %d caràcters, incloent l'URL de l'adjunt."
 
-#~ msgid "Description is too long (max %d chars)."
-#~ msgstr "La descripció és massa llarga (màx. %d caràcters)."
+#~ msgid " tagged %s"
+#~ msgstr " etiquetats amb %s"
 
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "Hi ha massa àlies! Màxim %d."
+#~ msgid "Backup file for user %s (%s)"
+#~ msgstr "Fitxer de còpia de seguretat de l'usuari %s (%s)"
diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po
index ef73741d2..c99c634a6 100644
--- a/locale/cs/LC_MESSAGES/statusnet.po
+++ b/locale/cs/LC_MESSAGES/statusnet.po
@@ -11,18 +11,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-30 23:18+0000\n"
-"PO-Revision-Date: 2010-10-30 23:19:58+0000\n"
+"POT-Creation-Date: 2010-11-02 22:51+0000\n"
+"PO-Revision-Date: 2010-11-02 22:53:09+0000\n"
 "Language-Team: Czech <http://translatewiki.net/wiki/Portal:cs>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r75708); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r75875); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: cs\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ( (n >= 2 && n <= 4) ? 1 : "
 "2 );\n"
-"X-POT-Import-Date: 2010-10-30 09:48:40+0000\n"
+"X-POT-Import-Date: 2010-10-30 23:42:01+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -79,15 +79,20 @@ msgstr "uložit nastavení přístupu"
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
+#. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
+#. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #: actions/accessadminpanel.php:193 actions/emailsettings.php:228
-#: actions/imsettings.php:187 actions/pathsadminpanel.php:512
-#: actions/profilesettings.php:201 actions/smssettings.php:209
-#: actions/subscriptions.php:246 lib/applicationeditform.php:355
+#: actions/imsettings.php:187 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: lib/applicationeditform.php:355 lib/groupeditform.php:207
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Uložit"
@@ -138,7 +143,7 @@ msgstr "Tady žádná taková stránka není."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:495 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Uživatel neexistuje."
@@ -211,7 +216,9 @@ msgstr ""
 
 #. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:208
+#. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -568,8 +575,11 @@ msgstr "Celé jméno je moc dlouhé (maximální délka je 255 znaků)."
 #. TRANS: Group edit form validation error.
 #. TRANS: Form validation error in New application form.
 #. TRANS: %d is the maximum number of characters for the description.
+#. TRANS: Group create form validation error.
+#. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:220 actions/editapplication.php:201
 #: actions/editgroup.php:216 actions/newapplication.php:178
+#: actions/newgroup.php:152
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -731,14 +741,14 @@ msgstr "Nejste autorizován."
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:172 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:74
 #: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
 #: actions/groupunblock.php:65 actions/imsettings.php:230
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
-#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/othersettings.php:153 actions/passwordsettings.php:138
 #: actions/profilesettings.php:221 actions/recoverpassword.php:350
 #: actions/register.php:172 actions/remotesubscribe.php:77
 #: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
@@ -918,20 +928,21 @@ msgstr "Nesmíte odstraňovat status jiného uživatele."
 
 #. TRANS: Client error displayed trying to repeat a non-existing notice through the API.
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
+#. TRANS: Error message displayed trying to delete a non-existing notice.
 #: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/deletenotice.php:58 actions/shownotice.php:92
+#: actions/deletenotice.php:61 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "Žádné takové oznámení."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:535
+#: actions/apistatusesretweet.php:83 lib/command.php:537
 msgid "Cannot repeat your own notice."
 msgstr "Nelze opakovat své vlastní oznámení."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:541
+#: actions/apistatusesretweet.php:92 lib/command.php:543
 msgid "Already repeated that notice."
 msgstr "Již jste zopakoval toto oznámení."
 
@@ -952,7 +963,8 @@ msgstr "Klient musí poskytnout 'status' parametr s hodnotou."
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#: actions/apistatusesupdate.php:244
+#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
+#: lib/mailhandler.php:60
 #, fuzzy, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
@@ -968,7 +980,7 @@ msgstr " API metoda nebyla nalezena."
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
-#: actions/apistatusesupdate.php:308
+#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
 #, fuzzy, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
@@ -1180,17 +1192,18 @@ msgstr "Vyberte čtvercovou plochu obrázku, která bude váš avatar"
 msgid "Lost our file data."
 msgstr "Ztratili jsme údaje souboru."
 
-#: actions/avatarsettings.php:384
+#. TRANS: Success message for having updated a user avatar.
+#: actions/avatarsettings.php:385
 msgid "Avatar updated."
 msgstr "Obrázek nahrán"
 
 #. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
-#: actions/avatarsettings.php:388
+#: actions/avatarsettings.php:389
 msgid "Failed updating avatar."
 msgstr "Nahrávání obrázku selhalo."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:412
+#: actions/avatarsettings.php:413
 msgid "Avatar deleted."
 msgstr "Avatar smazán."
 
@@ -1222,8 +1235,8 @@ msgstr ""
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:154 actions/deleteapplication.php:154
-#: actions/deletegroup.php:220 actions/deletenotice.php:150
+#: actions/block.php:154 actions/deleteapplication.php:157
+#: actions/deletegroup.php:220 actions/deletenotice.php:155
 #: actions/deleteuser.php:152 actions/groupblock.php:178
 msgctxt "BUTTON"
 msgid "No"
@@ -1241,8 +1254,8 @@ msgstr "Zablokovat tohoto uživatele"
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:161 actions/deleteapplication.php:161
-#: actions/deletegroup.php:227 actions/deletenotice.php:157
+#: actions/block.php:161 actions/deleteapplication.php:164
+#: actions/deletegroup.php:227 actions/deletenotice.php:162
 #: actions/deleteuser.php:159 actions/groupblock.php:185
 msgctxt "BUTTON"
 msgid "Yes"
@@ -1359,12 +1372,13 @@ msgstr "Adresa již byla potvrzena"
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
 #. TRANS: Server error thrown on database error updating IM preferences.
 #. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
 #. TRANS: Server error thrown when user profile settings could not be updated.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #: actions/confirmaddress.php:118 actions/emailsettings.php:331
 #: actions/emailsettings.php:477 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:174
+#: actions/imsettings.php:442 actions/othersettings.php:184
 #: actions/profilesettings.php:326 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
@@ -1400,16 +1414,19 @@ msgstr "Konverzace"
 msgid "Notices"
 msgstr "Sdělení"
 
-#: actions/deleteapplication.php:63
+#. TRANS: Client error displayed trying to delete an application while not logged in.
+#: actions/deleteapplication.php:62
 msgid "You must be logged in to delete an application."
 msgstr "Pro vymazání aplikace musíte být přihlášen."
 
+#. TRANS: Client error displayed trying to delete an application that does not exist.
 #: actions/deleteapplication.php:71
 msgid "Application not found."
 msgstr "Aplikace nebyla nalezena."
 
+#. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
-#: actions/deleteapplication.php:78 actions/editapplication.php:78
+#: actions/deleteapplication.php:79 actions/editapplication.php:78
 #: actions/showapplication.php:94
 msgid "You are not the owner of this application."
 msgstr "Nejste vlastníkem této aplikace."
@@ -1417,15 +1434,18 @@ msgstr "Nejste vlastníkem této aplikace."
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
 #: actions/newapplication.php:114 actions/showapplication.php:118
-#: lib/action.php:1354
+#: lib/action.php:1404
 msgid "There was a problem with your session token."
 msgstr "Nastal problém s vaším session tokenem."
 
-#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+#. TRANS: Title for delete application page.
+#. TRANS: Fieldset legend on delete application page.
+#: actions/deleteapplication.php:124 actions/deleteapplication.php:149
 msgid "Delete application"
 msgstr "Odstranit aplikaci"
 
-#: actions/deleteapplication.php:149
+#. TRANS: Confirmation text on delete application page.
+#: actions/deleteapplication.php:152
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
 "about the application from the database, including all existing user "
@@ -1435,12 +1455,12 @@ msgstr ""
 "aplikace z databáze, včetně všech existujících uživatelských spojení."
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:158
+#: actions/deleteapplication.php:161
 msgid "Do not delete this application"
 msgstr "Neodstraňujte tuto aplikaci"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:164
+#: actions/deleteapplication.php:167
 msgid "Delete this application"
 msgstr "Odstranit tuto aplikaci"
 
@@ -1476,13 +1496,14 @@ msgstr "Nelze aktualizovat skupinu."
 msgid "Deleted group %s"
 msgstr "%1$s opustil(a) skupinu %2$s"
 
-#. TRANS: Title.
+#. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
 #: actions/deletegroup.php:176 actions/deletegroup.php:202
 #, fuzzy
 msgid "Delete group"
 msgstr "Smazat uživatele"
 
+#. TRANS: Warning in form for deleleting a group.
 #: actions/deletegroup.php:206
 #, fuzzy
 msgid ""
@@ -1505,10 +1526,11 @@ msgstr "Neodstraňujte toto oznámení"
 msgid "Delete this group"
 msgstr "Odstranit tohoto uživatele"
 
+#. TRANS: Error message displayed trying to delete a notice while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1518,11 +1540,13 @@ msgstr "Odstranit tohoto uživatele"
 msgid "Not logged in."
 msgstr "Nejste přihlášen(a)."
 
-#: actions/deletenotice.php:74
+#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
+#: actions/deletenotice.php:78
 msgid "Can't delete this notice."
 msgstr "Toto oznámení nelze odstranit."
 
-#: actions/deletenotice.php:106
+#. TRANS: Instructions for deleting a notice.
+#: actions/deletenotice.php:110
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
@@ -1530,21 +1554,24 @@ msgstr ""
 "Chystáte se trvale odstranit oznámení. Jakmile se tak stane, nemůže se "
 "odestát."
 
-#: actions/deletenotice.php:112 actions/deletenotice.php:144
+#. TRANS: Page title when deleting a notice.
+#. TRANS: Fieldset legend for the delete notice form.
+#: actions/deletenotice.php:117 actions/deletenotice.php:148
 msgid "Delete notice"
 msgstr "Odstranit oznámení"
 
-#: actions/deletenotice.php:147
+#. TRANS: Message for the delete notice form.
+#: actions/deletenotice.php:152
 msgid "Are you sure you want to delete this notice?"
 msgstr "Jste si jisti, že chcete smazat tohoto oznámení?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:154
+#: actions/deletenotice.php:159
 msgid "Do not delete this notice"
 msgstr "Neodstraňujte toto oznámení"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:161 lib/noticelist.php:667
+#: actions/deletenotice.php:166 lib/noticelist.php:667
 msgid "Delete this notice"
 msgstr "Odstranit toto oznámení"
 
@@ -1707,11 +1734,9 @@ msgstr "Reset zpět do výchozího"
 
 #. TRANS: Submit button title.
 #: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
-#: actions/othersettings.php:126 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: actions/useradminpanel.php:295 lib/applicationeditform.php:357
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: lib/applicationeditform.php:357 lib/designsettings.php:256
 msgid "Save"
 msgstr "Uložit"
 
@@ -1759,9 +1784,9 @@ msgid "Name is required."
 msgstr "Název je povinný."
 
 #. TRANS: Validation error shown when providing too long a name in the "Edit application" form.
-#: actions/editapplication.php:188
+#: actions/editapplication.php:188 actions/newapplication.php:169
 #, fuzzy
-msgid "Name is too long (max 255 characters)."
+msgid "Name is too long (maximum 255 characters)."
 msgstr "Jméno je moc dlouhé (maximální délka je 255 znaků)."
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
@@ -1790,7 +1815,7 @@ msgid "Organization is required."
 msgstr "Organizace je nutná."
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#: actions/editapplication.php:223
+#: actions/editapplication.php:223 actions/newapplication.php:199
 #, fuzzy
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "Organizace je příliš dlouhá (max 255 znaků)."
@@ -2586,7 +2611,7 @@ msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Publikovat MicroID pro mou Jabber / GTalk adresu."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:180
+#: actions/imsettings.php:290 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "Nastavení uloženo"
 
@@ -2710,10 +2735,9 @@ msgstr[2] "Jste již přihlášeni k těmto uživatelům:"
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#. TRANS: Whois output.
-#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:145 actions/invite.php:159 lib/command.php:426
-#, php-format
+#: actions/invite.php:145 actions/invite.php:159
+#, fuzzy, php-format
+msgctxt "INVITE"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
@@ -2897,8 +2921,9 @@ msgid ""
 msgstr ""
 
 #: actions/licenseadminpanel.php:156
-msgid "Invalid license title. Max length is 255 characters."
-msgstr ""
+#, fuzzy
+msgid "Invalid license title. Maximum length is 255 characters."
+msgstr "Neplatné uvítací text. Max délka je 255 znaků."
 
 #: actions/licenseadminpanel.php:168
 msgid "Invalid license URL."
@@ -3071,20 +3096,10 @@ msgstr "Musíte být přihlášen k registraci aplikace."
 msgid "Use this form to register a new application."
 msgstr "Použijte tento formulář pro registraci nové aplikace."
 
-#: actions/newapplication.php:169
-#, fuzzy
-msgid "Name is too long (maximum 255 chars)."
-msgstr "Jméno je moc dlouhé (maximální délka je 255 znaků)."
-
 #: actions/newapplication.php:184
 msgid "Source URL is required."
 msgstr "Zdrojové URL je nutné."
 
-#: actions/newapplication.php:199
-#, fuzzy
-msgid "Organization is too long (maximum 255 chars)."
-msgstr "Organizace je příliš dlouhá (max 255 znaků)."
-
 #: actions/newapplication.php:266 actions/newapplication.php:275
 msgid "Could not create application."
 msgstr "Nelze vytvořit aplikaci."
@@ -3104,7 +3119,7 @@ msgid "New message"
 msgstr "Nová zpráva"
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:499
+#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501
 msgid "You can't send a message to this user."
 msgstr ""
 "Nemůžete odesílat zprávy tomuto uživateli. (musíte být vzájemně prihlášení)"
@@ -3112,7 +3127,7 @@ msgstr ""
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
 #: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
-#: lib/command.php:579
+#: lib/command.php:581
 msgid "No content!"
 msgstr "Chybí obsah!"
 
@@ -3121,7 +3136,7 @@ msgid "No recipient specified."
 msgstr "Neuveden příjemce."
 
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:503
+#: actions/newmessage.php:167 lib/command.php:505
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "Neposílejte si zprávu, potichu si ji pro sebe řekněte."
@@ -3132,12 +3147,12 @@ msgstr "Zpráva odeslána"
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:511
+#: actions/newmessage.php:188 lib/command.php:513
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Přímá zpráva pro %s odeslána."
 
-#: actions/newmessage.php:213 actions/newnotice.php:263
+#: actions/newmessage.php:213 actions/newnotice.php:264
 msgid "Ajax Error"
 msgstr "Ajax Chyba"
 
@@ -3145,17 +3160,7 @@ msgstr "Ajax Chyba"
 msgid "New notice"
 msgstr "Nové sdělení"
 
-#: actions/newnotice.php:159 lib/mailhandler.php:60
-#, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr "Je to příliš dlouhé. Maximální délka sdělení je %d znaků"
-
-#: actions/newnotice.php:183
-#, php-format
-msgid "Max notice size is %d chars, including attachment URL."
-msgstr "Maximální délka notice je %d znaků včetně přiložené URL."
-
-#: actions/newnotice.php:229
+#: actions/newnotice.php:230
 msgid "Notice posted"
 msgstr "Sdělení posláno"
 
@@ -3324,36 +3329,46 @@ msgstr "Hledání lidí"
 msgid "Notice Search"
 msgstr "Hledání oznámení"
 
-#: actions/othersettings.php:60
+#: actions/othersettings.php:59
 msgid "Other settings"
 msgstr "Další nastavení"
 
+#. TRANS: Instructions for tab "Other" in user profile settings.
 #: actions/othersettings.php:71
 msgid "Manage various other options."
 msgstr "Správa různých dalších možností."
 
-#: actions/othersettings.php:108
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/othersettings.php:111
 msgid " (free service)"
 msgstr " (Služba zdarma)"
 
-#: actions/othersettings.php:116
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/othersettings.php:120
 msgid "Shorten URLs with"
 msgstr "Zkrácovat URL s"
 
-#: actions/othersettings.php:117
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/othersettings.php:122
 msgid "Automatic shortening service to use."
 msgstr "Služba automatického zkracování, kterou použít."
 
-#: actions/othersettings.php:122
+#. TRANS: Label for checkbox.
+#: actions/othersettings.php:128
 msgid "View profile designs"
 msgstr "Zobrazit vzhledy profilu"
 
-#: actions/othersettings.php:123
+#. TRANS: Tooltip for checkbox.
+#: actions/othersettings.php:130
 msgid "Show or hide profile designs."
 msgstr "Zobrazit nebo skrýt vzhledy profilu."
 
-#: actions/othersettings.php:153
-msgid "URL shortening service is too long (max 50 chars)."
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/othersettings.php:162
+#, fuzzy
+msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "adresa služby zkracování URL je příliš dlouhá (max. 50 znaků)."
 
 #: actions/otp.php:69
@@ -3844,7 +3859,7 @@ msgstr "O mě"
 #. TRANS: Label for group location (dt). Text hidden by default.
 #: actions/profilesettings.php:149 actions/register.php:485
 #: actions/showgroup.php:267 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:177
+#: actions/userauthorization.php:166 lib/groupeditform.php:180
 #: lib/userprofile.php:165
 msgid "Location"
 msgstr "Umístění"
@@ -4181,7 +4196,8 @@ msgid "Unexpected password reset."
 msgstr "Nečekané resetování hesla."
 
 #: actions/recoverpassword.php:365
-msgid "Password must be 6 chars or more."
+#, fuzzy
+msgid "Password must be 6 characters or more."
 msgstr "Heslo musí být alespoň 6 znaků dlouhé"
 
 #: actions/recoverpassword.php:369
@@ -4554,7 +4570,7 @@ msgstr "Organizace"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:172
+#: lib/applicationeditform.php:208 lib/groupeditform.php:175
 msgid "Description"
 msgstr "Popis"
 
@@ -4705,7 +4721,7 @@ msgid "Note"
 msgstr "Poznámka"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:298 lib/groupeditform.php:184
+#: actions/showgroup.php:298 lib/groupeditform.php:187
 msgid "Aliases"
 msgstr "Aliasy"
 
@@ -4837,47 +4853,67 @@ msgstr "Zpráva od %1$s na %2$s"
 msgid "Notice deleted."
 msgstr "Oznámení smazáno."
 
-#: actions/showstream.php:72
-#, php-format
-msgid " tagged %s"
-msgstr "označen %s"
+#. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
+#: actions/showstream.php:70
+#, fuzzy, php-format
+msgid "%1$s tagged %2$s"
+msgstr "%1$s, strana %2$d"
+
+#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#: actions/showstream.php:74
+#, fuzzy, php-format
+msgid "%1$s tagged %2$s, page %3$d"
+msgstr "Oznámení označená %1$s, strana %2$d"
 
-#: actions/showstream.php:78
+#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$d is the page number.
+#: actions/showstream.php:82
 #, php-format
 msgid "%1$s, page %2$d"
 msgstr "%1$s, strana %2$d"
 
-#: actions/showstream.php:120
+#. TRANS: Title for link to notice feed.
+#. TRANS: %1$s is a user nickname, %2$s is a hashtag.
+#: actions/showstream.php:127
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Feed oznámení pro %1$s otagovaných %2$s (RSS 1.0)"
 
-#: actions/showstream.php:127
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:136
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "Feed oznámení pro %1$s (RSS 1.0)"
 
-#: actions/showstream.php:134
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:145
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "Feed oznámení pro %1$s (RSS 2.0)"
 
-#: actions/showstream.php:141
+#: actions/showstream.php:152
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "Feed oznámení pro %1$s (Atom)"
 
-#: actions/showstream.php:146
+#. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
+#. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
+#: actions/showstream.php:159
 #, php-format
 msgid "FOAF for %s"
 msgstr "FOAF pro %s"
 
-#: actions/showstream.php:197
-#, php-format
-msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
+#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
+#: actions/showstream.php:211
+#, fuzzy, php-format
+msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr "Toto je časová osa pro %1$s, ale %2$s zatím ničím nepřispěli."
 
-#: actions/showstream.php:202
+#. TRANS: Second sentence of empty list message for a stream for the user themselves.
+#: actions/showstream.php:217
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -4885,7 +4921,9 @@ msgstr ""
 "Viděli jste v poslední době zajímavého? Nemáte zatím žádné oznámení, teď by "
 "byl dobrý čas začít:)"
 
-#: actions/showstream.php:204
+#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:221
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -4894,7 +4932,9 @@ msgstr ""
 "Můžete se pokusit uživatele %1$s postrčit nebo [jim něco poslat](%%%%action."
 "newnotice%%%%?status_textarea=%2$s)."
 
-#: actions/showstream.php:243
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:264
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4907,7 +4947,9 @@ msgstr ""
 "(http://status.net/). [Zaregistrujte se](%%%%action.register%%%%) a sledujte "
 "oznámení od **%s**a mnoha dalších! ([Čtěte více](%%%%doc.help%%%%))"
 
-#: actions/showstream.php:248
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:271
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4918,7 +4960,8 @@ msgstr ""
 "napoveda-faq#mikroblog) službě založené na Free Software nástroji [StatusNet]"
 "(http://status.net/). "
 
-#: actions/showstream.php:305
+#. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
+#: actions/showstream.php:328
 #, php-format
 msgid "Repeat of %s"
 msgstr "Opakování %s"
@@ -5029,31 +5072,40 @@ msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 "Jak dlouho uživatel musí čekat (v sekundách) než může poslat totéž znovu."
 
-#: actions/sitenoticeadminpanel.php:56
+#. TRANS: Page title for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:55
 msgid "Site Notice"
 msgstr "Oznámení stránky"
 
-#: actions/sitenoticeadminpanel.php:67
+#. TRANS: Instructions for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:66
 msgid "Edit site-wide message"
 msgstr "Upravit celo-webovou zprávu"
 
-#: actions/sitenoticeadminpanel.php:103
+#. TRANS: Server error displayed when saving a site-wide notice was impossible.
+#: actions/sitenoticeadminpanel.php:101
 msgid "Unable to save site notice."
 msgstr "Problém při ukládání sdělení stránky"
 
-#: actions/sitenoticeadminpanel.php:113
-msgid "Max length for the site-wide notice is 255 chars."
+#. TRANS: Client error displayed when a site-wide notice was longer than allowed.
+#: actions/sitenoticeadminpanel.php:112
+#, fuzzy
+msgid "Maximum length for the site-wide notice is 255 characters."
 msgstr "Max délka pro celo-webové oznámení je 255 znaků."
 
+#. TRANS: Label for site-wide notice text field in admin panel.
 #: actions/sitenoticeadminpanel.php:176
 msgid "Site notice text"
 msgstr "Text sdělení stránky"
 
-#: actions/sitenoticeadminpanel.php:178
-msgid "Site-wide notice text (255 chars max; HTML okay)"
+#. TRANS: Tooltip for site-wide notice text field in admin panel.
+#: actions/sitenoticeadminpanel.php:179
+#, fuzzy
+msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr "Celo-webové sdělení (255 znaků max., s HTML)"
 
-#: actions/sitenoticeadminpanel.php:198
+#. TRANS: Title for button to save site notice in admin panel.
+#: actions/sitenoticeadminpanel.php:201
 msgid "Save site notice"
 msgstr "Uložit oznámení stránky"
 
@@ -5518,75 +5570,93 @@ msgstr ""
 "Licence naslouchaného '%1$s' není kompatibilní s licencí stránky '%2$s'."
 
 #. TRANS: User admin panel title
-#: actions/useradminpanel.php:60
+#: actions/useradminpanel.php:58
 msgctxt "TITLE"
 msgid "User"
 msgstr "Uživatel"
 
-#: actions/useradminpanel.php:71
+#. TRANS: Instruction for user admin panel.
+#: actions/useradminpanel.php:69
 msgid "User settings for this StatusNet site"
 msgstr ""
 
-#: actions/useradminpanel.php:150
+#. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
+#: actions/useradminpanel.php:147
 msgid "Invalid bio limit. Must be numeric."
 msgstr "Neplatný bio limit. Musí být číslo."
 
-#: actions/useradminpanel.php:156
-msgid "Invalid welcome text. Max length is 255 characters."
+#. TRANS: Form validation error in user admin panel when welcome text is too long.
+#: actions/useradminpanel.php:154
+#, fuzzy
+msgid "Invalid welcome text. Maximum length is 255 characters."
 msgstr "Neplatné uvítací text. Max délka je 255 znaků."
 
+#. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
+#. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
-#, php-format
-msgid "Invalid default subscripton: '%1$s' is not user."
+#, fuzzy, php-format
+msgid "Invalid default subscripton: '%1$s' is not a user."
 msgstr "Neplatné výchozí přihlášení: '%1$s' není uživatel."
 
 #. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:106
+#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
 #: lib/personalgroupnav.php:109
 msgid "Profile"
 msgstr "Profil"
 
-#: actions/useradminpanel.php:223
+#. TRANS: Field label in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:220
 msgid "Bio Limit"
 msgstr "Limit Bia"
 
-#: actions/useradminpanel.php:224
+#. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:222
 msgid "Maximum length of a profile bio in characters."
 msgstr "Maximální počet znaků bia profilu."
 
-#: actions/useradminpanel.php:232
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:231
 msgid "New users"
 msgstr "Noví uživatelé"
 
+#. TRANS: Field label in user admin panel for setting new user welcome text.
 #: actions/useradminpanel.php:236
 msgid "New user welcome"
 msgstr "Uvítání nového uživatele"
 
-#: actions/useradminpanel.php:237
-msgid "Welcome text for new users (Max 255 chars)."
+#. TRANS: Tooltip in user admin panel for setting new user welcome text.
+#: actions/useradminpanel.php:238
+#, fuzzy
+msgid "Welcome text for new users (maximum 255 characters)."
 msgstr "Uvítání nových uživatel (Max 255 znaků)."
 
-#: actions/useradminpanel.php:242
+#. TRANS: Field label in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:244
 msgid "Default subscription"
 msgstr "Výchozí odběr"
 
-#: actions/useradminpanel.php:243
+#. TRANS: Tooltip in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:246
 msgid "Automatically subscribe new users to this user."
 msgstr "Automaticky přihlásit nové uživatele k tomuto uživateli."
 
-#: actions/useradminpanel.php:252
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:256
 msgid "Invitations"
 msgstr "Pozvánky"
 
-#: actions/useradminpanel.php:257
+#. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:262
 msgid "Invitations enabled"
 msgstr "Pozvánky povoleny"
 
-#: actions/useradminpanel.php:259
+#. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:265
 msgid "Whether to allow users to invite new users."
 msgstr "Zda chcete uživatelům umožnit pozvat nové uživatele."
 
-#: actions/useradminpanel.php:295
+#. TRANS: Title for button to save user settings in user admin panel.
+#: actions/useradminpanel.php:302
 msgid "Save user settings"
 msgstr ""
 
@@ -5797,7 +5867,7 @@ msgid "Plugins"
 msgstr "Pluginy"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:831
+#: actions/version.php:198 lib/action.php:880
 msgid "Version"
 msgstr "Verze"
 
@@ -6006,16 +6076,23 @@ msgstr "Nelze uložit místní info skupiny."
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
+#. TRANS: Full name of a profile or group followed by nickname in parens
+#: classes/Profile.php:164
+#, fuzzy, php-format
+msgctxt "FANCYNAME"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:791
+#: classes/Profile.php:812
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr "Nelze zrušit roli \"%1$s\" pro uživatele #%2$d, neexistuje."
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:800
+#: classes/Profile.php:821
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr "Nelze zrušit roli \"%1$s\" pro uživatele #%2$d, chyba databáze."
@@ -6160,194 +6237,201 @@ msgstr "%1$s - %2$s"
 msgid "Untitled page"
 msgstr "stránka bez názvu"
 
+#. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
+#: lib/action.php:310
+msgctxt "TOOLTIP"
+msgid "Show more"
+msgstr ""
+
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:477
+#: lib/action.php:526
 msgid "Primary site navigation"
 msgstr "Primární navigace na webu"
 
 #. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:483
+#: lib/action.php:532
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "Osobní profil a časová osa přátel"
 
 #. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:486
+#: lib/action.php:535
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Osobní"
 
 #. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:488
+#: lib/action.php:537
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
 msgstr "Změňte svůj e-mail, avatar, heslo, profil"
 
 #. TRANS: Main menu option when logged in for access to user settings
-#: lib/action.php:491
+#: lib/action.php:540
 msgid "Account"
 msgstr "Účet"
 
 #. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:493
+#: lib/action.php:542
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "Připojení ke službám"
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:496
+#: lib/action.php:545
 msgid "Connect"
 msgstr "Připojit"
 
 #. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:499
+#: lib/action.php:548
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "Změna konfigurace webu"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:502 lib/groupnav.php:117
+#: lib/action.php:551 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Admin"
 
 #. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:506
+#: lib/action.php:555
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Pozvěte přátele a kolegy, aby se k vám připojili na %s"
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:509
+#: lib/action.php:558
 msgctxt "MENU"
 msgid "Invite"
 msgstr "Pozvat"
 
 #. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:515
+#: lib/action.php:564
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "Odhlášení z webu"
 
 #. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:518
+#: lib/action.php:567
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Odhlásit se"
 
 #. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:523
+#: lib/action.php:572
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "Zaregistrujte se"
 
 #. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:526
+#: lib/action.php:575
 msgctxt "MENU"
 msgid "Register"
 msgstr "Registrovat"
 
 #. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:529
+#: lib/action.php:578
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "Přihlásit se na stránky"
 
 #. TRANS: Main menu option when not logged in to log in
-#: lib/action.php:532
+#: lib/action.php:581
 msgctxt "MENU"
 msgid "Login"
 msgstr "Přihlásit"
 
 #. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:535
+#: lib/action.php:584
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Nápověda"
 
 #. TRANS: Main menu option for help on the StatusNet site
-#: lib/action.php:538
+#: lib/action.php:587
 msgctxt "MENU"
 msgid "Help"
 msgstr "Nápověda"
 
 #. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:541
+#: lib/action.php:590
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr "Vyhledávání osob nebo textu"
 
 #. TRANS: Main menu option when logged in or when the StatusNet instance is not private
-#: lib/action.php:544
+#: lib/action.php:593
 msgctxt "MENU"
 msgid "Search"
 msgstr "Hledat"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:566 lib/adminpanelaction.php:387
+#: lib/action.php:615 lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "Sdělení"
 
 #. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:633
+#: lib/action.php:682
 msgid "Local views"
 msgstr "Místní zobrazení"
 
 #. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:703
+#: lib/action.php:752
 msgid "Page notice"
 msgstr "Sdělení stránky"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:804
+#: lib/action.php:853
 msgid "Secondary site navigation"
 msgstr "Sekundární navigace na webu"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:810
+#: lib/action.php:859
 msgid "Help"
 msgstr "Nápověda"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:813
+#: lib/action.php:862
 msgid "About"
 msgstr "O nás"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:816
+#: lib/action.php:865
 msgid "FAQ"
 msgstr "FAQ"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:821
+#: lib/action.php:870
 msgid "TOS"
 msgstr "TOS (pravidla použití služby)"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:825
+#: lib/action.php:874
 msgid "Privacy"
 msgstr "Soukromí"
 
-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:828
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+#: lib/action.php:877
 msgid "Source"
 msgstr "Zdroj"
 
-#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:834
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+#: lib/action.php:884
 msgid "Contact"
 msgstr "Kontakt"
 
-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:837
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+#: lib/action.php:887
 msgid "Badge"
 msgstr "Odznak"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:866
+#: lib/action.php:916
 msgid "StatusNet software license"
 msgstr "Licence softwaru StatusNet"
 
@@ -6355,7 +6439,7 @@ msgstr "Licence softwaru StatusNet"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:873
+#: lib/action.php:923
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -6365,7 +6449,7 @@ msgstr ""
 "broughtby%%](%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:876
+#: lib/action.php:926
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** je služba mikroblogů."
@@ -6374,7 +6458,7 @@ msgstr "**%%site.name%%** je služba mikroblogů."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:883
+#: lib/action.php:933
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -6386,50 +6470,50 @@ msgstr ""
 "licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:899
+#: lib/action.php:949
 msgid "Site content license"
 msgstr "Licence k obsahu stránek"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:906
+#: lib/action.php:956
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "Obsah a data z %1$S jsou soukromé a důvěrné."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:913
+#: lib/action.php:963
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr "Obsah a data copyright %1$s. Všechna práva vyhrazena."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:917
+#: lib/action.php:967
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr "Obsah a data copyright přispěvatelů. Všechna práva vyhrazena."
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:949
+#: lib/action.php:999
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr "Všechen obsah a data %1$s jsou k dispozici v rámci licence %2$s."
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1285
+#: lib/action.php:1335
 msgid "Pagination"
 msgstr "Stránkování"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1296
+#: lib/action.php:1346
 msgid "After"
 msgstr "Po"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1306
+#: lib/action.php:1356
 msgid "Before"
 msgstr "Před"
 
@@ -6775,7 +6859,7 @@ msgid "AJAX error"
 msgstr "Ajax Chyba"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:233 lib/mailhandler.php:142
+#: lib/channel.php:233 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "Příkaz dokončen"
 
@@ -6791,7 +6875,7 @@ msgstr "Oznámení s tímto id neexistuje."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:626
+#: lib/command.php:99 lib/command.php:630
 msgid "User has no last notice."
 msgstr "Uživatel nemá žádné poslední oznámení"
 
@@ -6860,6 +6944,14 @@ msgstr "%1$s se připojil(a) ke skupině %2$s."
 msgid "%1$s left group %2$s."
 msgstr "%1$s opustil(a) skupinu %2$s."
 
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: lib/command.php:426
+#, fuzzy, php-format
+msgctxt "WHOIS"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
 #. TRANS: Whois output. %s is the full name of the queried user.
 #: lib/command.php:430
 #, php-format
@@ -6899,133 +6991,139 @@ msgstr ""
 "%s je vzdálený profil, přímé zprávy můžete odesílat pouze pro uživatele na "
 "stejném serveru."
 
-#. TRANS: Message given if content is too long.
+#. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
 #: lib/command.php:488
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr "Zpráva je příliš dlouhá - maximum je %1$d znaků, poslal jsi %2$d."
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] "Zpráva je příliš dlouhá - maximum je %1$d znaků, poslal jsi %2$d."
+msgstr[1] "Zpráva je příliš dlouhá - maximum je %1$d znaků, poslal jsi %2$d."
+msgstr[2] "Zpráva je příliš dlouhá - maximum je %1$d znaků, poslal jsi %2$d."
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:514
+#: lib/command.php:516
 msgid "Error sending direct message."
 msgstr "Chyba při odesílání přímé zprávy."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:551
+#: lib/command.php:553
 #, php-format
 msgid "Notice from %s repeated."
 msgstr "Oznámení od %s opakováno."
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:554
+#: lib/command.php:556
 msgid "Error repeating notice."
 msgstr "Chyba nastavení uživatele"
 
-#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:589
-#, php-format
-msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
-msgstr "Oznámení je příliš dlouhé - maximum je %1$d znaků, poslal jsi %2$d."
+#: lib/command.php:591
+#, fuzzy, php-format
+msgid "Notice too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] "Oznámení je příliš dlouhé - maximum je %1$d znaků, poslal jsi %2$d."
+msgstr[1] "Oznámení je příliš dlouhé - maximum je %1$d znaků, poslal jsi %2$d."
+msgstr[2] "Oznámení je příliš dlouhé - maximum je %1$d znaků, poslal jsi %2$d."
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:600
+#: lib/command.php:604
 #, php-format
 msgid "Reply to %s sent."
 msgstr "Odpověď %s odeslána."
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:603
+#: lib/command.php:607
 msgid "Error saving notice."
 msgstr "Problém při ukládání sdělení."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:650
+#: lib/command.php:654
 msgid "Specify the name of the user to subscribe to."
 msgstr "Uveďte jméno uživatele ke kterému se přihlásit."
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:659
+#: lib/command.php:663
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Nelze se přihlásit k odběru OMB profilů příkazem."
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:667
+#: lib/command.php:671
 #, php-format
 msgid "Subscribed to %s."
 msgstr "Přihlášeno k %s."
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:688 lib/command.php:799
+#: lib/command.php:692 lib/command.php:803
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "Uveďte jméno uživatele od kterého se odhlásit."
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:699
+#: lib/command.php:703
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr "Odhlášeno od %s."
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:719 lib/command.php:745
+#: lib/command.php:723 lib/command.php:749
 msgid "Command not yet implemented."
 msgstr "Příkaz ještě nebyl implementován."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:723
+#: lib/command.php:727
 msgid "Notification off."
 msgstr "Oznámení vypnuta."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:726
+#: lib/command.php:730
 msgid "Can't turn off notification."
 msgstr "Nelze vypnout oznámení."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:749
+#: lib/command.php:753
 msgid "Notification on."
 msgstr "Oznámení zapnuta."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:752
+#: lib/command.php:756
 msgid "Can't turn on notification."
 msgstr "Nelze zapnout oznámení."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:766
+#: lib/command.php:770
 msgid "Login command is disabled."
 msgstr "Příkaz login je vypnut."
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:779
+#: lib/command.php:783
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr "Tento odkaz je použitelný pouze jednou a je platný pouze 2 minuty: %s."
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:808
+#: lib/command.php:812
 #, php-format
 msgid "Unsubscribed %s."
 msgstr "%s odhlášen."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:826
+#: lib/command.php:830
 msgid "You are not subscribed to anyone."
 msgstr "Nejste přihlášen k nikomu."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:831
+#: lib/command.php:835
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Jste přihlášeni k této osobě:"
@@ -7034,14 +7132,14 @@ msgstr[2] "Jste přihlášeni k těmto lidem:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:853
+#: lib/command.php:857
 msgid "No one is subscribed to you."
 msgstr "Nikdo k vám není přihlášen."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:858
+#: lib/command.php:862
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Tato osoba je k vám přihlášena:"
@@ -7050,14 +7148,14 @@ msgstr[2] "Tito lidé jsou k vám přihlášeni:"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:880
+#: lib/command.php:884
 msgid "You are not a member of any groups."
 msgstr "Nejste členem žádné skupiny."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:885
+#: lib/command.php:889
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Jste členem této skupiny:"
@@ -7065,7 +7163,7 @@ msgstr[1] "Jste členem těchto skupin:"
 msgstr[2] ""
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:900
+#: lib/command.php:904
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -7296,7 +7394,8 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 znaků nebo čísel, bez teček, čárek a mezer"
 
 #: lib/groupeditform.php:163
-msgid "URL of the homepage or blog of the group or topic"
+#, fuzzy
+msgid "URL of the homepage or blog of the group or topic."
 msgstr "URL domovské stránky nebo blogu skupiny nebo tématu"
 
 #: lib/groupeditform.php:168
@@ -7304,21 +7403,32 @@ msgid "Describe the group or topic"
 msgstr "Popište skupinu nebo téma"
 
 #: lib/groupeditform.php:170
-#, php-format
-msgid "Describe the group or topic in %d characters"
-msgstr "Popište skupinu nebo téma ve %d znacích"
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d character or less"
+msgid_plural "Describe the group or topic in %d characters or less"
+msgstr[0] "Popište skupinu nebo téma ve %d znacích"
+msgstr[1] "Popište skupinu nebo téma ve %d znacích"
+msgstr[2] "Popište skupinu nebo téma ve %d znacích"
 
-#: lib/groupeditform.php:179
+#: lib/groupeditform.php:182
+#, fuzzy
 msgid ""
-"Location for the group, if any, like \"City, State (or Region), Country\""
+"Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr ""
 "Umístění skupiny, pokud je nějaké, ve stylu \"město, stát (nebo region), země"
 "\""
 
-#: lib/groupeditform.php:187
-#, php-format
-msgid "Extra nicknames for the group, comma- or space- separated, max %d"
-msgstr "Další přezdívky pro skupinu, oddělené čárkou nebo mezerou, max %d"
+#: lib/groupeditform.php:190
+#, fuzzy, php-format
+msgid ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"alias allowed."
+msgid_plural ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"aliases allowed."
+msgstr[0] "Další přezdívky pro skupinu, oddělené čárkou nebo mezerou, max %d"
+msgstr[1] "Další přezdívky pro skupinu, oddělené čárkou nebo mezerou, max %d"
+msgstr[2] "Další přezdívky pro skupinu, oddělené čárkou nebo mezerou, max %d"
 
 #. TRANS: Menu item in the group navigation page.
 #: lib/groupnav.php:86
@@ -7877,7 +7987,7 @@ msgstr "Je nám líto, toto není vaše příchozí e-mailová adresa."
 msgid "Sorry, no incoming email allowed."
 msgstr "Je nám líto, žádný příchozí e-mail není dovolen."
 
-#: lib/mailhandler.php:228
+#: lib/mailhandler.php:229
 #, php-format
 msgid "Unsupported message type: %s"
 msgstr "Nepodporovaný typ zprávy: %s"
@@ -8223,16 +8333,17 @@ msgid "Sandbox this user"
 msgstr "Sandboxovat tohoto uživatele"
 
 #. TRANS: Fieldset legend for the search form.
-#: lib/searchaction.php:121
+#: lib/searchaction.php:120
 msgid "Search site"
 msgstr "Prohledat stránky"
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
-#: lib/searchaction.php:129
+#: lib/searchaction.php:128
 msgid "Keyword(s)"
 msgstr "Klíčová slova"
 
+#. TRANS: Button text for searching site.
 #: lib/searchaction.php:130
 msgctxt "BUTTON"
 msgid "Search"
@@ -8322,8 +8433,8 @@ msgid "The theme file is missing or the upload failed."
 msgstr "Chybí soubor tématu nebo se nepodařilo nahrání."
 
 #: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:278 lib/themeuploader.php:282
-#: lib/themeuploader.php:290 lib/themeuploader.php:297
+#: lib/themeuploader.php:279 lib/themeuploader.php:283
+#: lib/themeuploader.php:291 lib/themeuploader.php:298
 msgid "Failed saving theme."
 msgstr "Chyba při ukládání tématu."
 
@@ -8332,16 +8443,22 @@ msgid "Invalid theme: bad directory structure."
 msgstr "Neplatné téma: špatná adresářová struktura."
 
 #: lib/themeuploader.php:166
-#, php-format
-msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
-msgstr ""
+#, fuzzy, php-format
+msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
+msgid_plural ""
+"Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr[0] ""
+"Nahrané téma je příliš velké, nezkomprimované musí být menší než %d bajtů."
+msgstr[1] ""
+"Nahrané téma je příliš velké, nezkomprimované musí být menší než %d bajtů."
+msgstr[2] ""
 "Nahrané téma je příliš velké, nezkomprimované musí být menší než %d bajtů."
 
-#: lib/themeuploader.php:178
+#: lib/themeuploader.php:179
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr "Neplatný archiv tématu: chybí soubor css/display.css"
 
-#: lib/themeuploader.php:218
+#: lib/themeuploader.php:219
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
@@ -8349,16 +8466,16 @@ msgstr ""
 "Téma obsahuje neplatné jméno souboru nebo složky. Zůstaňte u písmen ASCII, "
 "číslic, podtržítka a mínusu."
 
-#: lib/themeuploader.php:224
+#: lib/themeuploader.php:225
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr "Téma obsahuje nebezpečné přípony souborů, může být nebezpečné."
 
-#: lib/themeuploader.php:241
+#: lib/themeuploader.php:242
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr "Téma obsahuje soubor typu '.%s', což není povoleno."
 
-#: lib/themeuploader.php:259
+#: lib/themeuploader.php:260
 msgid "Error opening theme archive."
 msgstr "Chyba při otevírání archivu tématu."
 
@@ -8544,23 +8661,40 @@ msgstr[0] "Zpráva je příliš dlouhá - maximum je %1$d znaků, poslal jsi %2$
 msgstr[1] "Zpráva je příliš dlouhá - maximum je %1$d znaků, poslal jsi %2$d."
 msgstr[2] "Zpráva je příliš dlouhá - maximum je %1$d znaků, poslal jsi %2$d."
 
-#: scripts/restoreuser.php:82
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: scripts/restoreuser.php:61
 #, php-format
-msgid "Backup file for user %s (%s)"
+msgid "Getting backup from file '%s'."
 msgstr ""
 
-#: scripts/restoreuser.php:88
+#. TRANS: Commandline script output.
+#: scripts/restoreuser.php:91
 #, fuzzy
 msgid "No user specified; using backup user."
 msgstr "Nebylo zadáno uživatelské ID."
 
-#: scripts/restoreuser.php:94
+#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
+#: scripts/restoreuser.php:98
 #, php-format
-msgid "%d entries in backup."
-msgstr ""
+msgid "%d entry in backup."
+msgid_plural "%d entries in backup."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#, fuzzy
+#~ msgid "Name is too long (maximum 255 chars)."
+#~ msgstr "Jméno je moc dlouhé (maximální délka je 255 znaků)."
+
+#, fuzzy
+#~ msgid "Organization is too long (maximum 255 chars)."
+#~ msgstr "Organizace je příliš dlouhá (max 255 znaků)."
+
+#~ msgid "That's too long. Max notice size is %d chars."
+#~ msgstr "Je to příliš dlouhé. Maximální délka sdělení je %d znaků"
 
-#~ msgid "Description is too long (max %d chars)."
-#~ msgstr "Popis je příliš dlouhý (maximálně %d znaků)."
+#~ msgid "Max notice size is %d chars, including attachment URL."
+#~ msgstr "Maximální délka notice je %d znaků včetně přiložené URL."
 
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "Příliš mnoho aliasů! Maximálně %d."
+#~ msgid " tagged %s"
+#~ msgstr "označen %s"
diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po
index 2439f1826..27edfc559 100644
--- a/locale/de/LC_MESSAGES/statusnet.po
+++ b/locale/de/LC_MESSAGES/statusnet.po
@@ -19,17 +19,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-30 23:18+0000\n"
-"PO-Revision-Date: 2010-10-30 23:20:00+0000\n"
+"POT-Creation-Date: 2010-11-02 22:51+0000\n"
+"PO-Revision-Date: 2010-11-02 22:53:10+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r75708); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r75875); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2010-10-30 09:48:40+0000\n"
+"X-POT-Import-Date: 2010-10-30 23:42:01+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -87,15 +87,20 @@ msgstr "Zugangs-Einstellungen speichern"
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
+#. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
+#. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #: actions/accessadminpanel.php:193 actions/emailsettings.php:228
-#: actions/imsettings.php:187 actions/pathsadminpanel.php:512
-#: actions/profilesettings.php:201 actions/smssettings.php:209
-#: actions/subscriptions.php:246 lib/applicationeditform.php:355
+#: actions/imsettings.php:187 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: lib/applicationeditform.php:355 lib/groupeditform.php:207
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Speichern"
@@ -146,7 +151,7 @@ msgstr "Seite nicht vorhanden"
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:495 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Unbekannter Benutzer."
@@ -219,7 +224,9 @@ msgstr ""
 
 #. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:208
+#. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -580,8 +587,11 @@ msgstr "Der bürgerliche Name ist zu lang (maximal 255 Zeichen)."
 #. TRANS: Group edit form validation error.
 #. TRANS: Form validation error in New application form.
 #. TRANS: %d is the maximum number of characters for the description.
+#. TRANS: Group create form validation error.
+#. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:220 actions/editapplication.php:201
 #: actions/editgroup.php:216 actions/newapplication.php:178
+#: actions/newgroup.php:152
 #, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -738,14 +748,14 @@ msgstr "Du bist nicht autorisiert."
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:172 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:74
 #: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
 #: actions/groupunblock.php:65 actions/imsettings.php:230
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
-#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/othersettings.php:153 actions/passwordsettings.php:138
 #: actions/profilesettings.php:221 actions/recoverpassword.php:350
 #: actions/register.php:172 actions/remotesubscribe.php:77
 #: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
@@ -926,20 +936,21 @@ msgstr "Du kannst den Status eines anderen Benutzers nicht löschen."
 
 #. TRANS: Client error displayed trying to repeat a non-existing notice through the API.
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
+#. TRANS: Error message displayed trying to delete a non-existing notice.
 #: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/deletenotice.php:58 actions/shownotice.php:92
+#: actions/deletenotice.php:61 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "Unbekannte Nachricht."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:535
+#: actions/apistatusesretweet.php:83 lib/command.php:537
 msgid "Cannot repeat your own notice."
 msgstr "Du kannst deine eigenen Nachrichten nicht wiederholen."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:541
+#: actions/apistatusesretweet.php:92 lib/command.php:543
 msgid "Already repeated that notice."
 msgstr "Nachricht bereits wiederholt"
 
@@ -962,7 +973,8 @@ msgstr ""
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#: actions/apistatusesupdate.php:244
+#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
+#: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
@@ -978,7 +990,7 @@ msgstr "API-Methode nicht gefunden."
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
-#: actions/apistatusesupdate.php:308
+#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
 #, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
@@ -1159,21 +1171,18 @@ msgstr "Vorschau"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
 #: actions/avatarsettings.php:155
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "Löschen"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
 #: actions/avatarsettings.php:173
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Hochladen"
 
 #. TRANS: Button on avatar upload crop form to confirm a selected crop as avatar.
 #: actions/avatarsettings.php:243
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Crop"
 msgstr "Zuschneiden"
@@ -1194,17 +1203,18 @@ msgstr ""
 msgid "Lost our file data."
 msgstr "Daten verloren."
 
-#: actions/avatarsettings.php:384
+#. TRANS: Success message for having updated a user avatar.
+#: actions/avatarsettings.php:385
 msgid "Avatar updated."
 msgstr "Avatar aktualisiert."
 
 #. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
-#: actions/avatarsettings.php:388
+#: actions/avatarsettings.php:389
 msgid "Failed updating avatar."
 msgstr "Aktualisierung des Avatars fehlgeschlagen."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:412
+#: actions/avatarsettings.php:413
 msgid "Avatar deleted."
 msgstr "Avatar gelöscht."
 
@@ -1236,8 +1246,8 @@ msgstr ""
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:154 actions/deleteapplication.php:154
-#: actions/deletegroup.php:220 actions/deletenotice.php:150
+#: actions/block.php:154 actions/deleteapplication.php:157
+#: actions/deletegroup.php:220 actions/deletenotice.php:155
 #: actions/deleteuser.php:152 actions/groupblock.php:178
 msgctxt "BUTTON"
 msgid "No"
@@ -1255,8 +1265,8 @@ msgstr "Diesen Benutzer freigeben"
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:161 actions/deleteapplication.php:161
-#: actions/deletegroup.php:227 actions/deletenotice.php:157
+#: actions/block.php:161 actions/deleteapplication.php:164
+#: actions/deletegroup.php:227 actions/deletenotice.php:162
 #: actions/deleteuser.php:159 actions/groupblock.php:185
 msgctxt "BUTTON"
 msgid "Yes"
@@ -1324,7 +1334,6 @@ msgstr "Blockierung des Benutzers für die Gruppe aufheben."
 
 #. TRANS: Button text for unblocking a user from a group.
 #: actions/blockedfromgroup.php:323
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Unblock"
 msgstr "Freigeben"
@@ -1373,12 +1382,13 @@ msgstr "Diese Adresse wurde bereits bestätigt."
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
 #. TRANS: Server error thrown on database error updating IM preferences.
 #. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
 #. TRANS: Server error thrown when user profile settings could not be updated.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #: actions/confirmaddress.php:118 actions/emailsettings.php:331
 #: actions/emailsettings.php:477 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:174
+#: actions/imsettings.php:442 actions/othersettings.php:184
 #: actions/profilesettings.php:326 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
@@ -1414,16 +1424,19 @@ msgstr "Unterhaltung"
 msgid "Notices"
 msgstr "Nachrichten"
 
-#: actions/deleteapplication.php:63
+#. TRANS: Client error displayed trying to delete an application while not logged in.
+#: actions/deleteapplication.php:62
 msgid "You must be logged in to delete an application."
 msgstr "Du musst angemeldet sein, um dieses Programm zu entfernen."
 
+#. TRANS: Client error displayed trying to delete an application that does not exist.
 #: actions/deleteapplication.php:71
 msgid "Application not found."
 msgstr "Programm nicht gefunden."
 
+#. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
-#: actions/deleteapplication.php:78 actions/editapplication.php:78
+#: actions/deleteapplication.php:79 actions/editapplication.php:78
 #: actions/showapplication.php:94
 msgid "You are not the owner of this application."
 msgstr "Du bist Besitzer dieses Programms"
@@ -1431,15 +1444,18 @@ msgstr "Du bist Besitzer dieses Programms"
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
 #: actions/newapplication.php:114 actions/showapplication.php:118
-#: lib/action.php:1354
+#: lib/action.php:1404
 msgid "There was a problem with your session token."
 msgstr "Es gab ein Problem mit deinem Sessiontoken."
 
-#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+#. TRANS: Title for delete application page.
+#. TRANS: Fieldset legend on delete application page.
+#: actions/deleteapplication.php:124 actions/deleteapplication.php:149
 msgid "Delete application"
 msgstr "Programm entfernen"
 
-#: actions/deleteapplication.php:149
+#. TRANS: Confirmation text on delete application page.
+#: actions/deleteapplication.php:152
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
 "about the application from the database, including all existing user "
@@ -1449,12 +1465,12 @@ msgstr ""
 "aus der Datenbank entfernt, auch alle bestehenden Benutzer-Verbindungen."
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:158
+#: actions/deleteapplication.php:161
 msgid "Do not delete this application"
 msgstr "Dieses Programm nicht löschen"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:164
+#: actions/deleteapplication.php:167
 msgid "Delete this application"
 msgstr "Programm löschen"
 
@@ -1488,12 +1504,13 @@ msgstr "Konnte %s-Gruppe nicht löschen."
 msgid "Deleted group %s"
 msgstr "%s-Gruppe gelöscht"
 
-#. TRANS: Title.
+#. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
 #: actions/deletegroup.php:176 actions/deletegroup.php:202
 msgid "Delete group"
 msgstr "Gruppe löschen"
 
+#. TRANS: Warning in form for deleleting a group.
 #: actions/deletegroup.php:206
 msgid ""
 "Are you sure you want to delete this group? This will clear all data about "
@@ -1514,10 +1531,11 @@ msgstr "Diese Gruppe nicht löschen"
 msgid "Delete this group"
 msgstr "Diese Gruppe löschen"
 
+#. TRANS: Error message displayed trying to delete a notice while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1527,11 +1545,13 @@ msgstr "Diese Gruppe löschen"
 msgid "Not logged in."
 msgstr "Nicht angemeldet."
 
-#: actions/deletenotice.php:74
+#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
+#: actions/deletenotice.php:78
 msgid "Can't delete this notice."
 msgstr "Die Nachricht konnte nicht gelöscht werden."
 
-#: actions/deletenotice.php:106
+#. TRANS: Instructions for deleting a notice.
+#: actions/deletenotice.php:110
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
@@ -1539,21 +1559,24 @@ msgstr ""
 "Du bist gerade dabei eine Nachricht unwiderruflich zu löschen. Diese Aktion "
 "ist irreversibel."
 
-#: actions/deletenotice.php:112 actions/deletenotice.php:144
+#. TRANS: Page title when deleting a notice.
+#. TRANS: Fieldset legend for the delete notice form.
+#: actions/deletenotice.php:117 actions/deletenotice.php:148
 msgid "Delete notice"
 msgstr "Notiz löschen"
 
-#: actions/deletenotice.php:147
+#. TRANS: Message for the delete notice form.
+#: actions/deletenotice.php:152
 msgid "Are you sure you want to delete this notice?"
 msgstr "Bist du sicher, dass du diese Nachricht löschen möchtest?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:154
+#: actions/deletenotice.php:159
 msgid "Do not delete this notice"
 msgstr "Diese Nachricht nicht löschen"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:161 lib/noticelist.php:667
+#: actions/deletenotice.php:166 lib/noticelist.php:667
 msgid "Delete this notice"
 msgstr "Nachricht löschen"
 
@@ -1715,11 +1738,9 @@ msgstr "Standard wiederherstellen"
 
 #. TRANS: Submit button title.
 #: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
-#: actions/othersettings.php:126 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: actions/useradminpanel.php:295 lib/applicationeditform.php:357
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: lib/applicationeditform.php:357 lib/designsettings.php:256
 msgid "Save"
 msgstr "Speichern"
 
@@ -1767,8 +1788,9 @@ msgid "Name is required."
 msgstr "Name ist erforderlich."
 
 #. TRANS: Validation error shown when providing too long a name in the "Edit application" form.
-#: actions/editapplication.php:188
-msgid "Name is too long (max 255 characters)."
+#: actions/editapplication.php:188 actions/newapplication.php:169
+#, fuzzy
+msgid "Name is too long (maximum 255 characters)."
 msgstr "Der Name ist zu lang (maximal 255 Zeichen)."
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
@@ -1798,7 +1820,7 @@ msgid "Organization is required."
 msgstr "Organisation ist erforderlich. (Pflichtangabe)"
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#: actions/editapplication.php:223
+#: actions/editapplication.php:223 actions/newapplication.php:199
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "Die angegebene Organisation ist zu lang (maximal 255 Zeichen)."
 
@@ -2602,7 +2624,7 @@ msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "MicroID für meine Jabber/GTalk-Adresse veröffentlichen."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:180
+#: actions/imsettings.php:290 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "Einstellungen gesichert."
 
@@ -2725,10 +2747,9 @@ msgstr[1] "Du hast diese Benutzer bereits abonniert:"
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#. TRANS: Whois output.
-#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:145 actions/invite.php:159 lib/command.php:426
-#, php-format
+#: actions/invite.php:145 actions/invite.php:159
+#, fuzzy, php-format
+msgctxt "INVITE"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
@@ -2917,7 +2938,8 @@ msgstr ""
 "wählst."
 
 #: actions/licenseadminpanel.php:156
-msgid "Invalid license title. Max length is 255 characters."
+#, fuzzy
+msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "Ungültiger Lizenztitel. Die maximale Länge liegt bei 255 Zeichen."
 
 #: actions/licenseadminpanel.php:168
@@ -3090,18 +3112,10 @@ msgstr "Du musst angemeldet sein, um ein Programm zu registrieren."
 msgid "Use this form to register a new application."
 msgstr "Benutzer dieses Formular, um eine neues Programm zu erstellen."
 
-#: actions/newapplication.php:169
-msgid "Name is too long (maximum 255 chars)."
-msgstr "Der Name ist zu lang (maximal 255 Zeichen)."
-
 #: actions/newapplication.php:184
 msgid "Source URL is required."
 msgstr "Quell-URL ist erforderlich."
 
-#: actions/newapplication.php:199
-msgid "Organization is too long (maximum 255 chars)."
-msgstr "Die angegebene Organisation ist zu lang (maximal 255 Zeichen)."
-
 #: actions/newapplication.php:266 actions/newapplication.php:275
 msgid "Could not create application."
 msgstr "Konnte das Programm nicht erstellen."
@@ -3121,14 +3135,14 @@ msgid "New message"
 msgstr "Neue Nachricht"
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:499
+#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501
 msgid "You can't send a message to this user."
 msgstr "Du kannst diesem Benutzer keine Nachricht schicken."
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
 #: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
-#: lib/command.php:579
+#: lib/command.php:581
 msgid "No content!"
 msgstr "Kein Inhalt!"
 
@@ -3137,7 +3151,7 @@ msgid "No recipient specified."
 msgstr "Kein Empfänger angegeben."
 
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:503
+#: actions/newmessage.php:167 lib/command.php:505
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -3149,12 +3163,12 @@ msgstr "Nachricht gesendet"
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:511
+#: actions/newmessage.php:188 lib/command.php:513
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Direkte Nachricht an %s abgeschickt"
 
-#: actions/newmessage.php:213 actions/newnotice.php:263
+#: actions/newmessage.php:213 actions/newnotice.php:264
 msgid "Ajax Error"
 msgstr "Ajax-Fehler"
 
@@ -3162,20 +3176,7 @@ msgstr "Ajax-Fehler"
 msgid "New notice"
 msgstr "Neue Nachricht"
 
-#: actions/newnotice.php:159 lib/mailhandler.php:60
-#, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr ""
-"Das war zu lang. Die Länge einer Nachricht ist auf %d Zeichen beschränkt."
-
-#: actions/newnotice.php:183
-#, php-format
-msgid "Max notice size is %d chars, including attachment URL."
-msgstr ""
-"Die maximale Größe von Nachrichten ist %d Zeichen, inklusive der URL der "
-"Anhänge"
-
-#: actions/newnotice.php:229
+#: actions/newnotice.php:230
 msgid "Notice posted"
 msgstr "Nachricht hinzugefügt"
 
@@ -3350,36 +3351,46 @@ msgstr "Suche nach Benutzern"
 msgid "Notice Search"
 msgstr "Nachrichtensuche"
 
-#: actions/othersettings.php:60
+#: actions/othersettings.php:59
 msgid "Other settings"
 msgstr "Andere Einstellungen"
 
+#. TRANS: Instructions for tab "Other" in user profile settings.
 #: actions/othersettings.php:71
 msgid "Manage various other options."
 msgstr "Verwalte zahlreiche andere Einstellungen."
 
-#: actions/othersettings.php:108
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/othersettings.php:111
 msgid " (free service)"
-msgstr "(kostenloser Dienst)"
+msgstr " (kostenloser Dienst)"
 
-#: actions/othersettings.php:116
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/othersettings.php:120
 msgid "Shorten URLs with"
 msgstr "URLs kürzen mit"
 
-#: actions/othersettings.php:117
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/othersettings.php:122
 msgid "Automatic shortening service to use."
 msgstr "URL-Auto-Kürzungs-Dienst."
 
-#: actions/othersettings.php:122
+#. TRANS: Label for checkbox.
+#: actions/othersettings.php:128
 msgid "View profile designs"
 msgstr "Profil-Designs ansehen"
 
-#: actions/othersettings.php:123
+#. TRANS: Tooltip for checkbox.
+#: actions/othersettings.php:130
 msgid "Show or hide profile designs."
 msgstr "Profil-Designs anzeigen oder verstecken."
 
-#: actions/othersettings.php:153
-msgid "URL shortening service is too long (max 50 chars)."
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/othersettings.php:162
+#, fuzzy
+msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "URL-Auto-Kürzungs-Dienst ist zu lang (max. 50 Zeichen)."
 
 #: actions/otp.php:69
@@ -3853,7 +3864,7 @@ msgstr "Biografie"
 #. TRANS: Label for group location (dt). Text hidden by default.
 #: actions/profilesettings.php:149 actions/register.php:485
 #: actions/showgroup.php:267 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:177
+#: actions/userauthorization.php:166 lib/groupeditform.php:180
 #: lib/userprofile.php:165
 msgid "Location"
 msgstr "Aufenthaltsort"
@@ -4196,7 +4207,8 @@ msgid "Unexpected password reset."
 msgstr "Unerwarteter Passwortreset."
 
 #: actions/recoverpassword.php:365
-msgid "Password must be 6 chars or more."
+#, fuzzy
+msgid "Password must be 6 characters or more."
 msgstr "Passwort muss mehr als 6 Zeichen enthalten"
 
 #: actions/recoverpassword.php:369
@@ -4576,7 +4588,7 @@ msgstr "Organisation"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:172
+#: lib/applicationeditform.php:208 lib/groupeditform.php:175
 msgid "Description"
 msgstr "Beschreibung"
 
@@ -4728,7 +4740,7 @@ msgid "Note"
 msgstr "Nachricht"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:298 lib/groupeditform.php:184
+#: actions/showgroup.php:298 lib/groupeditform.php:187
 msgid "Aliases"
 msgstr "Pseudonyme"
 
@@ -4780,14 +4792,12 @@ msgstr "Alle Mitglieder"
 
 #. TRANS: Label for creation date in statistics on group page.
 #: actions/showgroup.php:458
-#, fuzzy
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Erstellt"
 
 #. TRANS: Label for member count in statistics on group page.
 #: actions/showgroup.php:466
-#, fuzzy
 msgctxt "LABEL"
 msgid "Members"
 msgstr "Mitglieder"
@@ -4860,49 +4870,69 @@ msgstr "Nachricht von %1$s auf %2$s"
 msgid "Notice deleted."
 msgstr "Nachricht gelöscht."
 
-#: actions/showstream.php:72
-#, php-format
-msgid " tagged %s"
-msgstr "Nachrichten, die mit %s getagt sind"
+#. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
+#: actions/showstream.php:70
+#, fuzzy, php-format
+msgid "%1$s tagged %2$s"
+msgstr "%1$s, Seite %2$d"
 
-#: actions/showstream.php:78
+#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#: actions/showstream.php:74
+#, fuzzy, php-format
+msgid "%1$s tagged %2$s, page %3$d"
+msgstr "Mit %1$s gekennzeichnete Nachrichten, Seite %2$d"
+
+#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$d is the page number.
+#: actions/showstream.php:82
 #, php-format
 msgid "%1$s, page %2$d"
 msgstr "%1$s, Seite %2$d"
 
-#: actions/showstream.php:120
+#. TRANS: Title for link to notice feed.
+#. TRANS: %1$s is a user nickname, %2$s is a hashtag.
+#: actions/showstream.php:127
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Nachrichtenfeed für %1$s tagged %2$s (RSS 1.0)"
 
-#: actions/showstream.php:127
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:136
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "Feed der Nachrichten von %s (RSS 1.0)"
 
-#: actions/showstream.php:134
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:145
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "Feed der Nachrichten von %s (RSS 2.0)"
 
-#: actions/showstream.php:141
+#: actions/showstream.php:152
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "Feed der Nachrichten von %s (Atom)"
 
-#: actions/showstream.php:146
+#. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
+#. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
+#: actions/showstream.php:159
 #, php-format
 msgid "FOAF for %s"
 msgstr "FOAF von %s"
 
-#: actions/showstream.php:197
-#, php-format
-msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
+#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
+#: actions/showstream.php:211
+#, fuzzy, php-format
+msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr ""
 "Dies ist die Zeitleiste von %1$s und Freunden, aber bisher hat niemand etwas "
 "gepostet."
 
-#: actions/showstream.php:202
+#. TRANS: Second sentence of empty list message for a stream for the user themselves.
+#: actions/showstream.php:217
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -4910,7 +4940,9 @@ msgstr ""
 "In letzter Zeit irgendwas Interessantes erlebt? Du hast noch nichts "
 "geschrieben, jetzt wäre doch ein guter Zeitpunkt los zu legen :)"
 
-#: actions/showstream.php:204
+#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:221
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -4919,7 +4951,9 @@ msgstr ""
 "Du kannst %1$s in seinem Profil einen Stups geben oder [ihm etwas posten](%%%"
 "%action.newnotice%%%%?status_textarea=%s)."
 
-#: actions/showstream.php:243
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:264
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4933,7 +4967,9 @@ msgstr ""
 "um **%s**'s und vielen anderen zu folgen! ([Mehr Informationen](%%%%doc.help%"
 "%%%))"
 
-#: actions/showstream.php:248
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:271
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4944,7 +4980,8 @@ msgstr ""
 "wikipedia.org/wiki/Mikroblogging)-Dienst basierend auf der freien Software "
 "[StatusNet](http://status.net/). "
 
-#: actions/showstream.php:305
+#. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
+#: actions/showstream.php:328
 #, php-format
 msgid "Repeat of %s"
 msgstr "Wiederholung von %s"
@@ -5060,31 +5097,40 @@ msgstr ""
 "Wie lange muss ein Benutzer warten, bis er eine identische Nachricht "
 "abschicken kann (in Sekunden)."
 
-#: actions/sitenoticeadminpanel.php:56
+#. TRANS: Page title for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:55
 msgid "Site Notice"
 msgstr "Seitenbenachrichtigung"
 
-#: actions/sitenoticeadminpanel.php:67
+#. TRANS: Instructions for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:66
 msgid "Edit site-wide message"
 msgstr "Neue Nachricht"
 
-#: actions/sitenoticeadminpanel.php:103
+#. TRANS: Server error displayed when saving a site-wide notice was impossible.
+#: actions/sitenoticeadminpanel.php:101
 msgid "Unable to save site notice."
 msgstr "Konnte Seitenbenachrichtigung nicht speichern"
 
-#: actions/sitenoticeadminpanel.php:113
-msgid "Max length for the site-wide notice is 255 chars."
+#. TRANS: Client error displayed when a site-wide notice was longer than allowed.
+#: actions/sitenoticeadminpanel.php:112
+#, fuzzy
+msgid "Maximum length for the site-wide notice is 255 characters."
 msgstr "Maximale Länge von Systembenachrichtigungen ist 255 Zeichen."
 
+#. TRANS: Label for site-wide notice text field in admin panel.
 #: actions/sitenoticeadminpanel.php:176
 msgid "Site notice text"
 msgstr "Seitenbenachrichtigung"
 
-#: actions/sitenoticeadminpanel.php:178
-msgid "Site-wide notice text (255 chars max; HTML okay)"
+#. TRANS: Tooltip for site-wide notice text field in admin panel.
+#: actions/sitenoticeadminpanel.php:179
+#, fuzzy
+msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr "Systembenachrichtigung (max. 255 Zeichen; HTML erlaubt)"
 
-#: actions/sitenoticeadminpanel.php:198
+#. TRANS: Title for button to save site notice in admin panel.
+#: actions/sitenoticeadminpanel.php:201
 msgid "Save site notice"
 msgstr "Systemnachricht speichern"
 
@@ -5550,75 +5596,93 @@ msgstr ""
 "$s“."
 
 #. TRANS: User admin panel title
-#: actions/useradminpanel.php:60
+#: actions/useradminpanel.php:58
 msgctxt "TITLE"
 msgid "User"
 msgstr "Benutzer"
 
-#: actions/useradminpanel.php:71
+#. TRANS: Instruction for user admin panel.
+#: actions/useradminpanel.php:69
 msgid "User settings for this StatusNet site"
 msgstr "Benutzer-Einstellungen dieser StatusNet-Website"
 
-#: actions/useradminpanel.php:150
+#. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
+#: actions/useradminpanel.php:147
 msgid "Invalid bio limit. Must be numeric."
 msgstr "Das Zeichenlimit der Biografie muss numerisch sein!"
 
-#: actions/useradminpanel.php:156
-msgid "Invalid welcome text. Max length is 255 characters."
+#. TRANS: Form validation error in user admin panel when welcome text is too long.
+#: actions/useradminpanel.php:154
+#, fuzzy
+msgid "Invalid welcome text. Maximum length is 255 characters."
 msgstr "Willkommens-Nachricht ungültig. Maximale Länge sind 255 Zeichen."
 
+#. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
+#. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
-#, php-format
-msgid "Invalid default subscripton: '%1$s' is not user."
+#, fuzzy, php-format
+msgid "Invalid default subscripton: '%1$s' is not a user."
 msgstr "Ungültiges Abonnement: „%1$s“ ist kein Benutzer"
 
 #. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:106
+#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
 #: lib/personalgroupnav.php:109
 msgid "Profile"
 msgstr "Profil"
 
-#: actions/useradminpanel.php:223
+#. TRANS: Field label in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:220
 msgid "Bio Limit"
 msgstr "Bio-Limit"
 
-#: actions/useradminpanel.php:224
+#. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:222
 msgid "Maximum length of a profile bio in characters."
 msgstr "Maximale Länge in Zeichen der Profil-Bio."
 
-#: actions/useradminpanel.php:232
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:231
 msgid "New users"
 msgstr "Neue Benutzer"
 
+#. TRANS: Field label in user admin panel for setting new user welcome text.
 #: actions/useradminpanel.php:236
 msgid "New user welcome"
 msgstr "Neue Benutzer empfangen"
 
-#: actions/useradminpanel.php:237
-msgid "Welcome text for new users (Max 255 chars)."
+#. TRANS: Tooltip in user admin panel for setting new user welcome text.
+#: actions/useradminpanel.php:238
+#, fuzzy
+msgid "Welcome text for new users (maximum 255 characters)."
 msgstr "Willkommens-Nachricht für neue Benutzer (maximal 255 Zeichen)."
 
-#: actions/useradminpanel.php:242
+#. TRANS: Field label in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:244
 msgid "Default subscription"
 msgstr "Standard-Abonnement"
 
-#: actions/useradminpanel.php:243
+#. TRANS: Tooltip in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:246
 msgid "Automatically subscribe new users to this user."
 msgstr "Neue Benutzer abonnieren automatisch diesen Benutzer"
 
-#: actions/useradminpanel.php:252
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:256
 msgid "Invitations"
 msgstr "Einladungen"
 
-#: actions/useradminpanel.php:257
+#. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:262
 msgid "Invitations enabled"
 msgstr "Einladungen aktivieren"
 
-#: actions/useradminpanel.php:259
+#. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:265
 msgid "Whether to allow users to invite new users."
 msgstr "Ist es Benutzern erlaubt, neue Benutzer einzuladen."
 
-#: actions/useradminpanel.php:295
+#. TRANS: Title for button to save user settings in user admin panel.
+#: actions/useradminpanel.php:302
 msgid "Save user settings"
 msgstr "Benutzer-Einstellungen speichern"
 
@@ -5830,7 +5894,7 @@ msgid "Plugins"
 msgstr "Erweiterungen"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:831
+#: actions/version.php:198 lib/action.php:880
 msgid "Version"
 msgstr "Version"
 
@@ -6043,9 +6107,16 @@ msgstr "Konnte Antwort auf %1$d, %2$d nicht speichern."
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
+#. TRANS: Full name of a profile or group followed by nickname in parens
+#: classes/Profile.php:164
+#, fuzzy, php-format
+msgctxt "FANCYNAME"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:791
+#: classes/Profile.php:812
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
@@ -6054,7 +6125,7 @@ msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:800
+#: classes/Profile.php:821
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6202,194 +6273,201 @@ msgstr "%1$s - %2$s"
 msgid "Untitled page"
 msgstr "Seite ohne Titel"
 
+#. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
+#: lib/action.php:310
+msgctxt "TOOLTIP"
+msgid "Show more"
+msgstr ""
+
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:477
+#: lib/action.php:526
 msgid "Primary site navigation"
 msgstr "Hauptnavigation"
 
 #. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:483
+#: lib/action.php:532
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "Persönliches Profil und Freundes-Zeitleiste"
 
 #. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:486
+#: lib/action.php:535
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Eigene"
 
 #. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:488
+#: lib/action.php:537
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
 msgstr "Ändere deine E-Mail, Avatar, Passwort und Profil"
 
 #. TRANS: Main menu option when logged in for access to user settings
-#: lib/action.php:491
+#: lib/action.php:540
 msgid "Account"
 msgstr "Profil"
 
 #. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:493
+#: lib/action.php:542
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "Zum Dienst verbinden"
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:496
+#: lib/action.php:545
 msgid "Connect"
 msgstr "Verbinden"
 
 #. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:499
+#: lib/action.php:548
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "Seiteneinstellung ändern"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:502 lib/groupnav.php:117
+#: lib/action.php:551 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Admin"
 
 #. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:506
+#: lib/action.php:555
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Lade Freunde und Kollegen ein dir auf %s zu folgen"
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:509
+#: lib/action.php:558
 msgctxt "MENU"
 msgid "Invite"
 msgstr "Einladen"
 
 #. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:515
+#: lib/action.php:564
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "Von der Seite abmelden"
 
 #. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:518
+#: lib/action.php:567
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Abmelden"
 
 #. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:523
+#: lib/action.php:572
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "Neues Benutzerkonto erstellen"
 
 #. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:526
+#: lib/action.php:575
 msgctxt "MENU"
 msgid "Register"
 msgstr "Registrieren"
 
 #. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:529
+#: lib/action.php:578
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "Auf der Seite anmelden"
 
 #. TRANS: Main menu option when not logged in to log in
-#: lib/action.php:532
+#: lib/action.php:581
 msgctxt "MENU"
 msgid "Login"
 msgstr "Anmelden"
 
 #. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:535
+#: lib/action.php:584
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Hilf mir!"
 
 #. TRANS: Main menu option for help on the StatusNet site
-#: lib/action.php:538
+#: lib/action.php:587
 msgctxt "MENU"
 msgid "Help"
 msgstr "Hilfe"
 
 #. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:541
+#: lib/action.php:590
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr "Suche nach Leuten oder Text"
 
 #. TRANS: Main menu option when logged in or when the StatusNet instance is not private
-#: lib/action.php:544
+#: lib/action.php:593
 msgctxt "MENU"
 msgid "Search"
 msgstr "Suchen"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:566 lib/adminpanelaction.php:387
+#: lib/action.php:615 lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "Seitennachricht"
 
 #. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:633
+#: lib/action.php:682
 msgid "Local views"
 msgstr "Lokale Ansichten"
 
 #. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:703
+#: lib/action.php:752
 msgid "Page notice"
 msgstr "Neue Nachricht"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:804
+#: lib/action.php:853
 msgid "Secondary site navigation"
 msgstr "Unternavigation"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:810
+#: lib/action.php:859
 msgid "Help"
 msgstr "Hilfe"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:813
+#: lib/action.php:862
 msgid "About"
 msgstr "Über"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:816
+#: lib/action.php:865
 msgid "FAQ"
 msgstr "FAQ"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:821
+#: lib/action.php:870
 msgid "TOS"
 msgstr "AGB"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:825
+#: lib/action.php:874
 msgid "Privacy"
 msgstr "Privatsphäre"
 
-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:828
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+#: lib/action.php:877
 msgid "Source"
 msgstr "Quellcode"
 
-#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:834
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+#: lib/action.php:884
 msgid "Contact"
 msgstr "Kontakt"
 
-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:837
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+#: lib/action.php:887
 msgid "Badge"
 msgstr "Plakette"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:866
+#: lib/action.php:916
 msgid "StatusNet software license"
 msgstr "StatusNet-Software-Lizenz"
 
@@ -6397,7 +6475,7 @@ msgstr "StatusNet-Software-Lizenz"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:873
+#: lib/action.php:923
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -6407,7 +6485,7 @@ msgstr ""
 "site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:876
+#: lib/action.php:926
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** ist ein Mikrobloggingdienst."
@@ -6416,7 +6494,7 @@ msgstr "**%%site.name%%** ist ein Mikrobloggingdienst."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:883
+#: lib/action.php:933
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -6428,20 +6506,20 @@ msgstr ""
 "(http://www.fsf.org/licensing/licenses/agpl-3.0.html) erhältlich ist."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:899
+#: lib/action.php:949
 msgid "Site content license"
 msgstr "StatusNet-Software-Lizenz"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:906
+#: lib/action.php:956
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "Inhalte und Daten von %1$s sind privat und vertraulich."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:913
+#: lib/action.php:963
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
@@ -6449,7 +6527,7 @@ msgstr ""
 "vorbehalten."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:917
+#: lib/action.php:967
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "Urheberrecht von Inhalt und Daten liegt bei den Beteiligten. Alle Rechte "
@@ -6457,25 +6535,25 @@ msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:949
+#: lib/action.php:999
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr "Alle Inhalte und Daten von %1$s sind unter der %2$s Lizenz verfügbar."
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1285
+#: lib/action.php:1335
 msgid "Pagination"
 msgstr "Seitenerstellung"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1296
+#: lib/action.php:1346
 msgid "After"
 msgstr "Später"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1306
+#: lib/action.php:1356
 msgid "Before"
 msgstr "Vorher"
 
@@ -6818,7 +6896,7 @@ msgid "AJAX error"
 msgstr "Ajax-Fehler"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:233 lib/mailhandler.php:142
+#: lib/channel.php:233 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "Befehl ausgeführt"
 
@@ -6834,7 +6912,7 @@ msgstr "Nachricht mit dieser ID existiert nicht"
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:626
+#: lib/command.php:99 lib/command.php:630
 msgid "User has no last notice."
 msgstr "Benutzer hat keine letzte Nachricht"
 
@@ -6903,6 +6981,14 @@ msgstr "%1$s ist der Gruppe %2$s beigetreten."
 msgid "%1$s left group %2$s."
 msgstr "%1$s hat die Gruppe %2$s verlassen."
 
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: lib/command.php:426
+#, fuzzy, php-format
+msgctxt "WHOIS"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
 #. TRANS: Whois output. %s is the full name of the queried user.
 #: lib/command.php:430
 #, php-format
@@ -6942,135 +7028,141 @@ msgstr ""
 "%s ist ein entferntes Profil; man kann direkte Nachrichten nur an Benutzer "
 "auf dem selben Server senden."
 
-#. TRANS: Message given if content is too long.
+#. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
 #: lib/command.php:488
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] ""
+"Nachricht zu lang - maximal %1$d Zeichen erlaubt, du hast %2$d gesendet."
+msgstr[1] ""
 "Nachricht zu lang - maximal %1$d Zeichen erlaubt, du hast %2$d gesendet."
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:514
+#: lib/command.php:516
 msgid "Error sending direct message."
 msgstr "Fehler beim Senden der Nachricht"
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:551
+#: lib/command.php:553
 #, php-format
 msgid "Notice from %s repeated."
 msgstr "Nachricht von %s wiederholt."
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:554
+#: lib/command.php:556
 msgid "Error repeating notice."
 msgstr "Fehler beim Wiederholen der Nachricht"
 
-#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:589
-#, php-format
-msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
+#: lib/command.php:591
+#, fuzzy, php-format
+msgid "Notice too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] ""
+"Nachricht zu lange - maximal %1$d Zeichen erlaubt, du hast %2$ gesendet"
+msgstr[1] ""
 "Nachricht zu lange - maximal %1$d Zeichen erlaubt, du hast %2$ gesendet"
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:600
+#: lib/command.php:604
 #, php-format
 msgid "Reply to %s sent."
 msgstr "Antwort an %s gesendet"
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:603
+#: lib/command.php:607
 msgid "Error saving notice."
 msgstr "Problem beim Speichern der Nachricht."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:650
+#: lib/command.php:654
 msgid "Specify the name of the user to subscribe to."
 msgstr "Gib den Namen des Benutzers an, den du abonnieren möchtest"
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:659
+#: lib/command.php:663
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "OMB-Profile können nicht mit einem Kommando abonniert werden."
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:667
+#: lib/command.php:671
 #, php-format
 msgid "Subscribed to %s."
 msgstr "%s abboniert"
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:688 lib/command.php:799
+#: lib/command.php:692 lib/command.php:803
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "Gib den Namen des Benutzers ein, den du nicht mehr abonnieren möchtest"
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:699
+#: lib/command.php:703
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr "Abgemeldet von %s."
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:719 lib/command.php:745
+#: lib/command.php:723 lib/command.php:749
 msgid "Command not yet implemented."
 msgstr "Befehl noch nicht implementiert."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:723
+#: lib/command.php:727
 msgid "Notification off."
 msgstr "Benachrichtigung deaktiviert."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:726
+#: lib/command.php:730
 msgid "Can't turn off notification."
 msgstr "Konnte Benachrichtigung nicht deaktivieren."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:749
+#: lib/command.php:753
 msgid "Notification on."
 msgstr "Benachrichtigung aktiviert."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:752
+#: lib/command.php:756
 msgid "Can't turn on notification."
 msgstr "Konnte Benachrichtigung nicht aktivieren."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:766
+#: lib/command.php:770
 msgid "Login command is disabled."
 msgstr "Die Anmeldung ist deaktiviert"
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:779
+#: lib/command.php:783
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr "Der Link ist nur einmal und für eine Dauer von 2 Minuten gültig: %s"
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:808
+#: lib/command.php:812
 #, php-format
 msgid "Unsubscribed %s."
 msgstr "%s nicht mehr abonniert"
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:826
+#: lib/command.php:830
 msgid "You are not subscribed to anyone."
 msgstr "Du hast niemanden abonniert."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:831
+#: lib/command.php:835
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Du hast diesen Benutzer bereits abonniert:"
@@ -7078,14 +7170,14 @@ msgstr[1] "Du hast diese Benutzer bereits abonniert:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:853
+#: lib/command.php:857
 msgid "No one is subscribed to you."
 msgstr "Niemand hat dich abonniert."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:858
+#: lib/command.php:862
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Die Gegenseite konnte dich nicht abonnieren."
@@ -7093,21 +7185,21 @@ msgstr[1] "Die Gegenseite konnte dich nicht abonnieren."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:880
+#: lib/command.php:884
 msgid "You are not a member of any groups."
 msgstr "Du bist in keiner Gruppe Mitglied."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:885
+#: lib/command.php:889
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Du bist Mitglied dieser Gruppe:"
 msgstr[1] "Du bist Mitglied dieser Gruppen:"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:900
+#: lib/command.php:904
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -7336,7 +7428,8 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 Kleinbuchstaben oder Zahlen, keine Satz- oder Leerzeichen"
 
 #: lib/groupeditform.php:163
-msgid "URL of the homepage or blog of the group or topic"
+#, fuzzy
+msgid "URL of the homepage or blog of the group or topic."
 msgstr "Adresse der Homepage oder Blogs der Gruppe oder des Themas"
 
 #: lib/groupeditform.php:168
@@ -7344,19 +7437,30 @@ msgid "Describe the group or topic"
 msgstr "Beschreibe die Gruppe oder das Thema"
 
 #: lib/groupeditform.php:170
-#, php-format
-msgid "Describe the group or topic in %d characters"
-msgstr "Beschreibe die Gruppe oder das Thema in %d Zeichen"
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d character or less"
+msgid_plural "Describe the group or topic in %d characters or less"
+msgstr[0] "Beschreibe die Gruppe oder das Thema in %d Zeichen"
+msgstr[1] "Beschreibe die Gruppe oder das Thema in %d Zeichen"
 
-#: lib/groupeditform.php:179
+#: lib/groupeditform.php:182
+#, fuzzy
 msgid ""
-"Location for the group, if any, like \"City, State (or Region), Country\""
+"Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr "Ort der Gruppe, optional, beispielsweise „Stadt, Region, Land“"
 
-#: lib/groupeditform.php:187
-#, php-format
-msgid "Extra nicknames for the group, comma- or space- separated, max %d"
-msgstr ""
+#: lib/groupeditform.php:190
+#, fuzzy, php-format
+msgid ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"alias allowed."
+msgid_plural ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"aliases allowed."
+msgstr[0] ""
+"Zusätzliche Spitznamen für die Gruppe, Komma oder Leerzeichen getrennt, max %"
+"d"
+msgstr[1] ""
 "Zusätzliche Spitznamen für die Gruppe, Komma oder Leerzeichen getrennt, max %"
 "d"
 
@@ -7488,27 +7592,27 @@ msgstr "Unbekannter Dateityp"
 
 #. TRANS: Number of megabytes. %d is the number.
 #: lib/imagefile.php:248
-#, fuzzy, php-format
+#, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
-msgstr[0] "MB"
-msgstr[1] "MB"
+msgstr[0] ""
+msgstr[1] ""
 
 #. TRANS: Number of kilobytes. %d is the number.
 #: lib/imagefile.php:252
-#, fuzzy, php-format
+#, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
-msgstr[0] "kB"
-msgstr[1] "kB"
+msgstr[0] ""
+msgstr[1] ""
 
 #. TRANS: Number of bytes. %d is the number.
 #: lib/imagefile.php:255
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d Byte"
+msgstr[1] "%d Bytes"
 
 #: lib/jabber.php:387
 #, php-format
@@ -7913,7 +8017,7 @@ msgstr "Sorry, das ist nicht deine Adresse für eingehende E-Mails."
 msgid "Sorry, no incoming email allowed."
 msgstr "Sorry, keinen eingehenden E-Mails gestattet."
 
-#: lib/mailhandler.php:228
+#: lib/mailhandler.php:229
 #, php-format
 msgid "Unsupported message type: %s"
 msgstr "Nachrichten-Typ %s wird nicht unterstützt."
@@ -8264,16 +8368,17 @@ msgid "Sandbox this user"
 msgstr "Diesen Benutzer auf die Spielwiese setzen"
 
 #. TRANS: Fieldset legend for the search form.
-#: lib/searchaction.php:121
+#: lib/searchaction.php:120
 msgid "Search site"
 msgstr "Website durchsuchen"
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
-#: lib/searchaction.php:129
+#: lib/searchaction.php:128
 msgid "Keyword(s)"
 msgstr "Suchbegriff"
 
+#. TRANS: Button text for searching site.
 #: lib/searchaction.php:130
 msgctxt "BUTTON"
 msgid "Search"
@@ -8363,8 +8468,8 @@ msgid "The theme file is missing or the upload failed."
 msgstr "Die Theme-Datei fehlt oder das Hochladen ist fehlgeschlagen."
 
 #: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:278 lib/themeuploader.php:282
-#: lib/themeuploader.php:290 lib/themeuploader.php:297
+#: lib/themeuploader.php:279 lib/themeuploader.php:283
+#: lib/themeuploader.php:291 lib/themeuploader.php:298
 msgid "Failed saving theme."
 msgstr "Speicherung des Themes fehlgeschlagen."
 
@@ -8373,15 +8478,18 @@ msgid "Invalid theme: bad directory structure."
 msgstr "Ungültiger Theme: schlechte Ordner-Struktur."
 
 #: lib/themeuploader.php:166
-#, php-format
-msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
-msgstr "Der hochgeladene Theme ist zu groß; er muss unter %d Bytes sein."
+#, fuzzy, php-format
+msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
+msgid_plural ""
+"Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr[0] "Der hochgeladene Theme ist zu groß; er muss unter %d Bytes sein."
+msgstr[1] "Der hochgeladene Theme ist zu groß; er muss unter %d Bytes sein."
 
-#: lib/themeuploader.php:178
+#: lib/themeuploader.php:179
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr "Ungültigges Theme-Archiv: fehlende Datei css/display.css"
 
-#: lib/themeuploader.php:218
+#: lib/themeuploader.php:219
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
@@ -8389,16 +8497,16 @@ msgstr ""
 "Der Theme enthält einen ungültigen Datei- oder Ordnernamen. Bleib bei ASCII-"
 "Buchstaben, Zahlen, Unterstrichen und Minuszeichen."
 
-#: lib/themeuploader.php:224
+#: lib/themeuploader.php:225
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr "Theme enthält unsichere Dateierweiterungen; könnte unsicher sein."
 
-#: lib/themeuploader.php:241
+#: lib/themeuploader.php:242
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr "Das Theme enthält Dateien des Types „.%s“, die nicht erlaubt sind."
 
-#: lib/themeuploader.php:259
+#: lib/themeuploader.php:260
 msgid "Error opening theme archive."
 msgstr "Fehler beim Öffnen des Theme-Archives."
 
@@ -8581,22 +8689,42 @@ msgstr[0] ""
 msgstr[1] ""
 "Nachricht zu lang - maximal %1$d Zeichen erlaubt, du hast %2$d gesendet."
 
-#: scripts/restoreuser.php:82
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: scripts/restoreuser.php:61
 #, php-format
-msgid "Backup file for user %s (%s)"
-msgstr "Backup-Datei des Benutzers %s (%s)"
+msgid "Getting backup from file '%s'."
+msgstr ""
 
-#: scripts/restoreuser.php:88
+#. TRANS: Commandline script output.
+#: scripts/restoreuser.php:91
 msgid "No user specified; using backup user."
 msgstr "Keine Benutzer-ID angegeben"
 
-#: scripts/restoreuser.php:94
-#, php-format
-msgid "%d entries in backup."
-msgstr "%d Einträge im Backup."
+#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
+#: scripts/restoreuser.php:98
+#, fuzzy, php-format
+msgid "%d entry in backup."
+msgid_plural "%d entries in backup."
+msgstr[0] "%d Einträge im Backup."
+msgstr[1] "%d Einträge im Backup."
+
+#~ msgid "Name is too long (maximum 255 chars)."
+#~ msgstr "Der Name ist zu lang (maximal 255 Zeichen)."
+
+#~ msgid "Organization is too long (maximum 255 chars)."
+#~ msgstr "Die angegebene Organisation ist zu lang (maximal 255 Zeichen)."
+
+#~ msgid "That's too long. Max notice size is %d chars."
+#~ msgstr ""
+#~ "Das war zu lang. Die Länge einer Nachricht ist auf %d Zeichen beschränkt."
+
+#~ msgid "Max notice size is %d chars, including attachment URL."
+#~ msgstr ""
+#~ "Die maximale Größe von Nachrichten ist %d Zeichen, inklusive der URL der "
+#~ "Anhänge"
 
-#~ msgid "Description is too long (max %d chars)."
-#~ msgstr "Die Beschreibung ist zu lang (max. %d Zeichen)."
+#~ msgid " tagged %s"
+#~ msgstr "Nachrichten, die mit %s getagt sind"
 
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "Zu viele Pseudonyme! Maximale Anzahl ist %d."
+#~ msgid "Backup file for user %s (%s)"
+#~ msgstr "Backup-Datei des Benutzers %s (%s)"
diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po
index d85e43536..c36341dc6 100644
--- a/locale/en_GB/LC_MESSAGES/statusnet.po
+++ b/locale/en_GB/LC_MESSAGES/statusnet.po
@@ -13,17 +13,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-30 23:18+0000\n"
-"PO-Revision-Date: 2010-10-30 23:20:02+0000\n"
+"POT-Creation-Date: 2010-11-02 22:51+0000\n"
+"PO-Revision-Date: 2010-11-02 22:53:12+0000\n"
 "Language-Team: British English <http://translatewiki.net/wiki/Portal:en-gb>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r75708); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r75875); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: en-gb\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2010-10-30 09:48:40+0000\n"
+"X-POT-Import-Date: 2010-10-30 23:42:01+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -80,15 +80,20 @@ msgstr "Save access settings"
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
+#. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
+#. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #: actions/accessadminpanel.php:193 actions/emailsettings.php:228
-#: actions/imsettings.php:187 actions/pathsadminpanel.php:512
-#: actions/profilesettings.php:201 actions/smssettings.php:209
-#: actions/subscriptions.php:246 lib/applicationeditform.php:355
+#: actions/imsettings.php:187 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: lib/applicationeditform.php:355 lib/groupeditform.php:207
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Save"
@@ -139,7 +144,7 @@ msgstr "No such page."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:495 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "No such user."
@@ -211,7 +216,9 @@ msgstr ""
 
 #. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:208
+#. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -565,8 +572,11 @@ msgstr "Full name is too long (max 255 chars)."
 #. TRANS: Group edit form validation error.
 #. TRANS: Form validation error in New application form.
 #. TRANS: %d is the maximum number of characters for the description.
+#. TRANS: Group create form validation error.
+#. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:220 actions/editapplication.php:201
 #: actions/editgroup.php:216 actions/newapplication.php:178
+#: actions/newgroup.php:152
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -724,14 +734,14 @@ msgstr "You are not authorised."
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:172 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:74
 #: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
 #: actions/groupunblock.php:65 actions/imsettings.php:230
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
-#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/othersettings.php:153 actions/passwordsettings.php:138
 #: actions/profilesettings.php:221 actions/recoverpassword.php:350
 #: actions/register.php:172 actions/remotesubscribe.php:77
 #: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
@@ -909,20 +919,21 @@ msgstr "You may not delete another user's status."
 
 #. TRANS: Client error displayed trying to repeat a non-existing notice through the API.
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
+#. TRANS: Error message displayed trying to delete a non-existing notice.
 #: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/deletenotice.php:58 actions/shownotice.php:92
+#: actions/deletenotice.php:61 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "No such notice."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:535
+#: actions/apistatusesretweet.php:83 lib/command.php:537
 msgid "Cannot repeat your own notice."
 msgstr "Cannot repeat your own notice."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:541
+#: actions/apistatusesretweet.php:92 lib/command.php:543
 msgid "Already repeated that notice."
 msgstr "Already repeated that notice."
 
@@ -943,7 +954,8 @@ msgstr ""
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#: actions/apistatusesupdate.php:244
+#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
+#: lib/mailhandler.php:60
 #, fuzzy, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
@@ -958,7 +970,7 @@ msgstr "API method not found."
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
-#: actions/apistatusesupdate.php:308
+#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
 #, fuzzy, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
@@ -1168,17 +1180,18 @@ msgstr "Pick a square area of the image to be your avatar"
 msgid "Lost our file data."
 msgstr "Lost our file data."
 
-#: actions/avatarsettings.php:384
+#. TRANS: Success message for having updated a user avatar.
+#: actions/avatarsettings.php:385
 msgid "Avatar updated."
 msgstr "Avatar updated."
 
 #. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
-#: actions/avatarsettings.php:388
+#: actions/avatarsettings.php:389
 msgid "Failed updating avatar."
 msgstr "Failed updating avatar."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:412
+#: actions/avatarsettings.php:413
 msgid "Avatar deleted."
 msgstr "Avatar deleted."
 
@@ -1210,8 +1223,8 @@ msgstr ""
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:154 actions/deleteapplication.php:154
-#: actions/deletegroup.php:220 actions/deletenotice.php:150
+#: actions/block.php:154 actions/deleteapplication.php:157
+#: actions/deletegroup.php:220 actions/deletenotice.php:155
 #: actions/deleteuser.php:152 actions/groupblock.php:178
 msgctxt "BUTTON"
 msgid "No"
@@ -1229,8 +1242,8 @@ msgstr "Do not block this user"
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:161 actions/deleteapplication.php:161
-#: actions/deletegroup.php:227 actions/deletenotice.php:157
+#: actions/block.php:161 actions/deleteapplication.php:164
+#: actions/deletegroup.php:227 actions/deletenotice.php:162
 #: actions/deleteuser.php:159 actions/groupblock.php:185
 msgctxt "BUTTON"
 msgid "Yes"
@@ -1347,12 +1360,13 @@ msgstr "That address has already been confirmed."
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
 #. TRANS: Server error thrown on database error updating IM preferences.
 #. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
 #. TRANS: Server error thrown when user profile settings could not be updated.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #: actions/confirmaddress.php:118 actions/emailsettings.php:331
 #: actions/emailsettings.php:477 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:174
+#: actions/imsettings.php:442 actions/othersettings.php:184
 #: actions/profilesettings.php:326 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
@@ -1388,16 +1402,19 @@ msgstr "Conversation"
 msgid "Notices"
 msgstr "Notices"
 
-#: actions/deleteapplication.php:63
+#. TRANS: Client error displayed trying to delete an application while not logged in.
+#: actions/deleteapplication.php:62
 msgid "You must be logged in to delete an application."
 msgstr "You must be logged in to delete an application."
 
+#. TRANS: Client error displayed trying to delete an application that does not exist.
 #: actions/deleteapplication.php:71
 msgid "Application not found."
 msgstr "Application not found."
 
+#. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
-#: actions/deleteapplication.php:78 actions/editapplication.php:78
+#: actions/deleteapplication.php:79 actions/editapplication.php:78
 #: actions/showapplication.php:94
 msgid "You are not the owner of this application."
 msgstr "You are not the owner of this application."
@@ -1405,15 +1422,18 @@ msgstr "You are not the owner of this application."
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
 #: actions/newapplication.php:114 actions/showapplication.php:118
-#: lib/action.php:1354
+#: lib/action.php:1404
 msgid "There was a problem with your session token."
 msgstr "There was a problem with your session token."
 
-#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+#. TRANS: Title for delete application page.
+#. TRANS: Fieldset legend on delete application page.
+#: actions/deleteapplication.php:124 actions/deleteapplication.php:149
 msgid "Delete application"
 msgstr "Delete application"
 
-#: actions/deleteapplication.php:149
+#. TRANS: Confirmation text on delete application page.
+#: actions/deleteapplication.php:152
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
 "about the application from the database, including all existing user "
@@ -1424,12 +1444,12 @@ msgstr ""
 "connections."
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:158
+#: actions/deleteapplication.php:161
 msgid "Do not delete this application"
 msgstr "Do not delete this application"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:164
+#: actions/deleteapplication.php:167
 msgid "Delete this application"
 msgstr "Delete this application"
 
@@ -1463,12 +1483,13 @@ msgstr "Could not delete group %s."
 msgid "Deleted group %s"
 msgstr "Deleted group %s"
 
-#. TRANS: Title.
+#. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
 #: actions/deletegroup.php:176 actions/deletegroup.php:202
 msgid "Delete group"
 msgstr "Delete group"
 
+#. TRANS: Warning in form for deleleting a group.
 #: actions/deletegroup.php:206
 msgid ""
 "Are you sure you want to delete this group? This will clear all data about "
@@ -1489,10 +1510,11 @@ msgstr "Do not delete this group"
 msgid "Delete this group"
 msgstr "Delete this group"
 
+#. TRANS: Error message displayed trying to delete a notice while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1502,11 +1524,13 @@ msgstr "Delete this group"
 msgid "Not logged in."
 msgstr "Not logged in."
 
-#: actions/deletenotice.php:74
+#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
+#: actions/deletenotice.php:78
 msgid "Can't delete this notice."
 msgstr "Can't delete this notice."
 
-#: actions/deletenotice.php:106
+#. TRANS: Instructions for deleting a notice.
+#: actions/deletenotice.php:110
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
@@ -1514,21 +1538,24 @@ msgstr ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
 
-#: actions/deletenotice.php:112 actions/deletenotice.php:144
+#. TRANS: Page title when deleting a notice.
+#. TRANS: Fieldset legend for the delete notice form.
+#: actions/deletenotice.php:117 actions/deletenotice.php:148
 msgid "Delete notice"
 msgstr "Delete notice"
 
-#: actions/deletenotice.php:147
+#. TRANS: Message for the delete notice form.
+#: actions/deletenotice.php:152
 msgid "Are you sure you want to delete this notice?"
 msgstr "Are you sure you want to delete this notice?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:154
+#: actions/deletenotice.php:159
 msgid "Do not delete this notice"
 msgstr "Do not delete this notice"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:161 lib/noticelist.php:667
+#: actions/deletenotice.php:166 lib/noticelist.php:667
 msgid "Delete this notice"
 msgstr "Delete this notice"
 
@@ -1690,11 +1717,9 @@ msgstr "Reset back to default"
 
 #. TRANS: Submit button title.
 #: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
-#: actions/othersettings.php:126 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: actions/useradminpanel.php:295 lib/applicationeditform.php:357
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: lib/applicationeditform.php:357 lib/designsettings.php:256
 msgid "Save"
 msgstr "Save"
 
@@ -1742,9 +1767,9 @@ msgid "Name is required."
 msgstr "Name is required."
 
 #. TRANS: Validation error shown when providing too long a name in the "Edit application" form.
-#: actions/editapplication.php:188
+#: actions/editapplication.php:188 actions/newapplication.php:169
 #, fuzzy
-msgid "Name is too long (max 255 characters)."
+msgid "Name is too long (maximum 255 characters)."
 msgstr "Name is too long (max 255 chars)."
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
@@ -1773,7 +1798,7 @@ msgid "Organization is required."
 msgstr "Organisation is required."
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#: actions/editapplication.php:223
+#: actions/editapplication.php:223 actions/newapplication.php:199
 #, fuzzy
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "Organisation is too long (max 255 chars)."
@@ -2566,7 +2591,7 @@ msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Publish a MicroID for my Jabber/GTalk address."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:180
+#: actions/imsettings.php:290 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "Preferences saved."
 
@@ -2689,10 +2714,9 @@ msgstr[1] "You are already subscribed to these users:"
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#. TRANS: Whois output.
-#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:145 actions/invite.php:159 lib/command.php:426
-#, php-format
+#: actions/invite.php:145 actions/invite.php:159
+#, fuzzy, php-format
+msgctxt "INVITE"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
@@ -2876,8 +2900,9 @@ msgid ""
 msgstr ""
 
 #: actions/licenseadminpanel.php:156
-msgid "Invalid license title. Max length is 255 characters."
-msgstr ""
+#, fuzzy
+msgid "Invalid license title. Maximum length is 255 characters."
+msgstr "Location is too long (max 255 chars)."
 
 #: actions/licenseadminpanel.php:168
 msgid "Invalid license URL."
@@ -3048,20 +3073,10 @@ msgstr "You must be logged in to register an application."
 msgid "Use this form to register a new application."
 msgstr "Use this form to register a new application."
 
-#: actions/newapplication.php:169
-#, fuzzy
-msgid "Name is too long (maximum 255 chars)."
-msgstr "Name is too long (max 255 chars)."
-
 #: actions/newapplication.php:184
 msgid "Source URL is required."
 msgstr "Source URL is required."
 
-#: actions/newapplication.php:199
-#, fuzzy
-msgid "Organization is too long (maximum 255 chars)."
-msgstr "Organisation is too long (max 255 chars)."
-
 #: actions/newapplication.php:266 actions/newapplication.php:275
 msgid "Could not create application."
 msgstr "Could not create application."
@@ -3081,14 +3096,14 @@ msgid "New message"
 msgstr "New message"
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:499
+#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501
 msgid "You can't send a message to this user."
 msgstr "You can't send a message to this user."
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
 #: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
-#: lib/command.php:579
+#: lib/command.php:581
 msgid "No content!"
 msgstr "No content!"
 
@@ -3097,7 +3112,7 @@ msgid "No recipient specified."
 msgstr "No recipient specified."
 
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:503
+#: actions/newmessage.php:167 lib/command.php:505
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -3109,12 +3124,12 @@ msgstr "Message sent"
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:511
+#: actions/newmessage.php:188 lib/command.php:513
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Direct message to %s sent."
 
-#: actions/newmessage.php:213 actions/newnotice.php:263
+#: actions/newmessage.php:213 actions/newnotice.php:264
 msgid "Ajax Error"
 msgstr "Ajax Error"
 
@@ -3122,17 +3137,7 @@ msgstr "Ajax Error"
 msgid "New notice"
 msgstr "New notice"
 
-#: actions/newnotice.php:159 lib/mailhandler.php:60
-#, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr "That's too long. Max notice size is %d chars."
-
-#: actions/newnotice.php:183
-#, php-format
-msgid "Max notice size is %d chars, including attachment URL."
-msgstr "Max notice size is %d chars, including attachment URL."
-
-#: actions/newnotice.php:229
+#: actions/newnotice.php:230
 msgid "Notice posted"
 msgstr "Notice posted"
 
@@ -3301,36 +3306,46 @@ msgstr "People Search"
 msgid "Notice Search"
 msgstr "Notice Search"
 
-#: actions/othersettings.php:60
+#: actions/othersettings.php:59
 msgid "Other settings"
 msgstr "Other settings"
 
+#. TRANS: Instructions for tab "Other" in user profile settings.
 #: actions/othersettings.php:71
 msgid "Manage various other options."
 msgstr "Manage various other options."
 
-#: actions/othersettings.php:108
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/othersettings.php:111
 msgid " (free service)"
 msgstr ""
 
-#: actions/othersettings.php:116
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/othersettings.php:120
 msgid "Shorten URLs with"
 msgstr "Shorten URLs with"
 
-#: actions/othersettings.php:117
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/othersettings.php:122
 msgid "Automatic shortening service to use."
 msgstr "Automatic shortening service to use."
 
-#: actions/othersettings.php:122
+#. TRANS: Label for checkbox.
+#: actions/othersettings.php:128
 msgid "View profile designs"
 msgstr "View profile designs"
 
-#: actions/othersettings.php:123
+#. TRANS: Tooltip for checkbox.
+#: actions/othersettings.php:130
 msgid "Show or hide profile designs."
 msgstr "Show or hide profile designs."
 
-#: actions/othersettings.php:153
-msgid "URL shortening service is too long (max 50 chars)."
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/othersettings.php:162
+#, fuzzy
+msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "URL shortening service is too long (max 50 chars)."
 
 #: actions/otp.php:69
@@ -3808,7 +3823,7 @@ msgstr "Bio"
 #. TRANS: Label for group location (dt). Text hidden by default.
 #: actions/profilesettings.php:149 actions/register.php:485
 #: actions/showgroup.php:267 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:177
+#: actions/userauthorization.php:166 lib/groupeditform.php:180
 #: lib/userprofile.php:165
 msgid "Location"
 msgstr "Location"
@@ -4146,7 +4161,8 @@ msgid "Unexpected password reset."
 msgstr "Unexpected password reset."
 
 #: actions/recoverpassword.php:365
-msgid "Password must be 6 chars or more."
+#, fuzzy
+msgid "Password must be 6 characters or more."
 msgstr "Password must be 6 chars or more."
 
 #: actions/recoverpassword.php:369
@@ -4513,7 +4529,7 @@ msgstr "Organization"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:172
+#: lib/applicationeditform.php:208 lib/groupeditform.php:175
 msgid "Description"
 msgstr "Description"
 
@@ -4662,7 +4678,7 @@ msgid "Note"
 msgstr "Note"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:298 lib/groupeditform.php:184
+#: actions/showgroup.php:298 lib/groupeditform.php:187
 msgid "Aliases"
 msgstr ""
 
@@ -4794,53 +4810,75 @@ msgstr "Message from %1$s on %2$s"
 msgid "Notice deleted."
 msgstr "Notice deleted."
 
-#: actions/showstream.php:72
-#, php-format
-msgid " tagged %s"
-msgstr " tagged %s"
+#. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
+#: actions/showstream.php:70
+#, fuzzy, php-format
+msgid "%1$s tagged %2$s"
+msgstr "%1$s, page %2$d"
 
-#: actions/showstream.php:78
+#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#: actions/showstream.php:74
+#, fuzzy, php-format
+msgid "%1$s tagged %2$s, page %3$d"
+msgstr "Notices tagged with %1$s, page %2$d"
+
+#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$d is the page number.
+#: actions/showstream.php:82
 #, php-format
 msgid "%1$s, page %2$d"
 msgstr "%1$s, page %2$d"
 
-#: actions/showstream.php:120
+#. TRANS: Title for link to notice feed.
+#. TRANS: %1$s is a user nickname, %2$s is a hashtag.
+#: actions/showstream.php:127
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 
-#: actions/showstream.php:127
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:136
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "Notice feed for %s (RSS 1.0)"
 
-#: actions/showstream.php:134
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:145
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "Notice feed for %s (RSS 2.0)"
 
-#: actions/showstream.php:141
+#: actions/showstream.php:152
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "Notice feed for %s (Atom)"
 
-#: actions/showstream.php:146
+#. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
+#. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
+#: actions/showstream.php:159
 #, php-format
 msgid "FOAF for %s"
 msgstr "FOAF for %s"
 
-#: actions/showstream.php:197
-#, php-format
-msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
+#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
+#: actions/showstream.php:211
+#, fuzzy, php-format
+msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr "This is the timeline for %1$s but %2$s hasn't posted anything yet."
 
-#: actions/showstream.php:202
+#. TRANS: Second sentence of empty list message for a stream for the user themselves.
+#: actions/showstream.php:217
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
 msgstr ""
 
-#: actions/showstream.php:204
+#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:221
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -4849,7 +4887,9 @@ msgstr ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
 "%?status_textarea=%2$s)."
 
-#: actions/showstream.php:243
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:264
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4862,7 +4902,9 @@ msgstr ""
 "[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to "
 "follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
 
-#: actions/showstream.php:248
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:271
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4873,7 +4915,8 @@ msgstr ""
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
 "[StatusNet](http://status.net/) tool. "
 
-#: actions/showstream.php:305
+#. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
+#: actions/showstream.php:328
 #, php-format
 msgid "Repeat of %s"
 msgstr "Repeat of %s"
@@ -4983,31 +5026,38 @@ msgstr ""
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:56
+#. TRANS: Page title for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:55
 msgid "Site Notice"
 msgstr "Site Notice"
 
-#: actions/sitenoticeadminpanel.php:67
+#. TRANS: Instructions for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:66
 msgid "Edit site-wide message"
 msgstr "Edit site-wide message"
 
-#: actions/sitenoticeadminpanel.php:103
+#. TRANS: Server error displayed when saving a site-wide notice was impossible.
+#: actions/sitenoticeadminpanel.php:101
 msgid "Unable to save site notice."
 msgstr "Unable to save site notice."
 
-#: actions/sitenoticeadminpanel.php:113
-msgid "Max length for the site-wide notice is 255 chars."
+#. TRANS: Client error displayed when a site-wide notice was longer than allowed.
+#: actions/sitenoticeadminpanel.php:112
+msgid "Maximum length for the site-wide notice is 255 characters."
 msgstr ""
 
+#. TRANS: Label for site-wide notice text field in admin panel.
 #: actions/sitenoticeadminpanel.php:176
 msgid "Site notice text"
 msgstr "Site notice text"
 
-#: actions/sitenoticeadminpanel.php:178
-msgid "Site-wide notice text (255 chars max; HTML okay)"
+#. TRANS: Tooltip for site-wide notice text field in admin panel.
+#: actions/sitenoticeadminpanel.php:179
+msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:198
+#. TRANS: Title for button to save site notice in admin panel.
+#: actions/sitenoticeadminpanel.php:201
 msgid "Save site notice"
 msgstr "Save site notice"
 
@@ -5463,75 +5513,92 @@ msgstr ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
 
 #. TRANS: User admin panel title
-#: actions/useradminpanel.php:60
+#: actions/useradminpanel.php:58
 msgctxt "TITLE"
 msgid "User"
 msgstr "User"
 
-#: actions/useradminpanel.php:71
+#. TRANS: Instruction for user admin panel.
+#: actions/useradminpanel.php:69
 msgid "User settings for this StatusNet site"
 msgstr ""
 
-#: actions/useradminpanel.php:150
+#. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
+#: actions/useradminpanel.php:147
 msgid "Invalid bio limit. Must be numeric."
 msgstr ""
 
-#: actions/useradminpanel.php:156
-msgid "Invalid welcome text. Max length is 255 characters."
+#. TRANS: Form validation error in user admin panel when welcome text is too long.
+#: actions/useradminpanel.php:154
+msgid "Invalid welcome text. Maximum length is 255 characters."
 msgstr ""
 
+#. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
+#. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
 #, php-format
-msgid "Invalid default subscripton: '%1$s' is not user."
+msgid "Invalid default subscripton: '%1$s' is not a user."
 msgstr ""
 
 #. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:106
+#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
 #: lib/personalgroupnav.php:109
 msgid "Profile"
 msgstr "Profile"
 
-#: actions/useradminpanel.php:223
+#. TRANS: Field label in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:220
 msgid "Bio Limit"
 msgstr ""
 
-#: actions/useradminpanel.php:224
+#. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:222
 msgid "Maximum length of a profile bio in characters."
 msgstr ""
 
-#: actions/useradminpanel.php:232
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:231
 msgid "New users"
 msgstr "New users"
 
+#. TRANS: Field label in user admin panel for setting new user welcome text.
 #: actions/useradminpanel.php:236
 msgid "New user welcome"
 msgstr "New user welcome"
 
-#: actions/useradminpanel.php:237
-msgid "Welcome text for new users (Max 255 chars)."
+#. TRANS: Tooltip in user admin panel for setting new user welcome text.
+#: actions/useradminpanel.php:238
+#, fuzzy
+msgid "Welcome text for new users (maximum 255 characters)."
 msgstr "Welcome text for new users (maximum 255 characters)."
 
-#: actions/useradminpanel.php:242
+#. TRANS: Field label in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:244
 msgid "Default subscription"
 msgstr "Default subscription"
 
-#: actions/useradminpanel.php:243
+#. TRANS: Tooltip in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:246
 msgid "Automatically subscribe new users to this user."
 msgstr "Automatically subscribe new users to this user."
 
-#: actions/useradminpanel.php:252
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:256
 msgid "Invitations"
 msgstr "Invitations"
 
-#: actions/useradminpanel.php:257
+#. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:262
 msgid "Invitations enabled"
 msgstr "Invitations enabled"
 
-#: actions/useradminpanel.php:259
+#. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:265
 msgid "Whether to allow users to invite new users."
 msgstr ""
 
-#: actions/useradminpanel.php:295
+#. TRANS: Title for button to save user settings in user admin panel.
+#: actions/useradminpanel.php:302
 msgid "Save user settings"
 msgstr ""
 
@@ -5740,7 +5807,7 @@ msgid "Plugins"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:831
+#: actions/version.php:198 lib/action.php:880
 msgid "Version"
 msgstr "Version"
 
@@ -5946,16 +6013,23 @@ msgstr "Could not save reply for %1$d, %2$d."
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
+#. TRANS: Full name of a profile or group followed by nickname in parens
+#: classes/Profile.php:164
+#, fuzzy, php-format
+msgctxt "FANCYNAME"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:791
+#: classes/Profile.php:812
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:800
+#: classes/Profile.php:821
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6100,194 +6174,201 @@ msgstr "%1$s - %2$s"
 msgid "Untitled page"
 msgstr "Untitled page"
 
+#. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
+#: lib/action.php:310
+msgctxt "TOOLTIP"
+msgid "Show more"
+msgstr ""
+
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:477
+#: lib/action.php:526
 msgid "Primary site navigation"
 msgstr "Primary site navigation"
 
 #. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:483
+#: lib/action.php:532
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "Personal profile and friends timeline"
 
 #. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:486
+#: lib/action.php:535
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Personal"
 
 #. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:488
+#: lib/action.php:537
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
 msgstr "Change your email, avatar, password, profile"
 
 #. TRANS: Main menu option when logged in for access to user settings
-#: lib/action.php:491
+#: lib/action.php:540
 msgid "Account"
 msgstr "Account"
 
 #. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:493
+#: lib/action.php:542
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "Connect to services"
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:496
+#: lib/action.php:545
 msgid "Connect"
 msgstr "Connect"
 
 #. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:499
+#: lib/action.php:548
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "Change site configuration"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:502 lib/groupnav.php:117
+#: lib/action.php:551 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Admin"
 
 #. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:506
+#: lib/action.php:555
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Invite friends and colleagues to join you on %s"
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:509
+#: lib/action.php:558
 msgctxt "MENU"
 msgid "Invite"
 msgstr "Invite"
 
 #. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:515
+#: lib/action.php:564
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "Logout from the site"
 
 #. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:518
+#: lib/action.php:567
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Logout"
 
 #. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:523
+#: lib/action.php:572
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "Create an account"
 
 #. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:526
+#: lib/action.php:575
 msgctxt "MENU"
 msgid "Register"
 msgstr "Register"
 
 #. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:529
+#: lib/action.php:578
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "Login to the site"
 
 #. TRANS: Main menu option when not logged in to log in
-#: lib/action.php:532
+#: lib/action.php:581
 msgctxt "MENU"
 msgid "Login"
 msgstr "Login"
 
 #. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:535
+#: lib/action.php:584
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Help me!"
 
 #. TRANS: Main menu option for help on the StatusNet site
-#: lib/action.php:538
+#: lib/action.php:587
 msgctxt "MENU"
 msgid "Help"
 msgstr "Help"
 
 #. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:541
+#: lib/action.php:590
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr "Search for people or text"
 
 #. TRANS: Main menu option when logged in or when the StatusNet instance is not private
-#: lib/action.php:544
+#: lib/action.php:593
 msgctxt "MENU"
 msgid "Search"
 msgstr "Search"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:566 lib/adminpanelaction.php:387
+#: lib/action.php:615 lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "Site notice"
 
 #. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:633
+#: lib/action.php:682
 msgid "Local views"
 msgstr "Local views"
 
 #. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:703
+#: lib/action.php:752
 msgid "Page notice"
 msgstr "Page notice"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:804
+#: lib/action.php:853
 msgid "Secondary site navigation"
 msgstr "Secondary site navigation"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:810
+#: lib/action.php:859
 msgid "Help"
 msgstr "Help"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:813
+#: lib/action.php:862
 msgid "About"
 msgstr "About"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:816
+#: lib/action.php:865
 msgid "FAQ"
 msgstr "F.A.Q."
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:821
+#: lib/action.php:870
 msgid "TOS"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:825
+#: lib/action.php:874
 msgid "Privacy"
 msgstr "Privacy"
 
-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:828
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+#: lib/action.php:877
 msgid "Source"
 msgstr "Source"
 
-#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:834
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+#: lib/action.php:884
 msgid "Contact"
 msgstr "Contact"
 
-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:837
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+#: lib/action.php:887
 msgid "Badge"
 msgstr "Badge"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:866
+#: lib/action.php:916
 msgid "StatusNet software license"
 msgstr "StatusNet software licence"
 
@@ -6295,7 +6376,7 @@ msgstr "StatusNet software licence"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:873
+#: lib/action.php:923
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -6305,7 +6386,7 @@ msgstr ""
 "broughtby%%](%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:876
+#: lib/action.php:926
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** is a microblogging service."
@@ -6314,7 +6395,7 @@ msgstr "**%%site.name%%** is a microblogging service."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:883
+#: lib/action.php:933
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -6326,50 +6407,50 @@ msgstr ""
 "org/licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:899
+#: lib/action.php:949
 msgid "Site content license"
 msgstr "Site content licence"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:906
+#: lib/action.php:956
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:913
+#: lib/action.php:963
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:917
+#: lib/action.php:967
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:949
+#: lib/action.php:999
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr "All %1$s content and data are available under the %2$s licence."
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1285
+#: lib/action.php:1335
 msgid "Pagination"
 msgstr "Pagination"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1296
+#: lib/action.php:1346
 msgid "After"
 msgstr "After"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1306
+#: lib/action.php:1356
 msgid "Before"
 msgstr "Before"
 
@@ -6709,7 +6790,7 @@ msgid "AJAX error"
 msgstr "AJAX error"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:233 lib/mailhandler.php:142
+#: lib/channel.php:233 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "Command complete"
 
@@ -6725,7 +6806,7 @@ msgstr "Notice with that id does not exist."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:626
+#: lib/command.php:99 lib/command.php:630
 msgid "User has no last notice."
 msgstr "User has no last notice."
 
@@ -6791,6 +6872,14 @@ msgstr ""
 msgid "%1$s left group %2$s."
 msgstr ""
 
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: lib/command.php:426
+#, fuzzy, php-format
+msgctxt "WHOIS"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
 #. TRANS: Whois output. %s is the full name of the queried user.
 #: lib/command.php:430
 #, php-format
@@ -6828,133 +6917,137 @@ msgid ""
 "same server."
 msgstr ""
 
-#. TRANS: Message given if content is too long.
+#. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
 #: lib/command.php:488
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr "Message too long - maximum is %1$d characters, you sent %2$d."
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr[1] "Message too long - maximum is %1$d characters, you sent %2$d."
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:514
+#: lib/command.php:516
 msgid "Error sending direct message."
 msgstr "Error sending direct message."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:551
+#: lib/command.php:553
 #, php-format
 msgid "Notice from %s repeated."
 msgstr "Notice from %s repeated."
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:554
+#: lib/command.php:556
 msgid "Error repeating notice."
 msgstr "Error repeating notice."
 
-#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:589
-#, php-format
-msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
-msgstr "Notice too long - maximum is %1$d characters, you sent %2$d."
+#: lib/command.php:591
+#, fuzzy, php-format
+msgid "Notice too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] "Notice too long - maximum is %1$d characters, you sent %2$d."
+msgstr[1] "Notice too long - maximum is %1$d characters, you sent %2$d."
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:600
+#: lib/command.php:604
 #, php-format
 msgid "Reply to %s sent."
 msgstr "Reply to %s sent."
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:603
+#: lib/command.php:607
 msgid "Error saving notice."
 msgstr "Error saving notice."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:650
+#: lib/command.php:654
 msgid "Specify the name of the user to subscribe to."
 msgstr "Specify the name of the user to subscribe to."
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:659
+#: lib/command.php:663
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Can't subscribe to OMB profiles by command."
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:667
+#: lib/command.php:671
 #, php-format
 msgid "Subscribed to %s."
 msgstr ""
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:688 lib/command.php:799
+#: lib/command.php:692 lib/command.php:803
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "Specify the name of the user to unsubscribe from."
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:699
+#: lib/command.php:703
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:719 lib/command.php:745
+#: lib/command.php:723 lib/command.php:749
 msgid "Command not yet implemented."
 msgstr "Command not yet implemented."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:723
+#: lib/command.php:727
 msgid "Notification off."
 msgstr "Notification off."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:726
+#: lib/command.php:730
 msgid "Can't turn off notification."
 msgstr "Can't turn off notification."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:749
+#: lib/command.php:753
 msgid "Notification on."
 msgstr "Notification on."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:752
+#: lib/command.php:756
 msgid "Can't turn on notification."
 msgstr "Can't turn on notification."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:766
+#: lib/command.php:770
 msgid "Login command is disabled."
 msgstr ""
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:779
+#: lib/command.php:783
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:808
+#: lib/command.php:812
 #, php-format
 msgid "Unsubscribed %s."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:826
+#: lib/command.php:830
 msgid "You are not subscribed to anyone."
 msgstr "You are not subscribed to anyone."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:831
+#: lib/command.php:835
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "You are subscribed to this person:"
@@ -6962,14 +7055,14 @@ msgstr[1] "You are subscribed to these people:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:853
+#: lib/command.php:857
 msgid "No one is subscribed to you."
 msgstr "No one is subscribed to you."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:858
+#: lib/command.php:862
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "This person is subscribed to you:"
@@ -6977,21 +7070,21 @@ msgstr[1] "These people are subscribed to you:"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:880
+#: lib/command.php:884
 msgid "You are not a member of any groups."
 msgstr "You are not a member of any groups."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:885
+#: lib/command.php:889
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "You are a member of this group:"
 msgstr[1] "You are a member of these groups:"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:900
+#: lib/command.php:904
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -7218,7 +7311,8 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 lowercase letters or numbers, no punctuation or spaces"
 
 #: lib/groupeditform.php:163
-msgid "URL of the homepage or blog of the group or topic"
+#, fuzzy
+msgid "URL of the homepage or blog of the group or topic."
 msgstr "URL of the homepage or blog of the group or topic"
 
 #: lib/groupeditform.php:168
@@ -7226,20 +7320,29 @@ msgid "Describe the group or topic"
 msgstr "Describe the group or topic"
 
 #: lib/groupeditform.php:170
-#, php-format
-msgid "Describe the group or topic in %d characters"
-msgstr "Describe the group or topic in %d characters"
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d character or less"
+msgid_plural "Describe the group or topic in %d characters or less"
+msgstr[0] "Describe the group or topic in %d characters"
+msgstr[1] "Describe the group or topic in %d characters"
 
-#: lib/groupeditform.php:179
+#: lib/groupeditform.php:182
+#, fuzzy
 msgid ""
-"Location for the group, if any, like \"City, State (or Region), Country\""
+"Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr ""
 "Location for the group, if any, like \"City, State (or Region), Country\""
 
-#: lib/groupeditform.php:187
+#: lib/groupeditform.php:190
 #, php-format
-msgid "Extra nicknames for the group, comma- or space- separated, max %d"
-msgstr ""
+msgid ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"alias allowed."
+msgid_plural ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"aliases allowed."
+msgstr[0] ""
+msgstr[1] ""
 
 #. TRANS: Menu item in the group navigation page.
 #: lib/groupnav.php:86
@@ -7709,7 +7812,7 @@ msgstr "Sorry, that is not your incoming e-mail address."
 msgid "Sorry, no incoming email allowed."
 msgstr "Sorry, no incoming e-mail allowed."
 
-#: lib/mailhandler.php:228
+#: lib/mailhandler.php:229
 #, php-format
 msgid "Unsupported message type: %s"
 msgstr "Unsupported message type: %s"
@@ -8050,16 +8153,17 @@ msgid "Sandbox this user"
 msgstr "Sandbox this user"
 
 #. TRANS: Fieldset legend for the search form.
-#: lib/searchaction.php:121
+#: lib/searchaction.php:120
 msgid "Search site"
 msgstr "Search site"
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
-#: lib/searchaction.php:129
+#: lib/searchaction.php:128
 msgid "Keyword(s)"
 msgstr ""
 
+#. TRANS: Button text for searching site.
 #: lib/searchaction.php:130
 msgctxt "BUTTON"
 msgid "Search"
@@ -8149,8 +8253,8 @@ msgid "The theme file is missing or the upload failed."
 msgstr ""
 
 #: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:278 lib/themeuploader.php:282
-#: lib/themeuploader.php:290 lib/themeuploader.php:297
+#: lib/themeuploader.php:279 lib/themeuploader.php:283
+#: lib/themeuploader.php:291 lib/themeuploader.php:298
 msgid "Failed saving theme."
 msgstr "Failed saving theme."
 
@@ -8160,29 +8264,32 @@ msgstr ""
 
 #: lib/themeuploader.php:166
 #, php-format
-msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
-msgstr ""
+msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
+msgid_plural ""
+"Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr[0] ""
+msgstr[1] ""
 
-#: lib/themeuploader.php:178
+#: lib/themeuploader.php:179
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr ""
 
-#: lib/themeuploader.php:218
+#: lib/themeuploader.php:219
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
 msgstr ""
 
-#: lib/themeuploader.php:224
+#: lib/themeuploader.php:225
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr ""
 
-#: lib/themeuploader.php:241
+#: lib/themeuploader.php:242
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr ""
 
-#: lib/themeuploader.php:259
+#: lib/themeuploader.php:260
 msgid "Error opening theme archive."
 msgstr "Error opening theme archive."
 
@@ -8363,22 +8470,38 @@ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
 msgstr[0] "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr[1] "Message too long - maximum is %1$d characters, you sent %2$d."
 
-#: scripts/restoreuser.php:82
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: scripts/restoreuser.php:61
 #, php-format
-msgid "Backup file for user %s (%s)"
+msgid "Getting backup from file '%s'."
 msgstr ""
 
-#: scripts/restoreuser.php:88
+#. TRANS: Commandline script output.
+#: scripts/restoreuser.php:91
 msgid "No user specified; using backup user."
 msgstr "No user specified; using backup user."
 
-#: scripts/restoreuser.php:94
+#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
+#: scripts/restoreuser.php:98
 #, php-format
-msgid "%d entries in backup."
-msgstr ""
+msgid "%d entry in backup."
+msgid_plural "%d entries in backup."
+msgstr[0] ""
+msgstr[1] ""
+
+#, fuzzy
+#~ msgid "Name is too long (maximum 255 chars)."
+#~ msgstr "Name is too long (max 255 chars)."
+
+#, fuzzy
+#~ msgid "Organization is too long (maximum 255 chars)."
+#~ msgstr "Organisation is too long (max 255 chars)."
+
+#~ msgid "That's too long. Max notice size is %d chars."
+#~ msgstr "That's too long. Max notice size is %d chars."
 
-#~ msgid "Description is too long (max %d chars)."
-#~ msgstr "Description is too long (max %d chars)"
+#~ msgid "Max notice size is %d chars, including attachment URL."
+#~ msgstr "Max notice size is %d chars, including attachment URL."
 
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "Too many aliases! Maximum %d."
+#~ msgid " tagged %s"
+#~ msgstr " tagged %s"
diff --git a/locale/eo/LC_MESSAGES/statusnet.po b/locale/eo/LC_MESSAGES/statusnet.po
index bb8b01638..10bb52471 100644
--- a/locale/eo/LC_MESSAGES/statusnet.po
+++ b/locale/eo/LC_MESSAGES/statusnet.po
@@ -15,17 +15,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-30 23:18+0000\n"
-"PO-Revision-Date: 2010-10-30 23:20:06+0000\n"
+"POT-Creation-Date: 2010-11-02 22:51+0000\n"
+"PO-Revision-Date: 2010-11-02 22:53:13+0000\n"
 "Language-Team: Esperanto <http://translatewiki.net/wiki/Portal:eo>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r75708); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r75875); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: eo\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2010-10-30 09:48:40+0000\n"
+"X-POT-Import-Date: 2010-10-30 23:42:01+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -82,15 +82,20 @@ msgstr "Konservu atingan agordon"
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
+#. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
+#. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #: actions/accessadminpanel.php:193 actions/emailsettings.php:228
-#: actions/imsettings.php:187 actions/pathsadminpanel.php:512
-#: actions/profilesettings.php:201 actions/smssettings.php:209
-#: actions/subscriptions.php:246 lib/applicationeditform.php:355
+#: actions/imsettings.php:187 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: lib/applicationeditform.php:355 lib/groupeditform.php:207
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Konservu"
@@ -141,7 +146,7 @@ msgstr "Ne estas tiu paĝo."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:495 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Ne ekzistas tiu uzanto."
@@ -213,7 +218,9 @@ msgstr ""
 
 #. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:208
+#. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -568,8 +575,11 @@ msgstr "Plennomo estas tro longa (maksimume 255 literoj)"
 #. TRANS: Group edit form validation error.
 #. TRANS: Form validation error in New application form.
 #. TRANS: %d is the maximum number of characters for the description.
+#. TRANS: Group create form validation error.
+#. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:220 actions/editapplication.php:201
 #: actions/editgroup.php:216 actions/newapplication.php:178
+#: actions/newgroup.php:152
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -727,14 +737,14 @@ msgstr "Vi ne estas rajtigita."
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:172 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:74
 #: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
 #: actions/groupunblock.php:65 actions/imsettings.php:230
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
-#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/othersettings.php:153 actions/passwordsettings.php:138
 #: actions/profilesettings.php:221 actions/recoverpassword.php:350
 #: actions/register.php:172 actions/remotesubscribe.php:77
 #: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
@@ -913,20 +923,21 @@ msgstr "Vi ne povas forigi la staton de alia uzanto."
 
 #. TRANS: Client error displayed trying to repeat a non-existing notice through the API.
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
+#. TRANS: Error message displayed trying to delete a non-existing notice.
 #: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/deletenotice.php:58 actions/shownotice.php:92
+#: actions/deletenotice.php:61 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "Ne estas tiu avizo."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:535
+#: actions/apistatusesretweet.php:83 lib/command.php:537
 msgid "Cannot repeat your own notice."
 msgstr "Vi ne povas ripeti vian propran avizon."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:541
+#: actions/apistatusesretweet.php:92 lib/command.php:543
 msgid "Already repeated that notice."
 msgstr "La avizo jam ripetiĝis."
 
@@ -947,7 +958,8 @@ msgstr "Kliento devas providi al \"stato\"-parametro valoron."
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#: actions/apistatusesupdate.php:244
+#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
+#: lib/mailhandler.php:60
 #, fuzzy, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
@@ -962,7 +974,7 @@ msgstr "Metodo de API ne troviĝas."
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
-#: actions/apistatusesupdate.php:308
+#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
 #, fuzzy, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
@@ -1175,17 +1187,18 @@ msgstr "Elektu kvadratan parton de la bildo kiel via vizaĝbildo"
 msgid "Lost our file data."
 msgstr "Perdiĝis nia dosiera datumo."
 
-#: actions/avatarsettings.php:384
+#. TRANS: Success message for having updated a user avatar.
+#: actions/avatarsettings.php:385
 msgid "Avatar updated."
 msgstr "Vizaĝbildo ĝisdatigita."
 
 #. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
-#: actions/avatarsettings.php:388
+#: actions/avatarsettings.php:389
 msgid "Failed updating avatar."
 msgstr "Eraris ĝisdatigi vizaĝbildon."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:412
+#: actions/avatarsettings.php:413
 msgid "Avatar deleted."
 msgstr "Vizaĝbildo forigita."
 
@@ -1216,8 +1229,8 @@ msgstr ""
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:154 actions/deleteapplication.php:154
-#: actions/deletegroup.php:220 actions/deletenotice.php:150
+#: actions/block.php:154 actions/deleteapplication.php:157
+#: actions/deletegroup.php:220 actions/deletenotice.php:155
 #: actions/deleteuser.php:152 actions/groupblock.php:178
 msgctxt "BUTTON"
 msgid "No"
@@ -1235,8 +1248,8 @@ msgstr "Ne bloki la uzanton"
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:161 actions/deleteapplication.php:161
-#: actions/deletegroup.php:227 actions/deletenotice.php:157
+#: actions/block.php:161 actions/deleteapplication.php:164
+#: actions/deletegroup.php:227 actions/deletenotice.php:162
 #: actions/deleteuser.php:159 actions/groupblock.php:185
 msgctxt "BUTTON"
 msgid "Yes"
@@ -1353,12 +1366,13 @@ msgstr "La adreso jam estis konfirmita."
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
 #. TRANS: Server error thrown on database error updating IM preferences.
 #. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
 #. TRANS: Server error thrown when user profile settings could not be updated.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #: actions/confirmaddress.php:118 actions/emailsettings.php:331
 #: actions/emailsettings.php:477 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:174
+#: actions/imsettings.php:442 actions/othersettings.php:184
 #: actions/profilesettings.php:326 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
@@ -1394,16 +1408,19 @@ msgstr "Konversacio"
 msgid "Notices"
 msgstr "Avizoj"
 
-#: actions/deleteapplication.php:63
+#. TRANS: Client error displayed trying to delete an application while not logged in.
+#: actions/deleteapplication.php:62
 msgid "You must be logged in to delete an application."
 msgstr "Ensalutu por forigi la aplikaĵon."
 
+#. TRANS: Client error displayed trying to delete an application that does not exist.
 #: actions/deleteapplication.php:71
 msgid "Application not found."
 msgstr "Aplikaĵo ne trovita."
 
+#. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
-#: actions/deleteapplication.php:78 actions/editapplication.php:78
+#: actions/deleteapplication.php:79 actions/editapplication.php:78
 #: actions/showapplication.php:94
 msgid "You are not the owner of this application."
 msgstr "Vi ne estas la posedanto de ĉi tiu aplikaĵo."
@@ -1411,15 +1428,18 @@ msgstr "Vi ne estas la posedanto de ĉi tiu aplikaĵo."
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
 #: actions/newapplication.php:114 actions/showapplication.php:118
-#: lib/action.php:1354
+#: lib/action.php:1404
 msgid "There was a problem with your session token."
 msgstr "Problemo okazas pri via seancĵetono."
 
-#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+#. TRANS: Title for delete application page.
+#. TRANS: Fieldset legend on delete application page.
+#: actions/deleteapplication.php:124 actions/deleteapplication.php:149
 msgid "Delete application"
 msgstr "Forigi aplikaĵon"
 
-#: actions/deleteapplication.php:149
+#. TRANS: Confirmation text on delete application page.
+#: actions/deleteapplication.php:152
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
 "about the application from the database, including all existing user "
@@ -1429,12 +1449,12 @@ msgstr ""
 "la datumbazo, inkluzive de ĉiu ekzistanta uzanto-konekto."
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:158
+#: actions/deleteapplication.php:161
 msgid "Do not delete this application"
 msgstr "Ne forigu ĉi tiun aplikaĵon."
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:164
+#: actions/deleteapplication.php:167
 msgid "Delete this application"
 msgstr "Viŝi ĉi tiun aplikon"
 
@@ -1470,13 +1490,14 @@ msgstr "Malsukcesis ĝisdatigi grupon."
 msgid "Deleted group %s"
 msgstr "%1$s eksaniĝis de grupo %2$s"
 
-#. TRANS: Title.
+#. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
 #: actions/deletegroup.php:176 actions/deletegroup.php:202
 #, fuzzy
 msgid "Delete group"
 msgstr "Forigi uzanton"
 
+#. TRANS: Warning in form for deleleting a group.
 #: actions/deletegroup.php:206
 #, fuzzy
 msgid ""
@@ -1499,10 +1520,11 @@ msgstr "Ne forigi la avizon"
 msgid "Delete this group"
 msgstr "Forigi la uzanton"
 
+#. TRANS: Error message displayed trying to delete a notice while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1512,32 +1534,37 @@ msgstr "Forigi la uzanton"
 msgid "Not logged in."
 msgstr "Ne konektita."
 
-#: actions/deletenotice.php:74
+#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
+#: actions/deletenotice.php:78
 msgid "Can't delete this notice."
 msgstr "Ne povas forigi ĉi tiun avizon."
 
-#: actions/deletenotice.php:106
+#. TRANS: Instructions for deleting a notice.
+#: actions/deletenotice.php:110
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
 msgstr ""
 "Vi nun por ĉiam forigos avizon. Kiam tio fariĝos, ne plu eblos malfari tion."
 
-#: actions/deletenotice.php:112 actions/deletenotice.php:144
+#. TRANS: Page title when deleting a notice.
+#. TRANS: Fieldset legend for the delete notice form.
+#: actions/deletenotice.php:117 actions/deletenotice.php:148
 msgid "Delete notice"
 msgstr "Forigi avizon"
 
-#: actions/deletenotice.php:147
+#. TRANS: Message for the delete notice form.
+#: actions/deletenotice.php:152
 msgid "Are you sure you want to delete this notice?"
 msgstr "Ĉu vi certe volas forigi la avizon?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:154
+#: actions/deletenotice.php:159
 msgid "Do not delete this notice"
 msgstr "Ne forigi la avizon"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:161 lib/noticelist.php:667
+#: actions/deletenotice.php:166 lib/noticelist.php:667
 msgid "Delete this notice"
 msgstr "Forigi la avizon"
 
@@ -1699,11 +1726,9 @@ msgstr "Redefaŭltiĝi"
 
 #. TRANS: Submit button title.
 #: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
-#: actions/othersettings.php:126 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: actions/useradminpanel.php:295 lib/applicationeditform.php:357
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: lib/applicationeditform.php:357 lib/designsettings.php:256
 msgid "Save"
 msgstr "Konservi"
 
@@ -1751,9 +1776,9 @@ msgid "Name is required."
 msgstr "Nomo necesas."
 
 #. TRANS: Validation error shown when providing too long a name in the "Edit application" form.
-#: actions/editapplication.php:188
+#: actions/editapplication.php:188 actions/newapplication.php:169
 #, fuzzy
-msgid "Name is too long (max 255 characters)."
+msgid "Name is too long (maximum 255 characters)."
 msgstr "La nomo estas tro longa (maksimume 255 literoj)"
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
@@ -1782,7 +1807,7 @@ msgid "Organization is required."
 msgstr "Organizo necesas."
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#: actions/editapplication.php:223
+#: actions/editapplication.php:223 actions/newapplication.php:199
 #, fuzzy
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "Organizonomo estas tro longa (maksimume 255 literoj)."
@@ -2571,7 +2596,7 @@ msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Publikigu MikroID por mia Jabber/GTalk-adreso."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:180
+#: actions/imsettings.php:290 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "Prefero konservita."
 
@@ -2695,10 +2720,9 @@ msgstr[1] "Vi jam abonas jenajn uzantojn:"
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#. TRANS: Whois output.
-#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:145 actions/invite.php:159 lib/command.php:426
-#, php-format
+#: actions/invite.php:145 actions/invite.php:159
+#, fuzzy, php-format
+msgctxt "INVITE"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
@@ -2878,7 +2902,8 @@ msgid ""
 msgstr ""
 
 #: actions/licenseadminpanel.php:156
-msgid "Invalid license title. Max length is 255 characters."
+#, fuzzy
+msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "Nevalida permesila titolo. La longlimo estas 255 literoj."
 
 #: actions/licenseadminpanel.php:168
@@ -3049,20 +3074,10 @@ msgstr "Ensalutu por registri aplikaĵon."
 msgid "Use this form to register a new application."
 msgstr "Uzu ĉi tiun formularon por registri novan aplikaĵon."
 
-#: actions/newapplication.php:169
-#, fuzzy
-msgid "Name is too long (maximum 255 chars)."
-msgstr "La nomo estas tro longa (maksimume 255 literoj)"
-
 #: actions/newapplication.php:184
 msgid "Source URL is required."
 msgstr "Fonta URL bezonata."
 
-#: actions/newapplication.php:199
-#, fuzzy
-msgid "Organization is too long (maximum 255 chars)."
-msgstr "Organizonomo estas tro longa (maksimume 255 literoj)."
-
 #: actions/newapplication.php:266 actions/newapplication.php:275
 msgid "Could not create application."
 msgstr "Malsukcesis krei aplikaĵon."
@@ -3082,14 +3097,14 @@ msgid "New message"
 msgstr "Nova mesaĝo"
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:499
+#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501
 msgid "You can't send a message to this user."
 msgstr "Vi ne povas sendi mesaĝon al la uzanto."
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
 #: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
-#: lib/command.php:579
+#: lib/command.php:581
 msgid "No content!"
 msgstr "Neniu enhavo!"
 
@@ -3098,7 +3113,7 @@ msgid "No recipient specified."
 msgstr "Neniu ricevonto speifiĝas."
 
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:503
+#: actions/newmessage.php:167 lib/command.php:505
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "Ne sendu mesaĝon al vi mem! Simple suspiru anstataŭ."
@@ -3109,12 +3124,12 @@ msgstr "Mesaĝo sendita"
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:511
+#: actions/newmessage.php:188 lib/command.php:513
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Rekta mesaĝo al %s sendiĝis."
 
-#: actions/newmessage.php:213 actions/newnotice.php:263
+#: actions/newmessage.php:213 actions/newnotice.php:264
 msgid "Ajax Error"
 msgstr "Eraro de Ajax"
 
@@ -3122,17 +3137,7 @@ msgstr "Eraro de Ajax"
 msgid "New notice"
 msgstr "Nova avizo"
 
-#: actions/newnotice.php:159 lib/mailhandler.php:60
-#, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr "Tro longas. Longlimo por avizo estas %d signoj."
-
-#: actions/newnotice.php:183
-#, php-format
-msgid "Max notice size is %d chars, including attachment URL."
-msgstr "Longlimo por avizo estas %d signoj, enkalkulante ankaŭ la retadresojn."
-
-#: actions/newnotice.php:229
+#: actions/newnotice.php:230
 msgid "Notice posted"
 msgstr "Avizo afiŝiĝas"
 
@@ -3301,36 +3306,46 @@ msgstr "Homserĉo"
 msgid "Notice Search"
 msgstr "Avizoserĉo"
 
-#: actions/othersettings.php:60
+#: actions/othersettings.php:59
 msgid "Other settings"
 msgstr "Aliaj agordoj"
 
+#. TRANS: Instructions for tab "Other" in user profile settings.
 #: actions/othersettings.php:71
 msgid "Manage various other options."
 msgstr "Agordi diversajn aliajn elektojn."
 
-#: actions/othersettings.php:108
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/othersettings.php:111
 msgid " (free service)"
 msgstr " (Senpaga servo)"
 
-#: actions/othersettings.php:116
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/othersettings.php:120
 msgid "Shorten URLs with"
 msgstr "Mallongigu URLojn per"
 
-#: actions/othersettings.php:117
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/othersettings.php:122
 msgid "Automatic shortening service to use."
 msgstr "Uzota aŭtomata mallongigad-servo."
 
-#: actions/othersettings.php:122
+#. TRANS: Label for checkbox.
+#: actions/othersettings.php:128
 msgid "View profile designs"
 msgstr "Vidi profilo-desegnon"
 
-#: actions/othersettings.php:123
+#. TRANS: Tooltip for checkbox.
+#: actions/othersettings.php:130
 msgid "Show or hide profile designs."
 msgstr "Montri aŭ kaŝi profilo-desegnon."
 
-#: actions/othersettings.php:153
-msgid "URL shortening service is too long (max 50 chars)."
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/othersettings.php:162
+#, fuzzy
+msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "URL-mallongigado-servo tro longas (maksimume 50 literojn)."
 
 #: actions/otp.php:69
@@ -3802,7 +3817,7 @@ msgstr "Biografio"
 #. TRANS: Label for group location (dt). Text hidden by default.
 #: actions/profilesettings.php:149 actions/register.php:485
 #: actions/showgroup.php:267 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:177
+#: actions/userauthorization.php:166 lib/groupeditform.php:180
 #: lib/userprofile.php:165
 msgid "Location"
 msgstr "Loko"
@@ -4137,7 +4152,8 @@ msgid "Unexpected password reset."
 msgstr "Neatendita pasvorto-rekomencigo."
 
 #: actions/recoverpassword.php:365
-msgid "Password must be 6 chars or more."
+#, fuzzy
+msgid "Password must be 6 characters or more."
 msgstr "Pasvorto devas enhavi 6 signojn aŭ pli."
 
 #: actions/recoverpassword.php:369
@@ -4509,7 +4525,7 @@ msgstr "Organizaĵo"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:172
+#: lib/applicationeditform.php:208 lib/groupeditform.php:175
 msgid "Description"
 msgstr "Priskribo"
 
@@ -4658,7 +4674,7 @@ msgid "Note"
 msgstr "Noto"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:298 lib/groupeditform.php:184
+#: actions/showgroup.php:298 lib/groupeditform.php:187
 msgid "Aliases"
 msgstr "Alnomo"
 
@@ -4789,54 +4805,76 @@ msgstr "Mesaĝo de %1$s ĉe %2$s"
 msgid "Notice deleted."
 msgstr "Avizo viŝiĝas"
 
-#: actions/showstream.php:72
-#, php-format
-msgid " tagged %s"
-msgstr " Etikedigita %s"
+#. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
+#: actions/showstream.php:70
+#, fuzzy, php-format
+msgid "%1$s tagged %2$s"
+msgstr "%1$s, paĝo %2$d"
+
+#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#: actions/showstream.php:74
+#, fuzzy, php-format
+msgid "%1$s tagged %2$s, page %3$d"
+msgstr "Avizoj etikeditaj per %1$s - paĝo %2$d"
 
-#: actions/showstream.php:78
+#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$d is the page number.
+#: actions/showstream.php:82
 #, php-format
 msgid "%1$s, page %2$d"
 msgstr "%1$s, paĝo %2$d"
 
-#: actions/showstream.php:120
+#. TRANS: Title for link to notice feed.
+#. TRANS: %1$s is a user nickname, %2$s is a hashtag.
+#: actions/showstream.php:127
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Avizofluo pri %1$s etikedigita %2$s (RSS 1.0)"
 
-#: actions/showstream.php:127
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:136
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "Avizofluo pri %1$s (RSS 1.0)"
 
-#: actions/showstream.php:134
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:145
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "Avizofluo pri %1$s (RSS 2.0)"
 
-#: actions/showstream.php:141
+#: actions/showstream.php:152
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "Avizofluo pri %1$s  (Atom)"
 
-#: actions/showstream.php:146
+#. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
+#. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
+#: actions/showstream.php:159
 #, php-format
 msgid "FOAF for %s"
 msgstr "Foramiko de  %s"
 
-#: actions/showstream.php:197
-#, php-format
-msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
+#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
+#: actions/showstream.php:211
+#, fuzzy, php-format
+msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr "Tie ĉi estus tempstrio de %1$s sed %2$s ankoraŭ afiŝis nenion."
 
-#: actions/showstream.php:202
+#. TRANS: Second sentence of empty list message for a stream for the user themselves.
+#: actions/showstream.php:217
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
 msgstr ""
 "Ĉu okazas io interesa lastatempe? Vi ne afiŝis ion ajn, nun taŭgas komenci :)"
 
-#: actions/showstream.php:204
+#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:221
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -4845,7 +4883,9 @@ msgstr ""
 "Vi povas provi  [puŝeti %1$s] aŭ [afiŝi ion al li](%%%%action.newnotice%%%%?"
 "status_textarea=%2$s)."
 
-#: actions/showstream.php:243
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:264
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4858,7 +4898,9 @@ msgstr ""
 "(http://status.net/). [Aniĝu](%%%%action.register%%%%) por sekvi avizojn de "
 "**%s** kaj multe pli! ([Pli](%%%%doc.help%%%%))"
 
-#: actions/showstream.php:248
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:271
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4869,7 +4911,8 @@ msgstr ""
 "org/wiki/Micro-blogging) servo surbaze de ilaro de Libera Molvaro [StatusNet]"
 "(http://status.net/). "
 
-#: actions/showstream.php:305
+#. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
+#: actions/showstream.php:328
 #, php-format
 msgid "Repeat of %s"
 msgstr "Ripeto de %s"
@@ -4980,31 +5023,40 @@ msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 "Kiel longe devas uzantoj atendas (je sekundo) antaŭ afiŝi la saman refejo."
 
-#: actions/sitenoticeadminpanel.php:56
+#. TRANS: Page title for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:55
 msgid "Site Notice"
 msgstr "Reteja Anonco"
 
-#: actions/sitenoticeadminpanel.php:67
+#. TRANS: Instructions for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:66
 msgid "Edit site-wide message"
 msgstr "Redakti retejan mesaĝon"
 
-#: actions/sitenoticeadminpanel.php:103
+#. TRANS: Server error displayed when saving a site-wide notice was impossible.
+#: actions/sitenoticeadminpanel.php:101
 msgid "Unable to save site notice."
 msgstr "Malsukcesis konservi retejan anoncon."
 
-#: actions/sitenoticeadminpanel.php:113
-msgid "Max length for the site-wide notice is 255 chars."
+#. TRANS: Client error displayed when a site-wide notice was longer than allowed.
+#: actions/sitenoticeadminpanel.php:112
+#, fuzzy
+msgid "Maximum length for the site-wide notice is 255 characters."
 msgstr "Longlimo por reteja anonco estas 255 literoj."
 
+#. TRANS: Label for site-wide notice text field in admin panel.
 #: actions/sitenoticeadminpanel.php:176
 msgid "Site notice text"
 msgstr "Teksto de reteja anonco."
 
-#: actions/sitenoticeadminpanel.php:178
-msgid "Site-wide notice text (255 chars max; HTML okay)"
+#. TRANS: Tooltip for site-wide notice text field in admin panel.
+#: actions/sitenoticeadminpanel.php:179
+#, fuzzy
+msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr "Teksto de reteja anonco (apenaŭ 255 literoj; HTML eblas)"
 
-#: actions/sitenoticeadminpanel.php:198
+#. TRANS: Title for button to save site notice in admin panel.
+#: actions/sitenoticeadminpanel.php:201
 msgid "Save site notice"
 msgstr "Konservi retejan agordon"
 
@@ -5461,75 +5513,93 @@ msgstr ""
 "Rigardato-flua permesilo \"%1$s\" ne konformas al reteja permesilo \"%2$s\"."
 
 #. TRANS: User admin panel title
-#: actions/useradminpanel.php:60
+#: actions/useradminpanel.php:58
 msgctxt "TITLE"
 msgid "User"
 msgstr "Uzanto"
 
-#: actions/useradminpanel.php:71
+#. TRANS: Instruction for user admin panel.
+#: actions/useradminpanel.php:69
 msgid "User settings for this StatusNet site"
 msgstr ""
 
-#: actions/useradminpanel.php:150
+#. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
+#: actions/useradminpanel.php:147
 msgid "Invalid bio limit. Must be numeric."
 msgstr "Nevalida biografia longlimo. Estu cifero."
 
-#: actions/useradminpanel.php:156
-msgid "Invalid welcome text. Max length is 255 characters."
+#. TRANS: Form validation error in user admin panel when welcome text is too long.
+#: actions/useradminpanel.php:154
+#, fuzzy
+msgid "Invalid welcome text. Maximum length is 255 characters."
 msgstr "Nevalida bonvena teksto. La longlimo estas 225 literoj."
 
+#. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
+#. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
-#, php-format
-msgid "Invalid default subscripton: '%1$s' is not user."
+#, fuzzy, php-format
+msgid "Invalid default subscripton: '%1$s' is not a user."
 msgstr "Nevalida defaŭlta abono: '%1$s' ne estas uzanto."
 
 #. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:106
+#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
 #: lib/personalgroupnav.php:109
 msgid "Profile"
 msgstr "Profilo"
 
-#: actions/useradminpanel.php:223
+#. TRANS: Field label in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:220
 msgid "Bio Limit"
 msgstr "Longlimo de biografio"
 
-#: actions/useradminpanel.php:224
+#. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:222
 msgid "Maximum length of a profile bio in characters."
 msgstr "Longlimo de profila biografio, je literoj"
 
-#: actions/useradminpanel.php:232
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:231
 msgid "New users"
 msgstr "Novuloj"
 
+#. TRANS: Field label in user admin panel for setting new user welcome text.
 #: actions/useradminpanel.php:236
 msgid "New user welcome"
 msgstr "Bonveno al novuloj"
 
-#: actions/useradminpanel.php:237
-msgid "Welcome text for new users (Max 255 chars)."
+#. TRANS: Tooltip in user admin panel for setting new user welcome text.
+#: actions/useradminpanel.php:238
+#, fuzzy
+msgid "Welcome text for new users (maximum 255 characters)."
 msgstr "Bonvena teksto al novaj uzantoj (apenaŭ 255 literoj)."
 
-#: actions/useradminpanel.php:242
+#. TRANS: Field label in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:244
 msgid "Default subscription"
 msgstr "Defaŭlta abono"
 
-#: actions/useradminpanel.php:243
+#. TRANS: Tooltip in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:246
 msgid "Automatically subscribe new users to this user."
 msgstr "Aŭtomate aboni novajn uzantojn al ĉi tiu uzanto."
 
-#: actions/useradminpanel.php:252
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:256
 msgid "Invitations"
 msgstr "Invitoj"
 
-#: actions/useradminpanel.php:257
+#. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:262
 msgid "Invitations enabled"
 msgstr "Invito ebliĝis"
 
-#: actions/useradminpanel.php:259
+#. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:265
 msgid "Whether to allow users to invite new users."
 msgstr "Ĉu permesi al uzantoj inviti novan uzantojn."
 
-#: actions/useradminpanel.php:295
+#. TRANS: Title for button to save user settings in user admin panel.
+#: actions/useradminpanel.php:302
 msgid "Save user settings"
 msgstr ""
 
@@ -5734,7 +5804,7 @@ msgid "Plugins"
 msgstr "Kromprogramo"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:831
+#: actions/version.php:198 lib/action.php:880
 msgid "Version"
 msgstr "Versio"
 
@@ -5941,16 +6011,23 @@ msgstr "Malsukcesis lokan grupan informon."
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
+#. TRANS: Full name of a profile or group followed by nickname in parens
+#: classes/Profile.php:164
+#, fuzzy, php-format
+msgctxt "FANCYNAME"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:791
+#: classes/Profile.php:812
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr "Malsukcesis revoki rolon \"%1$s\" de uzanto #%2$d; ĝi ne ekzistas."
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:800
+#: classes/Profile.php:821
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr "Malsukcesis revoki rolon \"%1$s\" de uzanto #%2$d; datumbaza eraro."
@@ -6095,194 +6172,201 @@ msgstr "%1$s - %2$s"
 msgid "Untitled page"
 msgstr "Sentitola paĝo"
 
+#. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
+#: lib/action.php:310
+msgctxt "TOOLTIP"
+msgid "Show more"
+msgstr ""
+
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:477
+#: lib/action.php:526
 msgid "Primary site navigation"
 msgstr "Unua reteja navigado"
 
 #. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:483
+#: lib/action.php:532
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "Tempstrio pri vi kaj amikoj"
 
 #. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:486
+#: lib/action.php:535
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Persona"
 
 #. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:488
+#: lib/action.php:537
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
 msgstr "Ŝanĝu la retpoŝtadreson, vizaĝbildon, pasvorton aŭ la profilon"
 
 #. TRANS: Main menu option when logged in for access to user settings
-#: lib/action.php:491
+#: lib/action.php:540
 msgid "Account"
 msgstr "Konto"
 
 #. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:493
+#: lib/action.php:542
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "Konekti al servoj"
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:496
+#: lib/action.php:545
 msgid "Connect"
 msgstr "Konekti"
 
 #. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:499
+#: lib/action.php:548
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "Ŝanĝi agordojn de la retejo"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:502 lib/groupnav.php:117
+#: lib/action.php:551 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Administri"
 
 #. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:506
+#: lib/action.php:555
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Inviti amikojn kaj kolegojn al %s kun vi"
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:509
+#: lib/action.php:558
 msgctxt "MENU"
 msgid "Invite"
 msgstr "Inviti"
 
 #. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:515
+#: lib/action.php:564
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "Elsaluti el la retejo"
 
 #. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:518
+#: lib/action.php:567
 msgctxt "MENU"
 msgid "Logout"
 msgstr " Elsaluti"
 
 #. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:523
+#: lib/action.php:572
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "Krei konton"
 
 #. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:526
+#: lib/action.php:575
 msgctxt "MENU"
 msgid "Register"
 msgstr "Registriĝi"
 
 #. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:529
+#: lib/action.php:578
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "Ensaluti al la retejo"
 
 #. TRANS: Main menu option when not logged in to log in
-#: lib/action.php:532
+#: lib/action.php:581
 msgctxt "MENU"
 msgid "Login"
 msgstr "Ensaluti"
 
 #. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:535
+#: lib/action.php:584
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Helpu min!"
 
 #. TRANS: Main menu option for help on the StatusNet site
-#: lib/action.php:538
+#: lib/action.php:587
 msgctxt "MENU"
 msgid "Help"
 msgstr "Helpo"
 
 #. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:541
+#: lib/action.php:590
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr "Serĉi homon aŭ tekston"
 
 #. TRANS: Main menu option when logged in or when the StatusNet instance is not private
-#: lib/action.php:544
+#: lib/action.php:593
 msgctxt "MENU"
 msgid "Search"
 msgstr "Serĉi"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:566 lib/adminpanelaction.php:387
+#: lib/action.php:615 lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "Reteja anonco"
 
 #. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:633
+#: lib/action.php:682
 msgid "Local views"
 msgstr "Loka vido"
 
 #. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:703
+#: lib/action.php:752
 msgid "Page notice"
 msgstr "Paĝa anonco"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:804
+#: lib/action.php:853
 msgid "Secondary site navigation"
 msgstr "Dua reteja navigado"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:810
+#: lib/action.php:859
 msgid "Help"
 msgstr "Helpo"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:813
+#: lib/action.php:862
 msgid "About"
 msgstr "Enkonduko"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:816
+#: lib/action.php:865
 msgid "FAQ"
 msgstr "Oftaj demandoj"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:821
+#: lib/action.php:870
 msgid "TOS"
 msgstr "Serva Kondiĉo"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:825
+#: lib/action.php:874
 msgid "Privacy"
 msgstr "Privateco"
 
-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:828
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+#: lib/action.php:877
 msgid "Source"
 msgstr "Fontkodo"
 
-#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:834
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+#: lib/action.php:884
 msgid "Contact"
 msgstr "Kontakto"
 
-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:837
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+#: lib/action.php:887
 msgid "Badge"
 msgstr "Insigno"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:866
+#: lib/action.php:916
 msgid "StatusNet software license"
 msgstr "Licenco de la programaro StatusNet"
 
@@ -6290,7 +6374,7 @@ msgstr "Licenco de la programaro StatusNet"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:873
+#: lib/action.php:923
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -6300,7 +6384,7 @@ msgstr ""
 "site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:876
+#: lib/action.php:926
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** estas mikrobloga servo."
@@ -6309,7 +6393,7 @@ msgstr "**%%site.name%%** estas mikrobloga servo."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:883
+#: lib/action.php:933
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -6321,27 +6405,27 @@ msgstr ""
 "licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:899
+#: lib/action.php:949
 msgid "Site content license"
 msgstr "Reteja enhava permesilo"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:906
+#: lib/action.php:956
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "Enhavo kaj datumo de %1$s estas privata kaj konfidenca."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:913
+#: lib/action.php:963
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 "Enhava kaj datuma aŭtorrajto apartenas al %1$s. Ĉiuj rajtoj rezervitaj."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:917
+#: lib/action.php:967
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "Enhava kaj datuma aŭtorrajto apartenas al kontribuintoj. Ĉiuj rajtoj "
@@ -6349,25 +6433,25 @@ msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:949
+#: lib/action.php:999
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr "Ĉiuj enhavo kaj datumo ĉe %1$s estas havebla sub permesilo %2$s."
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1285
+#: lib/action.php:1335
 msgid "Pagination"
 msgstr "Paĝado"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1296
+#: lib/action.php:1346
 msgid "After"
 msgstr "Poste"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1306
+#: lib/action.php:1356
 msgid "Before"
 msgstr "Antaŭe"
 
@@ -6710,7 +6794,7 @@ msgid "AJAX error"
 msgstr "Eraro de Ajax"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:233 lib/mailhandler.php:142
+#: lib/channel.php:233 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "Komando kompleta"
 
@@ -6726,7 +6810,7 @@ msgstr "Avizo kun tiu identigaĵo ne ekzistas."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:626
+#: lib/command.php:99 lib/command.php:630
 msgid "User has no last notice."
 msgstr "La uzanto ne havas lastan averton."
 
@@ -6795,6 +6879,14 @@ msgstr "%1$s aniĝis al grupo %2$s."
 msgid "%1$s left group %2$s."
 msgstr "%1$s foriras de grupo %2$s."
 
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: lib/command.php:426
+#, fuzzy, php-format
+msgctxt "WHOIS"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
 #. TRANS: Whois output. %s is the full name of the queried user.
 #: lib/command.php:430
 #, php-format
@@ -6834,135 +6926,141 @@ msgstr ""
 "%s estas fora profilo; vi povas sendi rektan mesaĝon nur al uzanto je sama "
 "servilo."
 
-#. TRANS: Message given if content is too long.
+#. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
 #: lib/command.php:488
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr "Mesaĝo tro longas - longlimo estas %1$d, via estas %2$d"
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] "Mesaĝo tro longas - longlimo estas %1$d, via estas %2$d"
+msgstr[1] "Mesaĝo tro longas - longlimo estas %1$d, via estas %2$d"
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:514
+#: lib/command.php:516
 msgid "Error sending direct message."
 msgstr "Eraris sendi rektan mesaĝon."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:551
+#: lib/command.php:553
 #, php-format
 msgid "Notice from %s repeated."
 msgstr "Avizo de %s ripetiĝas."
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:554
+#: lib/command.php:556
 msgid "Error repeating notice."
 msgstr "Eraris ripeti avizon."
 
-#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:589
-#, php-format
-msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
+#: lib/command.php:591
+#, fuzzy, php-format
+msgid "Notice too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] ""
+"Avizo tro longas - longlimo estas %1$d lietroj, kaj via mesaĝo longas je %2"
+"$d."
+msgstr[1] ""
 "Avizo tro longas - longlimo estas %1$d lietroj, kaj via mesaĝo longas je %2"
 "$d."
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:600
+#: lib/command.php:604
 #, php-format
 msgid "Reply to %s sent."
 msgstr "Respondo al %s sendiĝas."
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:603
+#: lib/command.php:607
 msgid "Error saving notice."
 msgstr "Eraris sendi avizon."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:650
+#: lib/command.php:654
 msgid "Specify the name of the user to subscribe to."
 msgstr "Specifu nomon de la abonota uzanto."
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:659
+#: lib/command.php:663
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Malsukcesis aboni OMB-profilon per komando."
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:667
+#: lib/command.php:671
 #, php-format
 msgid "Subscribed to %s."
 msgstr "%s abonita"
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:688 lib/command.php:799
+#: lib/command.php:692 lib/command.php:803
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "Specifu la nomon de uzanto malabonota."
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:699
+#: lib/command.php:703
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr "%s malabonita."
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:719 lib/command.php:745
+#: lib/command.php:723 lib/command.php:749
 msgid "Command not yet implemented."
 msgstr "Komando ankoraŭ ne realigita."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:723
+#: lib/command.php:727
 msgid "Notification off."
 msgstr "Sciigo for."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:726
+#: lib/command.php:730
 msgid "Can't turn off notification."
 msgstr "Malsukcesis malŝalti sciigon."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:749
+#: lib/command.php:753
 msgid "Notification on."
 msgstr "Sciigo en."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:752
+#: lib/command.php:756
 msgid "Can't turn on notification."
 msgstr "Malsukcesis ŝalti sciigon."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:766
+#: lib/command.php:770
 msgid "Login command is disabled."
 msgstr "Ensaluta komando malebliĝas."
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:779
+#: lib/command.php:783
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr "Ĉi tiu ligilo estas uzebla nur unufoje kaj valida nur 2 minutojn: %s."
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:808
+#: lib/command.php:812
 #, php-format
 msgid "Unsubscribed %s."
 msgstr "%s malaboniĝas."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:826
+#: lib/command.php:830
 msgid "You are not subscribed to anyone."
 msgstr "Vi ne abonas iun ajn."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:831
+#: lib/command.php:835
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Vi abonas jenan homon:"
@@ -6970,14 +7068,14 @@ msgstr[1] "Vi abonas jenajn homojn:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:853
+#: lib/command.php:857
 msgid "No one is subscribed to you."
 msgstr "Neniu abonas vin."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:858
+#: lib/command.php:862
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "La homo abonas vin:"
@@ -6985,21 +7083,21 @@ msgstr[1] "La homoj abonas vin:"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:880
+#: lib/command.php:884
 msgid "You are not a member of any groups."
 msgstr "Vi ne estas grupano de iu ajn grupo."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:885
+#: lib/command.php:889
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Vi estas grupano de jena grupo:"
 msgstr[1] "Vi estas grupano de jenaj grupoj:"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:900
+#: lib/command.php:904
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -7229,7 +7327,8 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 minusklaj literoj aŭ ciferoj, neniu interpunkcio aŭ spaco"
 
 #: lib/groupeditform.php:163
-msgid "URL of the homepage or blog of the group or topic"
+#, fuzzy
+msgid "URL of the homepage or blog of the group or topic."
 msgstr "URL de la hejmpaĝo aŭ blogo de la grupo aŭ temo"
 
 #: lib/groupeditform.php:168
@@ -7237,20 +7336,30 @@ msgid "Describe the group or topic"
 msgstr "Priskribo de grupo aŭ temo"
 
 #: lib/groupeditform.php:170
-#, php-format
-msgid "Describe the group or topic in %d characters"
-msgstr "Priskribo de grupo aŭ temo, apenaŭ je %d literoj"
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d character or less"
+msgid_plural "Describe the group or topic in %d characters or less"
+msgstr[0] "Priskribo de grupo aŭ temo, apenaŭ je %d literoj"
+msgstr[1] "Priskribo de grupo aŭ temo, apenaŭ je %d literoj"
 
-#: lib/groupeditform.php:179
+#: lib/groupeditform.php:182
+#, fuzzy
 msgid ""
-"Location for the group, if any, like \"City, State (or Region), Country\""
+"Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr ""
 "Loko de la grupo, se iu ajn, ekzemple \"Urbo, Stato (aŭ Regiono), Lando\""
 
-#: lib/groupeditform.php:187
-#, php-format
-msgid "Extra nicknames for the group, comma- or space- separated, max %d"
-msgstr ""
+#: lib/groupeditform.php:190
+#, fuzzy, php-format
+msgid ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"alias allowed."
+msgid_plural ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"aliases allowed."
+msgstr[0] ""
+"Kromaj alnomoj por la grupo, apartigita per komo aŭ spaco, apenaŭ %d literoj"
+msgstr[1] ""
 "Kromaj alnomoj por la grupo, apartigita per komo aŭ spaco, apenaŭ %d literoj"
 
 #. TRANS: Menu item in the group navigation page.
@@ -7805,7 +7914,7 @@ msgstr "Pardonon, tiu ne estas via alvena retpoŝtadreso."
 msgid "Sorry, no incoming email allowed."
 msgstr "Pardonon, neniu alvena mesaĝo permesiĝas."
 
-#: lib/mailhandler.php:228
+#: lib/mailhandler.php:229
 #, php-format
 msgid "Unsupported message type: %s"
 msgstr "Nesubtenata mesaĝo-tipo: %s"
@@ -8155,16 +8264,17 @@ msgid "Sandbox this user"
 msgstr "Provejigi la uzanton"
 
 #. TRANS: Fieldset legend for the search form.
-#: lib/searchaction.php:121
+#: lib/searchaction.php:120
 msgid "Search site"
 msgstr "Serĉi ĉe retejo"
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
-#: lib/searchaction.php:129
+#: lib/searchaction.php:128
 msgid "Keyword(s)"
 msgstr "Serĉvorto(j)"
 
+#. TRANS: Button text for searching site.
 #: lib/searchaction.php:130
 msgctxt "BUTTON"
 msgid "Search"
@@ -8254,8 +8364,8 @@ msgid "The theme file is missing or the upload failed."
 msgstr "La desegna dosiero mankas aŭ malsukcesis alŝuti."
 
 #: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:278 lib/themeuploader.php:282
-#: lib/themeuploader.php:290 lib/themeuploader.php:297
+#: lib/themeuploader.php:279 lib/themeuploader.php:283
+#: lib/themeuploader.php:291 lib/themeuploader.php:298
 msgid "Failed saving theme."
 msgstr "Malsukcesis konservi desegnon."
 
@@ -8264,15 +8374,20 @@ msgid "Invalid theme: bad directory structure."
 msgstr "Nevalida desegno: fuŝa dosieruja sturkturo."
 
 #: lib/themeuploader.php:166
-#, php-format
-msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
-msgstr "Alŝutata desegno tro grandas; ĝi estu apenaŭ %d bitoj sen densigado."
+#, fuzzy, php-format
+msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
+msgid_plural ""
+"Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr[0] ""
+"Alŝutata desegno tro grandas; ĝi estu apenaŭ %d bitoj sen densigado."
+msgstr[1] ""
+"Alŝutata desegno tro grandas; ĝi estu apenaŭ %d bitoj sen densigado."
 
-#: lib/themeuploader.php:178
+#: lib/themeuploader.php:179
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr "Nevalida desegna arkivo: mankas dosiero css/display.css"
 
-#: lib/themeuploader.php:218
+#: lib/themeuploader.php:219
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
@@ -8280,16 +8395,16 @@ msgstr ""
 "Desegno enhavas nevalidan dosieran aŭ dosierujan nomon. Uzu nur ASCII-"
 "literaron, ciferojn, substrekon kaj minussignon."
 
-#: lib/themeuploader.php:224
+#: lib/themeuploader.php:225
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr "Desegno enhavas malsekuran dosiersufikson; eble malsukuras."
 
-#: lib/themeuploader.php:241
+#: lib/themeuploader.php:242
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr "Desegno enhavas dosieron de tipo \".%s\", kiu malpermesiĝas."
 
-#: lib/themeuploader.php:259
+#: lib/themeuploader.php:260
 msgid "Error opening theme archive."
 msgstr "Eraris malfermi desegnan arkivon."
 
@@ -8470,23 +8585,40 @@ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
 msgstr[0] "Mesaĝo tro longas - longlimo estas %1$d, via estas %2$d"
 msgstr[1] "Mesaĝo tro longas - longlimo estas %1$d, via estas %2$d"
 
-#: scripts/restoreuser.php:82
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: scripts/restoreuser.php:61
 #, php-format
-msgid "Backup file for user %s (%s)"
+msgid "Getting backup from file '%s'."
 msgstr ""
 
-#: scripts/restoreuser.php:88
+#. TRANS: Commandline script output.
+#: scripts/restoreuser.php:91
 #, fuzzy
 msgid "No user specified; using backup user."
 msgstr "Neniu uzanto-ID specifiĝas."
 
-#: scripts/restoreuser.php:94
+#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
+#: scripts/restoreuser.php:98
 #, php-format
-msgid "%d entries in backup."
-msgstr ""
+msgid "%d entry in backup."
+msgid_plural "%d entries in backup."
+msgstr[0] ""
+msgstr[1] ""
+
+#, fuzzy
+#~ msgid "Name is too long (maximum 255 chars)."
+#~ msgstr "La nomo estas tro longa (maksimume 255 literoj)"
+
+#, fuzzy
+#~ msgid "Organization is too long (maximum 255 chars)."
+#~ msgstr "Organizonomo estas tro longa (maksimume 255 literoj)."
+
+#~ msgid "That's too long. Max notice size is %d chars."
+#~ msgstr "Tro longas. Longlimo por avizo estas %d signoj."
 
-#~ msgid "Description is too long (max %d chars)."
-#~ msgstr "Priskribo estas tro longa (maksimume %d signoj)."
+#~ msgid "Max notice size is %d chars, including attachment URL."
+#~ msgstr ""
+#~ "Longlimo por avizo estas %d signoj, enkalkulante ankaŭ la retadresojn."
 
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "Tro da alinomoj! Maksimume %d."
+#~ msgid " tagged %s"
+#~ msgstr " Etikedigita %s"
diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po
index d695e9aca..6a9a3fcb4 100644
--- a/locale/es/LC_MESSAGES/statusnet.po
+++ b/locale/es/LC_MESSAGES/statusnet.po
@@ -16,17 +16,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-30 23:18+0000\n"
-"PO-Revision-Date: 2010-10-30 23:20:09+0000\n"
+"POT-Creation-Date: 2010-11-02 22:51+0000\n"
+"PO-Revision-Date: 2010-11-02 22:53:14+0000\n"
 "Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r75708); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r75875); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2010-10-30 09:48:40+0000\n"
+"X-POT-Import-Date: 2010-10-30 23:42:01+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -83,15 +83,20 @@ msgstr "Guardar la configuración de acceso"
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
+#. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
+#. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #: actions/accessadminpanel.php:193 actions/emailsettings.php:228
-#: actions/imsettings.php:187 actions/pathsadminpanel.php:512
-#: actions/profilesettings.php:201 actions/smssettings.php:209
-#: actions/subscriptions.php:246 lib/applicationeditform.php:355
+#: actions/imsettings.php:187 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: lib/applicationeditform.php:355 lib/groupeditform.php:207
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Guardar"
@@ -142,7 +147,7 @@ msgstr "No existe tal página."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:495 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "No existe ese usuario."
@@ -215,7 +220,9 @@ msgstr ""
 
 #. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:208
+#. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -571,8 +578,11 @@ msgstr "Tu nombre es demasiado largo (max. 255 carac.)"
 #. TRANS: Group edit form validation error.
 #. TRANS: Form validation error in New application form.
 #. TRANS: %d is the maximum number of characters for the description.
+#. TRANS: Group create form validation error.
+#. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:220 actions/editapplication.php:201
 #: actions/editgroup.php:216 actions/newapplication.php:178
+#: actions/newgroup.php:152
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -732,14 +742,14 @@ msgstr "No estás autorizado."
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:172 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:74
 #: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
 #: actions/groupunblock.php:65 actions/imsettings.php:230
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
-#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/othersettings.php:153 actions/passwordsettings.php:138
 #: actions/profilesettings.php:221 actions/recoverpassword.php:350
 #: actions/register.php:172 actions/remotesubscribe.php:77
 #: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
@@ -920,20 +930,21 @@ msgstr "No puedes borrar el estado de otro usuario."
 
 #. TRANS: Client error displayed trying to repeat a non-existing notice through the API.
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
+#. TRANS: Error message displayed trying to delete a non-existing notice.
 #: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/deletenotice.php:58 actions/shownotice.php:92
+#: actions/deletenotice.php:61 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "No existe ese mensaje."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:535
+#: actions/apistatusesretweet.php:83 lib/command.php:537
 msgid "Cannot repeat your own notice."
 msgstr "No puedes repetir tus propios mensajes"
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:541
+#: actions/apistatusesretweet.php:92 lib/command.php:543
 msgid "Already repeated that notice."
 msgstr "Este mensaje ya se ha repetido."
 
@@ -954,7 +965,8 @@ msgstr "El cliente debe proveer un parámetro de 'status' con un valor."
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#: actions/apistatusesupdate.php:244
+#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
+#: lib/mailhandler.php:60
 #, fuzzy, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
@@ -969,7 +981,7 @@ msgstr "Método de API no encontrado."
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
-#: actions/apistatusesupdate.php:308
+#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
 #, fuzzy, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
@@ -1181,17 +1193,18 @@ msgstr "Elige un área cuadrada para que sea tu imagen"
 msgid "Lost our file data."
 msgstr "Se perdió nuestros datos de archivo."
 
-#: actions/avatarsettings.php:384
+#. TRANS: Success message for having updated a user avatar.
+#: actions/avatarsettings.php:385
 msgid "Avatar updated."
 msgstr "Imagen actualizada"
 
 #. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
-#: actions/avatarsettings.php:388
+#: actions/avatarsettings.php:389
 msgid "Failed updating avatar."
 msgstr "Error al actualizar la imagen."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:412
+#: actions/avatarsettings.php:413
 msgid "Avatar deleted."
 msgstr "Imagen borrada."
 
@@ -1223,8 +1236,8 @@ msgstr ""
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:154 actions/deleteapplication.php:154
-#: actions/deletegroup.php:220 actions/deletenotice.php:150
+#: actions/block.php:154 actions/deleteapplication.php:157
+#: actions/deletegroup.php:220 actions/deletenotice.php:155
 #: actions/deleteuser.php:152 actions/groupblock.php:178
 msgctxt "BUTTON"
 msgid "No"
@@ -1242,8 +1255,8 @@ msgstr "No bloquear a este usuario"
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:161 actions/deleteapplication.php:161
-#: actions/deletegroup.php:227 actions/deletenotice.php:157
+#: actions/block.php:161 actions/deleteapplication.php:164
+#: actions/deletegroup.php:227 actions/deletenotice.php:162
 #: actions/deleteuser.php:159 actions/groupblock.php:185
 msgctxt "BUTTON"
 msgid "Yes"
@@ -1361,12 +1374,13 @@ msgstr "Esa dirección ya fue confirmada."
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
 #. TRANS: Server error thrown on database error updating IM preferences.
 #. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
 #. TRANS: Server error thrown when user profile settings could not be updated.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #: actions/confirmaddress.php:118 actions/emailsettings.php:331
 #: actions/emailsettings.php:477 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:174
+#: actions/imsettings.php:442 actions/othersettings.php:184
 #: actions/profilesettings.php:326 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
@@ -1402,16 +1416,19 @@ msgstr "Conversación"
 msgid "Notices"
 msgstr "Mensajes"
 
-#: actions/deleteapplication.php:63
+#. TRANS: Client error displayed trying to delete an application while not logged in.
+#: actions/deleteapplication.php:62
 msgid "You must be logged in to delete an application."
 msgstr "Debes estar registrado para borrar una aplicación."
 
+#. TRANS: Client error displayed trying to delete an application that does not exist.
 #: actions/deleteapplication.php:71
 msgid "Application not found."
 msgstr "Aplicación no encontrada."
 
+#. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
-#: actions/deleteapplication.php:78 actions/editapplication.php:78
+#: actions/deleteapplication.php:79 actions/editapplication.php:78
 #: actions/showapplication.php:94
 msgid "You are not the owner of this application."
 msgstr "No eres el propietario de esta aplicación."
@@ -1419,15 +1436,18 @@ msgstr "No eres el propietario de esta aplicación."
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
 #: actions/newapplication.php:114 actions/showapplication.php:118
-#: lib/action.php:1354
+#: lib/action.php:1404
 msgid "There was a problem with your session token."
 msgstr "Hubo problemas con tu clave de sesión."
 
-#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+#. TRANS: Title for delete application page.
+#. TRANS: Fieldset legend on delete application page.
+#: actions/deleteapplication.php:124 actions/deleteapplication.php:149
 msgid "Delete application"
 msgstr "Eliminar la aplicación"
 
-#: actions/deleteapplication.php:149
+#. TRANS: Confirmation text on delete application page.
+#: actions/deleteapplication.php:152
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
 "about the application from the database, including all existing user "
@@ -1438,12 +1458,12 @@ msgstr ""
 "conexiones de usuario existente."
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:158
+#: actions/deleteapplication.php:161
 msgid "Do not delete this application"
 msgstr "No eliminar esta aplicación"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:164
+#: actions/deleteapplication.php:167
 msgid "Delete this application"
 msgstr "Borrar esta aplicación"
 
@@ -1479,13 +1499,14 @@ msgstr "No se pudo actualizar el grupo."
 msgid "Deleted group %s"
 msgstr "%1$s ha dejado el grupo %2$s"
 
-#. TRANS: Title.
+#. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
 #: actions/deletegroup.php:176 actions/deletegroup.php:202
 #, fuzzy
 msgid "Delete group"
 msgstr "Borrar usuario"
 
+#. TRANS: Warning in form for deleleting a group.
 #: actions/deletegroup.php:206
 #, fuzzy
 msgid ""
@@ -1508,10 +1529,11 @@ msgstr "No eliminar este mensaje"
 msgid "Delete this group"
 msgstr "Borrar este usuario"
 
+#. TRANS: Error message displayed trying to delete a notice while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1521,11 +1543,13 @@ msgstr "Borrar este usuario"
 msgid "Not logged in."
 msgstr "No conectado."
 
-#: actions/deletenotice.php:74
+#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
+#: actions/deletenotice.php:78
 msgid "Can't delete this notice."
 msgstr "No se puede eliminar este mensaje."
 
-#: actions/deletenotice.php:106
+#. TRANS: Instructions for deleting a notice.
+#: actions/deletenotice.php:110
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
@@ -1533,21 +1557,24 @@ msgstr ""
 "Estás a punto de eliminar un mensaje permanentemente. Una vez hecho esto, no "
 "lo puedes deshacer."
 
-#: actions/deletenotice.php:112 actions/deletenotice.php:144
+#. TRANS: Page title when deleting a notice.
+#. TRANS: Fieldset legend for the delete notice form.
+#: actions/deletenotice.php:117 actions/deletenotice.php:148
 msgid "Delete notice"
 msgstr "Borrar mensaje"
 
-#: actions/deletenotice.php:147
+#. TRANS: Message for the delete notice form.
+#: actions/deletenotice.php:152
 msgid "Are you sure you want to delete this notice?"
 msgstr "¿Estás seguro de que quieres eliminar este aviso?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:154
+#: actions/deletenotice.php:159
 msgid "Do not delete this notice"
 msgstr "No eliminar este mensaje"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:161 lib/noticelist.php:667
+#: actions/deletenotice.php:166 lib/noticelist.php:667
 msgid "Delete this notice"
 msgstr "Borrar este mensaje"
 
@@ -1711,11 +1738,9 @@ msgstr "Volver a los valores predeterminados"
 
 #. TRANS: Submit button title.
 #: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
-#: actions/othersettings.php:126 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: actions/useradminpanel.php:295 lib/applicationeditform.php:357
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: lib/applicationeditform.php:357 lib/designsettings.php:256
 msgid "Save"
 msgstr "Guardar"
 
@@ -1763,9 +1788,9 @@ msgid "Name is required."
 msgstr "Se requiere un nombre"
 
 #. TRANS: Validation error shown when providing too long a name in the "Edit application" form.
-#: actions/editapplication.php:188
+#: actions/editapplication.php:188 actions/newapplication.php:169
 #, fuzzy
-msgid "Name is too long (max 255 characters)."
+msgid "Name is too long (maximum 255 characters)."
 msgstr "El nombre es muy largo (máx. 255 carac.)"
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
@@ -1794,7 +1819,7 @@ msgid "Organization is required."
 msgstr "Se requiere una organización."
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#: actions/editapplication.php:223
+#: actions/editapplication.php:223 actions/newapplication.php:199
 #, fuzzy
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "El texto de organización es muy largo (máx. 255 caracteres)."
@@ -2597,7 +2622,7 @@ msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Publicar un MicroID para mi cuenta Jabber/GTalk."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:180
+#: actions/imsettings.php:290 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "Preferencias guardadas."
 
@@ -2722,10 +2747,9 @@ msgstr[1] "Ya estás suscrito a estos usuarios:"
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#. TRANS: Whois output.
-#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:145 actions/invite.php:159 lib/command.php:426
-#, php-format
+#: actions/invite.php:145 actions/invite.php:159
+#, fuzzy, php-format
+msgctxt "INVITE"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
@@ -2909,8 +2933,9 @@ msgid ""
 msgstr ""
 
 #: actions/licenseadminpanel.php:156
-msgid "Invalid license title. Max length is 255 characters."
-msgstr ""
+#, fuzzy
+msgid "Invalid license title. Maximum length is 255 characters."
+msgstr "Texto de bienvenida inválido. La longitud máx. es de 255 caracteres."
 
 #: actions/licenseadminpanel.php:168
 msgid "Invalid license URL."
@@ -3085,20 +3110,10 @@ msgstr "Debes conectarte para registrar una aplicación."
 msgid "Use this form to register a new application."
 msgstr "Utiliza este formulario para registrar una nueva aplicación."
 
-#: actions/newapplication.php:169
-#, fuzzy
-msgid "Name is too long (maximum 255 chars)."
-msgstr "El nombre es muy largo (máx. 255 carac.)"
-
 #: actions/newapplication.php:184
 msgid "Source URL is required."
 msgstr "Se requiere el URL fuente."
 
-#: actions/newapplication.php:199
-#, fuzzy
-msgid "Organization is too long (maximum 255 chars)."
-msgstr "El texto de organización es muy largo (máx. 255 caracteres)."
-
 #: actions/newapplication.php:266 actions/newapplication.php:275
 msgid "Could not create application."
 msgstr "No se pudo crear la aplicación."
@@ -3118,14 +3133,14 @@ msgid "New message"
 msgstr "Nuevo Mensaje "
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:499
+#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501
 msgid "You can't send a message to this user."
 msgstr "No puedes enviar mensaje a este usuario."
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
 #: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
-#: lib/command.php:579
+#: lib/command.php:581
 msgid "No content!"
 msgstr "¡Ningún contenido!"
 
@@ -3134,7 +3149,7 @@ msgid "No recipient specified."
 msgstr "No se especificó receptor."
 
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:503
+#: actions/newmessage.php:167 lib/command.php:505
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "No te auto envíes un mensaje; dícetelo a ti mismo."
@@ -3145,12 +3160,12 @@ msgstr "Mensaje enviado"
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:511
+#: actions/newmessage.php:188 lib/command.php:513
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Se ha enviado un mensaje directo a %s."
 
-#: actions/newmessage.php:213 actions/newnotice.php:263
+#: actions/newmessage.php:213 actions/newnotice.php:264
 msgid "Ajax Error"
 msgstr "Error de Ajax"
 
@@ -3158,18 +3173,7 @@ msgstr "Error de Ajax"
 msgid "New notice"
 msgstr "Nuevo mensaje"
 
-#: actions/newnotice.php:159 lib/mailhandler.php:60
-#, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr "El mensaje es muy largo. El tamaño máximo es de %d caracteres."
-
-#: actions/newnotice.php:183
-#, php-format
-msgid "Max notice size is %d chars, including attachment URL."
-msgstr ""
-"El tamaño máximo del mensaje es %d caracteres, incluyendo el URL adjunto."
-
-#: actions/newnotice.php:229
+#: actions/newnotice.php:230
 msgid "Notice posted"
 msgstr "Mensaje publicado"
 
@@ -3340,36 +3344,46 @@ msgstr "Búsqueda de gente"
 msgid "Notice Search"
 msgstr "Búsqueda de mensajes"
 
-#: actions/othersettings.php:60
+#: actions/othersettings.php:59
 msgid "Other settings"
 msgstr "Otros ajustes"
 
+#. TRANS: Instructions for tab "Other" in user profile settings.
 #: actions/othersettings.php:71
 msgid "Manage various other options."
 msgstr "Manejo de varias opciones adicionales."
 
-#: actions/othersettings.php:108
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/othersettings.php:111
 msgid " (free service)"
 msgstr "  (servicio gratuito)"
 
-#: actions/othersettings.php:116
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/othersettings.php:120
 msgid "Shorten URLs with"
 msgstr "Acortar los URL con"
 
-#: actions/othersettings.php:117
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/othersettings.php:122
 msgid "Automatic shortening service to use."
 msgstr "Servicio de acorte automático a usar."
 
-#: actions/othersettings.php:122
+#. TRANS: Label for checkbox.
+#: actions/othersettings.php:128
 msgid "View profile designs"
 msgstr "Ver diseños de perfil"
 
-#: actions/othersettings.php:123
+#. TRANS: Tooltip for checkbox.
+#: actions/othersettings.php:130
 msgid "Show or hide profile designs."
 msgstr "Ocultar o mostrar diseños de perfil."
 
-#: actions/othersettings.php:153
-msgid "URL shortening service is too long (max 50 chars)."
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/othersettings.php:162
+#, fuzzy
+msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "El servicio de acortamiento de URL es muy largo (máx. 50 caracteres)."
 
 #: actions/otp.php:69
@@ -3861,7 +3875,7 @@ msgstr "Biografía"
 #. TRANS: Label for group location (dt). Text hidden by default.
 #: actions/profilesettings.php:149 actions/register.php:485
 #: actions/showgroup.php:267 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:177
+#: actions/userauthorization.php:166 lib/groupeditform.php:180
 #: lib/userprofile.php:165
 msgid "Location"
 msgstr "Ubicación"
@@ -4210,7 +4224,8 @@ msgid "Unexpected password reset."
 msgstr "Restablecimiento de contraseña inesperado."
 
 #: actions/recoverpassword.php:365
-msgid "Password must be 6 chars or more."
+#, fuzzy
+msgid "Password must be 6 characters or more."
 msgstr "La contraseña debe tener 6 o más caracteres."
 
 #: actions/recoverpassword.php:369
@@ -4590,7 +4605,7 @@ msgstr "Organización"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:172
+#: lib/applicationeditform.php:208 lib/groupeditform.php:175
 msgid "Description"
 msgstr "Descripción"
 
@@ -4741,7 +4756,7 @@ msgid "Note"
 msgstr "Nota"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:298 lib/groupeditform.php:184
+#: actions/showgroup.php:298 lib/groupeditform.php:187
 msgid "Aliases"
 msgstr "Alias"
 
@@ -4874,47 +4889,67 @@ msgstr "Mensaje de %1$s en %2$s"
 msgid "Notice deleted."
 msgstr "Mensaje borrado"
 
-#: actions/showstream.php:72
-#, php-format
-msgid " tagged %s"
-msgstr "%s etiquetados"
+#. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
+#: actions/showstream.php:70
+#, fuzzy, php-format
+msgid "%1$s tagged %2$s"
+msgstr "%1$s, página %2$d"
+
+#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#: actions/showstream.php:74
+#, fuzzy, php-format
+msgid "%1$s tagged %2$s, page %3$d"
+msgstr "Mensajes etiquetados con %1$s, página %2$d"
 
-#: actions/showstream.php:78
+#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$d is the page number.
+#: actions/showstream.php:82
 #, php-format
 msgid "%1$s, page %2$d"
 msgstr "%1$s, página %2$d"
 
-#: actions/showstream.php:120
+#. TRANS: Title for link to notice feed.
+#. TRANS: %1$s is a user nickname, %2$s is a hashtag.
+#: actions/showstream.php:127
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Canal de avisos de %1$s etiquetados %2$s (RSS 1.0)"
 
-#: actions/showstream.php:127
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:136
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "Canal de mensajes para %s (RSS 1.0)"
 
-#: actions/showstream.php:134
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:145
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "Canal de mensajes para %s (RSS 2.0)"
 
-#: actions/showstream.php:141
+#: actions/showstream.php:152
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "Canal de mensajes para %s (Atom)"
 
-#: actions/showstream.php:146
+#. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
+#. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
+#: actions/showstream.php:159
 #, php-format
 msgid "FOAF for %s"
 msgstr "Amistades de amistades de %s"
 
-#: actions/showstream.php:197
-#, php-format
-msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
+#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
+#: actions/showstream.php:211
+#, fuzzy, php-format
+msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr "Esta es la línea temporal de %1$s, pero %2$s aún no ha publicado nada."
 
-#: actions/showstream.php:202
+#. TRANS: Second sentence of empty list message for a stream for the user themselves.
+#: actions/showstream.php:217
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -4922,7 +4957,9 @@ msgstr ""
 "¿Has visto algo interesante recientemente? Aún no has hecho ninguna "
 "publicación, así que este puede ser un buen momento para empezar :)"
 
-#: actions/showstream.php:204
+#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:221
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -4931,7 +4968,9 @@ msgstr ""
 "Puedes intentar darle un toque a %1$s o [publicar algo a su atención](%%%%"
 "action.newnotice%%%%?status_textarea=%2$s)."
 
-#: actions/showstream.php:243
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:264
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4945,7 +4984,9 @@ msgstr ""
 "register%%%%) para seguir los avisos de **%s** y de muchas personas más! "
 "([Más información](%%%%doc.help%%%%))"
 
-#: actions/showstream.php:248
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:271
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4956,7 +4997,8 @@ msgstr ""
 "(http://en.wikipedia.org/wiki/Micro-blogging), basado en la herramienta de "
 "software libre [StatusNet](http://status.net/). "
 
-#: actions/showstream.php:305
+#. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
+#: actions/showstream.php:328
 #, php-format
 msgid "Repeat of %s"
 msgstr "Repetición de %s"
@@ -5068,35 +5110,44 @@ msgstr "Límite de duplicados"
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr "Cuántos segundos es necesario esperar para publicar lo mismo de nuevo."
 
-#: actions/sitenoticeadminpanel.php:56
+#. TRANS: Page title for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:55
 msgid "Site Notice"
 msgstr "Aviso del mensaje"
 
-#: actions/sitenoticeadminpanel.php:67
+#. TRANS: Instructions for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:66
 msgid "Edit site-wide message"
 msgstr "Editar el mensaje que va a lo ancho del sitio"
 
-#: actions/sitenoticeadminpanel.php:103
+#. TRANS: Server error displayed when saving a site-wide notice was impossible.
+#: actions/sitenoticeadminpanel.php:101
 msgid "Unable to save site notice."
 msgstr "No se pudo guarda el aviso del sitio."
 
-#: actions/sitenoticeadminpanel.php:113
-msgid "Max length for the site-wide notice is 255 chars."
+#. TRANS: Client error displayed when a site-wide notice was longer than allowed.
+#: actions/sitenoticeadminpanel.php:112
+#, fuzzy
+msgid "Maximum length for the site-wide notice is 255 characters."
 msgstr ""
 "La longitud máxima para el aviso que va a lo ancho del sitio es de 255 "
 "caracteres."
 
+#. TRANS: Label for site-wide notice text field in admin panel.
 #: actions/sitenoticeadminpanel.php:176
 msgid "Site notice text"
 msgstr "Texto del mensaje del sitio"
 
-#: actions/sitenoticeadminpanel.php:178
-msgid "Site-wide notice text (255 chars max; HTML okay)"
+#. TRANS: Tooltip for site-wide notice text field in admin panel.
+#: actions/sitenoticeadminpanel.php:179
+#, fuzzy
+msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr ""
 "Texto del mensaje que va a lo ancho del sitio (máximo 255 caracteres; se "
 "acepta HTML)"
 
-#: actions/sitenoticeadminpanel.php:198
+#. TRANS: Title for button to save site notice in admin panel.
+#: actions/sitenoticeadminpanel.php:201
 msgid "Save site notice"
 msgstr "Guardar el mensaje del sitio"
 
@@ -5565,75 +5616,93 @@ msgstr ""
 "sitio ‘%2$s’."
 
 #. TRANS: User admin panel title
-#: actions/useradminpanel.php:60
+#: actions/useradminpanel.php:58
 msgctxt "TITLE"
 msgid "User"
 msgstr "Usuario"
 
-#: actions/useradminpanel.php:71
+#. TRANS: Instruction for user admin panel.
+#: actions/useradminpanel.php:69
 msgid "User settings for this StatusNet site"
 msgstr ""
 
-#: actions/useradminpanel.php:150
+#. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
+#: actions/useradminpanel.php:147
 msgid "Invalid bio limit. Must be numeric."
 msgstr "Límite para la bio inválido: Debe ser numérico."
 
-#: actions/useradminpanel.php:156
-msgid "Invalid welcome text. Max length is 255 characters."
+#. TRANS: Form validation error in user admin panel when welcome text is too long.
+#: actions/useradminpanel.php:154
+#, fuzzy
+msgid "Invalid welcome text. Maximum length is 255 characters."
 msgstr "Texto de bienvenida inválido. La longitud máx. es de 255 caracteres."
 
+#. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
+#. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
-#, php-format
-msgid "Invalid default subscripton: '%1$s' is not user."
+#, fuzzy, php-format
+msgid "Invalid default subscripton: '%1$s' is not a user."
 msgstr "Suscripción predeterminada inválida : '%1$s' no es un usuario"
 
 #. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:106
+#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
 #: lib/personalgroupnav.php:109
 msgid "Profile"
 msgstr "Perfil"
 
-#: actions/useradminpanel.php:223
+#. TRANS: Field label in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:220
 msgid "Bio Limit"
 msgstr "Límite de la bio"
 
-#: actions/useradminpanel.php:224
+#. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:222
 msgid "Maximum length of a profile bio in characters."
 msgstr "Longitud máxima de bio de perfil en caracteres."
 
-#: actions/useradminpanel.php:232
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:231
 msgid "New users"
 msgstr "Nuevos usuarios"
 
+#. TRANS: Field label in user admin panel for setting new user welcome text.
 #: actions/useradminpanel.php:236
 msgid "New user welcome"
 msgstr "Bienvenida a nuevos usuarios"
 
-#: actions/useradminpanel.php:237
-msgid "Welcome text for new users (Max 255 chars)."
+#. TRANS: Tooltip in user admin panel for setting new user welcome text.
+#: actions/useradminpanel.php:238
+#, fuzzy
+msgid "Welcome text for new users (maximum 255 characters)."
 msgstr "Texto de bienvenida para nuevos usuarios (máx. 255 caracteres)."
 
-#: actions/useradminpanel.php:242
+#. TRANS: Field label in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:244
 msgid "Default subscription"
 msgstr "Suscripción predeterminada"
 
-#: actions/useradminpanel.php:243
+#. TRANS: Tooltip in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:246
 msgid "Automatically subscribe new users to this user."
 msgstr "Suscribir automáticamente nuevos usuarios a este usuario."
 
-#: actions/useradminpanel.php:252
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:256
 msgid "Invitations"
 msgstr "Invitaciones"
 
-#: actions/useradminpanel.php:257
+#. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:262
 msgid "Invitations enabled"
 msgstr "Invitaciones habilitadas"
 
-#: actions/useradminpanel.php:259
+#. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:265
 msgid "Whether to allow users to invite new users."
 msgstr "Si permitir a los usuarios invitar nuevos usuarios."
 
-#: actions/useradminpanel.php:295
+#. TRANS: Title for button to save user settings in user admin panel.
+#: actions/useradminpanel.php:302
 msgid "Save user settings"
 msgstr ""
 
@@ -5844,7 +5913,7 @@ msgid "Plugins"
 msgstr "Complementos"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:831
+#: actions/version.php:198 lib/action.php:880
 msgid "Version"
 msgstr "Versión"
 
@@ -6054,16 +6123,23 @@ msgstr "No se ha podido guardar la información del grupo local."
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
+#. TRANS: Full name of a profile or group followed by nickname in parens
+#: classes/Profile.php:164
+#, fuzzy, php-format
+msgctxt "FANCYNAME"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:791
+#: classes/Profile.php:812
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr "No se puede revocar rol \"%1$s\" para usuario #%2$d; no existe."
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:800
+#: classes/Profile.php:821
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6210,194 +6286,201 @@ msgstr "%1$s - %2$s"
 msgid "Untitled page"
 msgstr "Página sin título"
 
+#. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
+#: lib/action.php:310
+msgctxt "TOOLTIP"
+msgid "Show more"
+msgstr ""
+
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:477
+#: lib/action.php:526
 msgid "Primary site navigation"
 msgstr "Navegación de sitio primario"
 
 #. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:483
+#: lib/action.php:532
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "Perfil personal y línea temporal de amistades"
 
 #. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:486
+#: lib/action.php:535
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Personal"
 
 #. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:488
+#: lib/action.php:537
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
 msgstr "Cambia tu correo electrónico, imagen, contraseña, perfil"
 
 #. TRANS: Main menu option when logged in for access to user settings
-#: lib/action.php:491
+#: lib/action.php:540
 msgid "Account"
 msgstr "Cuenta"
 
 #. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:493
+#: lib/action.php:542
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "Conectar a los servicios"
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:496
+#: lib/action.php:545
 msgid "Connect"
 msgstr "Conectarse"
 
 #. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:499
+#: lib/action.php:548
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "Cambiar la configuración del sitio"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:502 lib/groupnav.php:117
+#: lib/action.php:551 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Admin"
 
 #. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:506
+#: lib/action.php:555
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Invita a amistades y compañeros a unirse a tí en %s"
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:509
+#: lib/action.php:558
 msgctxt "MENU"
 msgid "Invite"
 msgstr "Invitar"
 
 #. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:515
+#: lib/action.php:564
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "Cerrar sesión en el sitio"
 
 #. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:518
+#: lib/action.php:567
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Cerrar sesión"
 
 #. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:523
+#: lib/action.php:572
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "Crear una cuenta"
 
 #. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:526
+#: lib/action.php:575
 msgctxt "MENU"
 msgid "Register"
 msgstr "Registrarse"
 
 #. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:529
+#: lib/action.php:578
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "Iniciar sesión en el sitio"
 
 #. TRANS: Main menu option when not logged in to log in
-#: lib/action.php:532
+#: lib/action.php:581
 msgctxt "MENU"
 msgid "Login"
 msgstr "Inicio de sesión"
 
 #. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:535
+#: lib/action.php:584
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "¡Ayúdame!"
 
 #. TRANS: Main menu option for help on the StatusNet site
-#: lib/action.php:538
+#: lib/action.php:587
 msgctxt "MENU"
 msgid "Help"
 msgstr "Ayuda"
 
 #. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:541
+#: lib/action.php:590
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr "Buscar personas o texto"
 
 #. TRANS: Main menu option when logged in or when the StatusNet instance is not private
-#: lib/action.php:544
+#: lib/action.php:593
 msgctxt "MENU"
 msgid "Search"
 msgstr "Buscar"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:566 lib/adminpanelaction.php:387
+#: lib/action.php:615 lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "Mensaje de sitio"
 
 #. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:633
+#: lib/action.php:682
 msgid "Local views"
 msgstr "Vistas locales"
 
 #. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:703
+#: lib/action.php:752
 msgid "Page notice"
 msgstr "Mensaje de página"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:804
+#: lib/action.php:853
 msgid "Secondary site navigation"
 msgstr "Navegación de sitio secundario"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:810
+#: lib/action.php:859
 msgid "Help"
 msgstr "Ayuda"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:813
+#: lib/action.php:862
 msgid "About"
 msgstr "Acerca de"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:816
+#: lib/action.php:865
 msgid "FAQ"
 msgstr "Preguntas Frecuentes"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:821
+#: lib/action.php:870
 msgid "TOS"
 msgstr "TOS"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:825
+#: lib/action.php:874
 msgid "Privacy"
 msgstr "Privacidad"
 
-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:828
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+#: lib/action.php:877
 msgid "Source"
 msgstr "Fuente"
 
-#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:834
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+#: lib/action.php:884
 msgid "Contact"
 msgstr "Ponerse en contacto"
 
-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:837
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+#: lib/action.php:887
 msgid "Badge"
 msgstr "Insignia"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:866
+#: lib/action.php:916
 msgid "StatusNet software license"
 msgstr "Licencia de software de StatusNet"
 
@@ -6405,7 +6488,7 @@ msgstr "Licencia de software de StatusNet"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:873
+#: lib/action.php:923
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -6415,7 +6498,7 @@ msgstr ""
 "[%%site.broughtby%%**](%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:876
+#: lib/action.php:926
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** es un servicio de microblogueo."
@@ -6424,7 +6507,7 @@ msgstr "**%%site.name%%** es un servicio de microblogueo."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:883
+#: lib/action.php:933
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -6436,27 +6519,27 @@ msgstr ""
 "licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:899
+#: lib/action.php:949
 msgid "Site content license"
 msgstr "Licencia de contenido del sitio"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:906
+#: lib/action.php:956
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "El contenido y datos de %1$s son privados y confidenciales."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:913
+#: lib/action.php:963
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 "Copyright del contenido y los datos de%1$s. Todos los derechos reservados."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:917
+#: lib/action.php:967
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "Derechos de autor de contenido y datos por los colaboradores. Todos los "
@@ -6464,7 +6547,7 @@ msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:949
+#: lib/action.php:999
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
@@ -6472,19 +6555,19 @@ msgstr ""
 "$s."
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1285
+#: lib/action.php:1335
 msgid "Pagination"
 msgstr "Paginación"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1296
+#: lib/action.php:1346
 msgid "After"
 msgstr "Después"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1306
+#: lib/action.php:1356
 msgid "Before"
 msgstr "Antes"
 
@@ -6832,7 +6915,7 @@ msgid "AJAX error"
 msgstr "Error de Ajax"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:233 lib/mailhandler.php:142
+#: lib/channel.php:233 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "Comando completo"
 
@@ -6848,7 +6931,7 @@ msgstr "No existe ningún mensaje con ese ID."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:626
+#: lib/command.php:99 lib/command.php:630
 msgid "User has no last notice."
 msgstr "El/La usuario/a no tiene ningún último mensaje"
 
@@ -6918,6 +7001,14 @@ msgstr "%1$s se unió al grupo %2$s."
 msgid "%1$s left group %2$s."
 msgstr "%1$s dejo el grupo %2$s."
 
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: lib/command.php:426
+#, fuzzy, php-format
+msgctxt "WHOIS"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
 #. TRANS: Whois output. %s is the full name of the queried user.
 #: lib/command.php:430
 #, php-format
@@ -6957,113 +7048,119 @@ msgstr ""
 "%s es un perfil remoto: sólo puedes enviarle mensajes directos a usuarios en "
 "el mismo servidor."
 
-#. TRANS: Message given if content is too long.
+#. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
 #: lib/command.php:488
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr "Mensaje muy largo - máximo %1$d caracteres, enviaste %2$d"
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] "Mensaje muy largo - máximo %1$d caracteres, enviaste %2$d"
+msgstr[1] "Mensaje muy largo - máximo %1$d caracteres, enviaste %2$d"
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:514
+#: lib/command.php:516
 msgid "Error sending direct message."
 msgstr "Error al enviar mensaje directo."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:551
+#: lib/command.php:553
 #, php-format
 msgid "Notice from %s repeated."
 msgstr "Se ha repetido el mensaje de %s."
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:554
+#: lib/command.php:556
 msgid "Error repeating notice."
 msgstr "Ha habido un error al repetir el mensaje."
 
-#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:589
-#, php-format
-msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
-msgstr "Mensaje demasiado largo - el máximo es de 140 caracteres, enviaste %d."
+#: lib/command.php:591
+#, fuzzy, php-format
+msgid "Notice too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] ""
+"Mensaje demasiado largo - el máximo es de 140 caracteres, enviaste %d."
+msgstr[1] ""
+"Mensaje demasiado largo - el máximo es de 140 caracteres, enviaste %d."
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:600
+#: lib/command.php:604
 #, php-format
 msgid "Reply to %s sent."
 msgstr "Se ha enviado la respuesta a %s."
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:603
+#: lib/command.php:607
 msgid "Error saving notice."
 msgstr "Error al guardar el mensaje."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:650
+#: lib/command.php:654
 msgid "Specify the name of the user to subscribe to."
 msgstr "Especificar el nombre del usuario al cual se quiere suscribir."
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:659
+#: lib/command.php:663
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "No te puedes suscribir a perfiles de OMB por orden."
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:667
+#: lib/command.php:671
 #, php-format
 msgid "Subscribed to %s."
 msgstr "Suscrito a %s."
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:688 lib/command.php:799
+#: lib/command.php:692 lib/command.php:803
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "Especifica el nombre del usuario del cual cancelar la suscripción."
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:699
+#: lib/command.php:703
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr "Cancelada la suscripción a %s."
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:719 lib/command.php:745
+#: lib/command.php:723 lib/command.php:749
 msgid "Command not yet implemented."
 msgstr "Todavía no se implementa comando."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:723
+#: lib/command.php:727
 msgid "Notification off."
 msgstr "Notificación no activa."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:726
+#: lib/command.php:730
 msgid "Can't turn off notification."
 msgstr "No se puede desactivar notificación."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:749
+#: lib/command.php:753
 msgid "Notification on."
 msgstr "Notificación activada."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:752
+#: lib/command.php:756
 msgid "Can't turn on notification."
 msgstr "No se puede activar notificación."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:766
+#: lib/command.php:770
 msgid "Login command is disabled."
 msgstr "El comando de inicio de sesión está inhabilitado."
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:779
+#: lib/command.php:783
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
@@ -7072,20 +7169,20 @@ msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:808
+#: lib/command.php:812
 #, php-format
 msgid "Unsubscribed %s."
 msgstr "Cancelada la suscripción a %s."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:826
+#: lib/command.php:830
 msgid "You are not subscribed to anyone."
 msgstr "No estás suscrito a nadie."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:831
+#: lib/command.php:835
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Ya estás suscrito a estos usuarios:"
@@ -7093,14 +7190,14 @@ msgstr[1] "Ya estás suscrito a estos usuarios:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:853
+#: lib/command.php:857
 msgid "No one is subscribed to you."
 msgstr "Nadie está suscrito a ti."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:858
+#: lib/command.php:862
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "No se pudo suscribir otro a ti."
@@ -7108,21 +7205,21 @@ msgstr[1] "No se pudo suscribir otro a ti."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:880
+#: lib/command.php:884
 msgid "You are not a member of any groups."
 msgstr "No eres miembro de ningún grupo"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:885
+#: lib/command.php:889
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Eres miembro de este grupo:"
 msgstr[1] "Eres miembro de estos grupos:"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:900
+#: lib/command.php:904
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -7354,7 +7451,8 @@ msgstr ""
 "1-64 letras en minúscula o números, sin signos de puntuación o espacios"
 
 #: lib/groupeditform.php:163
-msgid "URL of the homepage or blog of the group or topic"
+#, fuzzy
+msgid "URL of the homepage or blog of the group or topic."
 msgstr "URL de página de inicio o blog del grupo o tema"
 
 #: lib/groupeditform.php:168
@@ -7362,21 +7460,31 @@ msgid "Describe the group or topic"
 msgstr "Describir al grupo o tema"
 
 #: lib/groupeditform.php:170
-#, php-format
-msgid "Describe the group or topic in %d characters"
-msgstr "Describir al grupo o tema en %d caracteres"
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d character or less"
+msgid_plural "Describe the group or topic in %d characters or less"
+msgstr[0] "Describir al grupo o tema en %d caracteres"
+msgstr[1] "Describir al grupo o tema en %d caracteres"
 
-#: lib/groupeditform.php:179
+#: lib/groupeditform.php:182
+#, fuzzy
 msgid ""
-"Location for the group, if any, like \"City, State (or Region), Country\""
+"Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr ""
 "Ubicación del grupo, si existe, por ejemplo \"Ciudad, Estado (o Región), País"
 "\""
 
-#: lib/groupeditform.php:187
-#, php-format
-msgid "Extra nicknames for the group, comma- or space- separated, max %d"
-msgstr ""
+#: lib/groupeditform.php:190
+#, fuzzy, php-format
+msgid ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"alias allowed."
+msgid_plural ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"aliases allowed."
+msgstr[0] ""
+"Nombres adicionales para el grupo, separados por comas o espacios. Máximo: %d"
+msgstr[1] ""
 "Nombres adicionales para el grupo, separados por comas o espacios. Máximo: %d"
 
 #. TRANS: Menu item in the group navigation page.
@@ -7935,7 +8043,7 @@ msgstr "Lo sentimos, pero este no es su dirección de correo entrante."
 msgid "Sorry, no incoming email allowed."
 msgstr "Lo sentimos, pero no se permite correos entrantes"
 
-#: lib/mailhandler.php:228
+#: lib/mailhandler.php:229
 #, php-format
 msgid "Unsupported message type: %s"
 msgstr "Tipo de mensaje no compatible: %s"
@@ -8285,16 +8393,17 @@ msgid "Sandbox this user"
 msgstr "Imponer restricciones a este usuario"
 
 #. TRANS: Fieldset legend for the search form.
-#: lib/searchaction.php:121
+#: lib/searchaction.php:120
 msgid "Search site"
 msgstr "Buscar sitio"
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
-#: lib/searchaction.php:129
+#: lib/searchaction.php:128
 msgid "Keyword(s)"
 msgstr "Palabra(s) clave"
 
+#. TRANS: Button text for searching site.
 #: lib/searchaction.php:130
 msgctxt "BUTTON"
 msgid "Search"
@@ -8384,8 +8493,8 @@ msgid "The theme file is missing or the upload failed."
 msgstr "El archivo de tema está perdido o la carga falló."
 
 #: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:278 lib/themeuploader.php:282
-#: lib/themeuploader.php:290 lib/themeuploader.php:297
+#: lib/themeuploader.php:279 lib/themeuploader.php:283
+#: lib/themeuploader.php:291 lib/themeuploader.php:298
 msgid "Failed saving theme."
 msgstr "Grabado de tema errado."
 
@@ -8394,16 +8503,20 @@ msgid "Invalid theme: bad directory structure."
 msgstr "Tema inválido: mala estructura de directorio."
 
 #: lib/themeuploader.php:166
-#, php-format
-msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
-msgstr ""
+#, fuzzy, php-format
+msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
+msgid_plural ""
+"Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr[0] ""
+"Tema subido es demasiado grande; debe ser menor que %d bytes sin comprimir."
+msgstr[1] ""
 "Tema subido es demasiado grande; debe ser menor que %d bytes sin comprimir."
 
-#: lib/themeuploader.php:178
+#: lib/themeuploader.php:179
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr "Archivo de tema inválido: archivo perdido css/display.css"
 
-#: lib/themeuploader.php:218
+#: lib/themeuploader.php:219
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
@@ -8411,18 +8524,18 @@ msgstr ""
 "El tema contiene archivo o nombre de carpeta inválido. Restrínjase a letras "
 "ASCII, dígitos, carácter de subrayado, y signo menos."
 
-#: lib/themeuploader.php:224
+#: lib/themeuploader.php:225
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr ""
 "El tema contiene nombres de extensiones de archivo inseguras y puede ser "
 "peligroso."
 
-#: lib/themeuploader.php:241
+#: lib/themeuploader.php:242
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr "El tema contiene archivo de tipo '.%s', que no está permitido."
 
-#: lib/themeuploader.php:259
+#: lib/themeuploader.php:260
 msgid "Error opening theme archive."
 msgstr "Error al abrir archivo de tema."
 
@@ -8603,23 +8716,40 @@ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
 msgstr[0] "Mensaje muy largo - máximo %1$d caracteres, enviaste %2$d"
 msgstr[1] "Mensaje muy largo - máximo %1$d caracteres, enviaste %2$d"
 
-#: scripts/restoreuser.php:82
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: scripts/restoreuser.php:61
 #, php-format
-msgid "Backup file for user %s (%s)"
+msgid "Getting backup from file '%s'."
 msgstr ""
 
-#: scripts/restoreuser.php:88
+#. TRANS: Commandline script output.
+#: scripts/restoreuser.php:91
 #, fuzzy
 msgid "No user specified; using backup user."
 msgstr "No se ha especificado ID de usuario."
 
-#: scripts/restoreuser.php:94
+#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
+#: scripts/restoreuser.php:98
 #, php-format
-msgid "%d entries in backup."
-msgstr ""
+msgid "%d entry in backup."
+msgid_plural "%d entries in backup."
+msgstr[0] ""
+msgstr[1] ""
+
+#, fuzzy
+#~ msgid "Name is too long (maximum 255 chars)."
+#~ msgstr "El nombre es muy largo (máx. 255 carac.)"
+
+#, fuzzy
+#~ msgid "Organization is too long (maximum 255 chars)."
+#~ msgstr "El texto de organización es muy largo (máx. 255 caracteres)."
+
+#~ msgid "That's too long. Max notice size is %d chars."
+#~ msgstr "El mensaje es muy largo. El tamaño máximo es de %d caracteres."
 
-#~ msgid "Description is too long (max %d chars)."
-#~ msgstr "La descripción es demasiado larga (máx. %d caracteres)."
+#~ msgid "Max notice size is %d chars, including attachment URL."
+#~ msgstr ""
+#~ "El tamaño máximo del mensaje es %d caracteres, incluyendo el URL adjunto."
 
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "¡Muchos seudónimos! El máximo es %d."
+#~ msgid " tagged %s"
+#~ msgstr "%s etiquetados"
diff --git a/locale/fa/LC_MESSAGES/statusnet.po b/locale/fa/LC_MESSAGES/statusnet.po
index 97672a3d6..bc2d2b275 100644
--- a/locale/fa/LC_MESSAGES/statusnet.po
+++ b/locale/fa/LC_MESSAGES/statusnet.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-30 23:18+0000\n"
-"PO-Revision-Date: 2010-10-30 23:20:11+0000\n"
+"POT-Creation-Date: 2010-11-02 22:51+0000\n"
+"PO-Revision-Date: 2010-11-02 22:53:16+0000\n"
 "Last-Translator: Ahmad Sufi Mahmudi\n"
 "Language-Team: Persian <http://translatewiki.net/wiki/Portal:fa>\n"
 "MIME-Version: 1.0\n"
@@ -23,9 +23,9 @@ msgstr ""
 "X-Language-Code: fa\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: MediaWiki 1.17alpha (r75708); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r75875); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-POT-Import-Date: 2010-10-30 09:48:40+0000\n"
+"X-POT-Import-Date: 2010-10-30 23:42:01+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -82,15 +82,20 @@ msgstr "ذخیرهٔ تنظیمات دسترسی"
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
+#. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
+#. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #: actions/accessadminpanel.php:193 actions/emailsettings.php:228
-#: actions/imsettings.php:187 actions/pathsadminpanel.php:512
-#: actions/profilesettings.php:201 actions/smssettings.php:209
-#: actions/subscriptions.php:246 lib/applicationeditform.php:355
+#: actions/imsettings.php:187 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: lib/applicationeditform.php:355 lib/groupeditform.php:207
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "ذخیره"
@@ -141,7 +146,7 @@ msgstr "چنین صفحه‌ای وجود ندارد."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:495 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "چنین کاربری وجود ندارد."
@@ -212,7 +217,9 @@ msgstr ""
 
 #. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:208
+#. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -561,8 +568,11 @@ msgstr "نام کامل خیلی طولانی است (حداکثر ۲۵۵ نوی
 #. TRANS: Group edit form validation error.
 #. TRANS: Form validation error in New application form.
 #. TRANS: %d is the maximum number of characters for the description.
+#. TRANS: Group create form validation error.
+#. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:220 actions/editapplication.php:201
 #: actions/editgroup.php:216 actions/newapplication.php:178
+#: actions/newgroup.php:152
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -720,14 +730,14 @@ msgstr "شما شناسایی نشده اید."
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:172 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:74
 #: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
 #: actions/groupunblock.php:65 actions/imsettings.php:230
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
-#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/othersettings.php:153 actions/passwordsettings.php:138
 #: actions/profilesettings.php:221 actions/recoverpassword.php:350
 #: actions/register.php:172 actions/remotesubscribe.php:77
 #: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
@@ -909,20 +919,21 @@ msgstr "شما توانایی حذف وضعیت کاربر دیگری را ند�
 
 #. TRANS: Client error displayed trying to repeat a non-existing notice through the API.
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
+#. TRANS: Error message displayed trying to delete a non-existing notice.
 #: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/deletenotice.php:58 actions/shownotice.php:92
+#: actions/deletenotice.php:61 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "چنین پیامی وجود ندارد."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:535
+#: actions/apistatusesretweet.php:83 lib/command.php:537
 msgid "Cannot repeat your own notice."
 msgstr "نمی توانید پیام خود را تکرار کنید."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:541
+#: actions/apistatusesretweet.php:92 lib/command.php:543
 msgid "Already repeated that notice."
 msgstr "قبلا آن پیام تکرار شده است."
 
@@ -943,7 +954,8 @@ msgstr ""
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#: actions/apistatusesupdate.php:244
+#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
+#: lib/mailhandler.php:60
 #, fuzzy, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
@@ -957,7 +969,7 @@ msgstr "رابط مورد نظر پیدا نشد."
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
-#: actions/apistatusesupdate.php:308
+#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
 #, fuzzy, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
@@ -1169,17 +1181,18 @@ msgstr ""
 msgid "Lost our file data."
 msgstr "فایل اطلاعات خود را گم کرده ایم."
 
-#: actions/avatarsettings.php:384
+#. TRANS: Success message for having updated a user avatar.
+#: actions/avatarsettings.php:385
 msgid "Avatar updated."
 msgstr "چهره به روز رسانی شد."
 
 #. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
-#: actions/avatarsettings.php:388
+#: actions/avatarsettings.php:389
 msgid "Failed updating avatar."
 msgstr "به روز رسانی چهره موفقیت آمیر نبود."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:412
+#: actions/avatarsettings.php:413
 msgid "Avatar deleted."
 msgstr "چهره پاک شد."
 
@@ -1212,8 +1225,8 @@ msgstr ""
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:154 actions/deleteapplication.php:154
-#: actions/deletegroup.php:220 actions/deletenotice.php:150
+#: actions/block.php:154 actions/deleteapplication.php:157
+#: actions/deletegroup.php:220 actions/deletenotice.php:155
 #: actions/deleteuser.php:152 actions/groupblock.php:178
 msgctxt "BUTTON"
 msgid "No"
@@ -1231,8 +1244,8 @@ msgstr "کاربر را مسدود نکن"
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:161 actions/deleteapplication.php:161
-#: actions/deletegroup.php:227 actions/deletenotice.php:157
+#: actions/block.php:161 actions/deleteapplication.php:164
+#: actions/deletegroup.php:227 actions/deletenotice.php:162
 #: actions/deleteuser.php:159 actions/groupblock.php:185
 msgctxt "BUTTON"
 msgid "Yes"
@@ -1349,12 +1362,13 @@ msgstr "آن نشانی در حال حاضر تصدیق شده است."
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
 #. TRANS: Server error thrown on database error updating IM preferences.
 #. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
 #. TRANS: Server error thrown when user profile settings could not be updated.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #: actions/confirmaddress.php:118 actions/emailsettings.php:331
 #: actions/emailsettings.php:477 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:174
+#: actions/imsettings.php:442 actions/othersettings.php:184
 #: actions/profilesettings.php:326 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
@@ -1390,16 +1404,19 @@ msgstr "مکالمه"
 msgid "Notices"
 msgstr "پیام‌ها"
 
-#: actions/deleteapplication.php:63
+#. TRANS: Client error displayed trying to delete an application while not logged in.
+#: actions/deleteapplication.php:62
 msgid "You must be logged in to delete an application."
 msgstr "برای پاک‌کردن یک برنامه باید وارد شده باشید."
 
+#. TRANS: Client error displayed trying to delete an application that does not exist.
 #: actions/deleteapplication.php:71
 msgid "Application not found."
 msgstr "برنامه یافت نشد."
 
+#. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
-#: actions/deleteapplication.php:78 actions/editapplication.php:78
+#: actions/deleteapplication.php:79 actions/editapplication.php:78
 #: actions/showapplication.php:94
 msgid "You are not the owner of this application."
 msgstr "شما مالک این برنامه نیستید."
@@ -1407,15 +1424,18 @@ msgstr "شما مالک این برنامه نیستید."
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
 #: actions/newapplication.php:114 actions/showapplication.php:118
-#: lib/action.php:1354
+#: lib/action.php:1404
 msgid "There was a problem with your session token."
 msgstr "یک مشکل با رمز نشست شما وجود داشت."
 
-#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+#. TRANS: Title for delete application page.
+#. TRANS: Fieldset legend on delete application page.
+#: actions/deleteapplication.php:124 actions/deleteapplication.php:149
 msgid "Delete application"
 msgstr "حذف برنامه"
 
-#: actions/deleteapplication.php:149
+#. TRANS: Confirmation text on delete application page.
+#: actions/deleteapplication.php:152
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
 "about the application from the database, including all existing user "
@@ -1426,12 +1446,12 @@ msgstr ""
 "می‌شود."
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:158
+#: actions/deleteapplication.php:161
 msgid "Do not delete this application"
 msgstr "این برنامه حذف نشود"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:164
+#: actions/deleteapplication.php:167
 msgid "Delete this application"
 msgstr "این برنامه حذف شود"
 
@@ -1467,13 +1487,14 @@ msgstr "نمی‌توان گروه را به‌هنگام‌سازی کرد."
 msgid "Deleted group %s"
 msgstr "%1$s گروه %2$s را ترک کرد"
 
-#. TRANS: Title.
+#. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
 #: actions/deletegroup.php:176 actions/deletegroup.php:202
 #, fuzzy
 msgid "Delete group"
 msgstr "حذف کاربر"
 
+#. TRANS: Warning in form for deleleting a group.
 #: actions/deletegroup.php:206
 #, fuzzy
 msgid ""
@@ -1496,10 +1517,11 @@ msgstr "این پیام را پاک نکن"
 msgid "Delete this group"
 msgstr "حذف این کاربر"
 
+#. TRANS: Error message displayed trying to delete a notice while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1509,11 +1531,13 @@ msgstr "حذف این کاربر"
 msgid "Not logged in."
 msgstr "شما به سیستم وارد نشده اید."
 
-#: actions/deletenotice.php:74
+#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
+#: actions/deletenotice.php:78
 msgid "Can't delete this notice."
 msgstr "نمی‌توان این پیام را پاک کرد."
 
-#: actions/deletenotice.php:106
+#. TRANS: Instructions for deleting a notice.
+#: actions/deletenotice.php:110
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
@@ -1521,21 +1545,24 @@ msgstr ""
 "شما می‌خواهید یک پیام را به طور کامل پاک کنید. پس از انجام این کار نمی‌توان "
 "پیام را بازگرداند."
 
-#: actions/deletenotice.php:112 actions/deletenotice.php:144
+#. TRANS: Page title when deleting a notice.
+#. TRANS: Fieldset legend for the delete notice form.
+#: actions/deletenotice.php:117 actions/deletenotice.php:148
 msgid "Delete notice"
 msgstr "پیام را پاک کن"
 
-#: actions/deletenotice.php:147
+#. TRANS: Message for the delete notice form.
+#: actions/deletenotice.php:152
 msgid "Are you sure you want to delete this notice?"
 msgstr "آیا اطمینان دارید که می‌خواهید این پیام را پاک کنید؟"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:154
+#: actions/deletenotice.php:159
 msgid "Do not delete this notice"
 msgstr "این پیام را پاک نکن"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:161 lib/noticelist.php:667
+#: actions/deletenotice.php:166 lib/noticelist.php:667
 msgid "Delete this notice"
 msgstr "این پیام را پاک کن"
 
@@ -1701,11 +1728,9 @@ msgstr "برگشت به حالت پیش گزیده"
 
 #. TRANS: Submit button title.
 #: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
-#: actions/othersettings.php:126 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: actions/useradminpanel.php:295 lib/applicationeditform.php:357
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: lib/applicationeditform.php:357 lib/designsettings.php:256
 msgid "Save"
 msgstr "ذخیره‌کردن"
 
@@ -1753,9 +1778,9 @@ msgid "Name is required."
 msgstr "نام مورد نیاز است."
 
 #. TRANS: Validation error shown when providing too long a name in the "Edit application" form.
-#: actions/editapplication.php:188
+#: actions/editapplication.php:188 actions/newapplication.php:169
 #, fuzzy
-msgid "Name is too long (max 255 characters)."
+msgid "Name is too long (maximum 255 characters)."
 msgstr "نام خیلی طولانی است (حداکثر ۲۵۵ نویسه)."
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
@@ -1784,7 +1809,7 @@ msgid "Organization is required."
 msgstr "سازمانی‌دهی مورد نیاز است."
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#: actions/editapplication.php:223
+#: actions/editapplication.php:223 actions/newapplication.php:199
 #, fuzzy
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "نام سازمان خیلی طولانی است (حداکثر ۲۵۵ نویسه)."
@@ -2579,7 +2604,7 @@ msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "یک شناسهٔ کوچک برای Jabber/Gtalk من منتشر کن."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:180
+#: actions/imsettings.php:290 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "تنظیمات ذخیره شد."
 
@@ -2701,10 +2726,9 @@ msgstr[0] "شما هم‌اکنون مشترک این کاربران هستید:
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#. TRANS: Whois output.
-#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:145 actions/invite.php:159 lib/command.php:426
-#, php-format
+#: actions/invite.php:145 actions/invite.php:159
+#, fuzzy, php-format
+msgctxt "INVITE"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
@@ -2885,8 +2909,9 @@ msgid ""
 msgstr ""
 
 #: actions/licenseadminpanel.php:156
-msgid "Invalid license title. Max length is 255 characters."
-msgstr ""
+#, fuzzy
+msgid "Invalid license title. Maximum length is 255 characters."
+msgstr "متن خوشامدگویی نامعتبر است. بیشینهٔ طول متن ۲۵۵ نویسه است."
 
 #: actions/licenseadminpanel.php:168
 msgid "Invalid license URL."
@@ -3057,20 +3082,10 @@ msgstr "برای ثبت یک برنامه باید وارد شده باشید."
 msgid "Use this form to register a new application."
 msgstr "از این شیوه برای ساختن یک برنامهٔ تازه استفاده کنید."
 
-#: actions/newapplication.php:169
-#, fuzzy
-msgid "Name is too long (maximum 255 chars)."
-msgstr "نام خیلی طولانی است (حداکثر ۲۵۵ نویسه)."
-
 #: actions/newapplication.php:184
 msgid "Source URL is required."
 msgstr "نشانی اینترنتی منبع مورد نیاز است."
 
-#: actions/newapplication.php:199
-#, fuzzy
-msgid "Organization is too long (maximum 255 chars)."
-msgstr "نام سازمان خیلی طولانی است (حداکثر ۲۵۵ نویسه)."
-
 #: actions/newapplication.php:266 actions/newapplication.php:275
 msgid "Could not create application."
 msgstr "نمی‌توان برنامه را ساخت."
@@ -3090,14 +3105,14 @@ msgid "New message"
 msgstr "پیام جدید"
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:499
+#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501
 msgid "You can't send a message to this user."
 msgstr "شما نمی توانید به این کاربر پیام بفرستید."
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
 #: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
-#: lib/command.php:579
+#: lib/command.php:581
 msgid "No content!"
 msgstr "محتوایی وحود ندارد!"
 
@@ -3106,7 +3121,7 @@ msgid "No recipient specified."
 msgstr "هیچ گیرنده ای مشخص نشده"
 
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:503
+#: actions/newmessage.php:167 lib/command.php:505
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "یک پیام را به خودتان نفرستید؛ در عوض آن را آهسته برای خود بگویید."
@@ -3117,12 +3132,12 @@ msgstr "پیام فرستاده‌شد"
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:511
+#: actions/newmessage.php:188 lib/command.php:513
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "پیام مستقیم به %s فرستاده شد."
 
-#: actions/newmessage.php:213 actions/newnotice.php:263
+#: actions/newmessage.php:213 actions/newnotice.php:264
 msgid "Ajax Error"
 msgstr "خطای آژاکس"
 
@@ -3130,17 +3145,7 @@ msgstr "خطای آژاکس"
 msgid "New notice"
 msgstr "پیام جدید"
 
-#: actions/newnotice.php:159 lib/mailhandler.php:60
-#, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr "این خیلی طولانی است. بیشینهٔ طول پیام %d نویسه است."
-
-#: actions/newnotice.php:183
-#, php-format
-msgid "Max notice size is %d chars, including attachment URL."
-msgstr "بیشینهٔ طول پیام %d نویسه که شامل نشانی اینترنتی پیوست هم هست."
-
-#: actions/newnotice.php:229
+#: actions/newnotice.php:230
 msgid "Notice posted"
 msgstr "پیام فرستاده‌شد."
 
@@ -3309,36 +3314,46 @@ msgstr "جست‌وجوی کاربران"
 msgid "Notice Search"
 msgstr "جست‌وجوی پیام‌ها"
 
-#: actions/othersettings.php:60
+#: actions/othersettings.php:59
 msgid "Other settings"
 msgstr "تنظیمات دیگر"
 
+#. TRANS: Instructions for tab "Other" in user profile settings.
 #: actions/othersettings.php:71
 msgid "Manage various other options."
 msgstr "مدیریت انتخاب های مختلف دیگر."
 
-#: actions/othersettings.php:108
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/othersettings.php:111
 msgid " (free service)"
 msgstr " (سرویس‌ آزاد)"
 
-#: actions/othersettings.php:116
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/othersettings.php:120
 msgid "Shorten URLs with"
 msgstr "کوتاه‌کردن نشانی‌های اینترنتی با"
 
-#: actions/othersettings.php:117
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/othersettings.php:122
 msgid "Automatic shortening service to use."
 msgstr "کوتاه‌کنندهٔ نشانی مورد استفاده."
 
-#: actions/othersettings.php:122
+#. TRANS: Label for checkbox.
+#: actions/othersettings.php:128
 msgid "View profile designs"
 msgstr "نمایش طراحی‌های نمایه"
 
-#: actions/othersettings.php:123
+#. TRANS: Tooltip for checkbox.
+#: actions/othersettings.php:130
 msgid "Show or hide profile designs."
 msgstr "نمایش دادن یا پنهان کردن طراحی‌های نمایه."
 
-#: actions/othersettings.php:153
-msgid "URL shortening service is too long (max 50 chars)."
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/othersettings.php:162
+#, fuzzy
+msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "کوتاه کنندهٔ نشانی بسیار طولانی است (بیش‌تر از ۵۰ حرف)."
 
 #: actions/otp.php:69
@@ -3827,7 +3842,7 @@ msgstr "شرح‌حال"
 #. TRANS: Label for group location (dt). Text hidden by default.
 #: actions/profilesettings.php:149 actions/register.php:485
 #: actions/showgroup.php:267 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:177
+#: actions/userauthorization.php:166 lib/groupeditform.php:180
 #: lib/userprofile.php:165
 msgid "Location"
 msgstr "موقعیت"
@@ -4164,7 +4179,8 @@ msgid "Unexpected password reset."
 msgstr "گذرواژه به طور غیر منتظره ریست شد."
 
 #: actions/recoverpassword.php:365
-msgid "Password must be 6 chars or more."
+#, fuzzy
+msgid "Password must be 6 characters or more."
 msgstr "گذرواژه باید ۶ نویسه یا بیش‌تر باشد."
 
 #: actions/recoverpassword.php:369
@@ -4539,7 +4555,7 @@ msgstr "سازمان"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:172
+#: lib/applicationeditform.php:208 lib/groupeditform.php:175
 msgid "Description"
 msgstr "توصیف"
 
@@ -4690,7 +4706,7 @@ msgid "Note"
 msgstr "یادداشت"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:298 lib/groupeditform.php:184
+#: actions/showgroup.php:298 lib/groupeditform.php:187
 msgid "Aliases"
 msgstr "نام های مستعار"
 
@@ -4824,47 +4840,67 @@ msgstr "پیام از %1$s در %2$s"
 msgid "Notice deleted."
 msgstr "پیام پاک شد."
 
-#: actions/showstream.php:72
-#, php-format
-msgid " tagged %s"
-msgstr " برچسب‌گذاری‌شده %s"
+#. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
+#: actions/showstream.php:70
+#, fuzzy, php-format
+msgid "%1$s tagged %2$s"
+msgstr "%1$s، صفحهٔ %2$d"
+
+#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#: actions/showstream.php:74
+#, fuzzy, php-format
+msgid "%1$s tagged %2$s, page %3$d"
+msgstr "پیام‌های برچسب‌دار شده با %1$s، صفحهٔ %2$d"
 
-#: actions/showstream.php:78
+#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$d is the page number.
+#: actions/showstream.php:82
 #, php-format
 msgid "%1$s, page %2$d"
 msgstr "%1$s، صفحهٔ %2$d"
 
-#: actions/showstream.php:120
+#. TRANS: Title for link to notice feed.
+#. TRANS: %1$s is a user nickname, %2$s is a hashtag.
+#: actions/showstream.php:127
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "خوراک پیام‌های %1$s دارای برچسب %2$s (RSS 1.0)"
 
-#: actions/showstream.php:127
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:136
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "خوراک پیام‌های %s (RSS 1.0)"
 
-#: actions/showstream.php:134
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:145
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "خوراک پیام‌های %s (RSS 2.0)"
 
-#: actions/showstream.php:141
+#: actions/showstream.php:152
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "خوراک پیام‌های %s (Atom)"
 
-#: actions/showstream.php:146
+#. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
+#. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
+#: actions/showstream.php:159
 #, php-format
 msgid "FOAF for %s"
 msgstr "FOAF برای %s"
 
-#: actions/showstream.php:197
-#, php-format
-msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
+#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
+#: actions/showstream.php:211
+#, fuzzy, php-format
+msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr "این خط‌زمانی %1$s است، اما %2$s تاکنون چیزی نفرستاده است."
 
-#: actions/showstream.php:202
+#. TRANS: Second sentence of empty list message for a stream for the user themselves.
+#: actions/showstream.php:217
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -4872,7 +4908,9 @@ msgstr ""
 "اخیرا چیز جالب توجهی دیده‌اید؟ شما تاکنون پیامی نفرستاده‌اید، الان می‌تواند "
 "زمان خوبی برای شروع باشد :)"
 
-#: actions/showstream.php:204
+#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:221
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -4881,7 +4919,9 @@ msgstr ""
 "اولین کسی باشید که در [این موضوع](%%%%action.newnotice%%%%?status_textarea=%"
 "s) پیام می‌فرستد."
 
-#: actions/showstream.php:243
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:264
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4895,7 +4935,9 @@ msgstr ""
 "،دارد. ]اکنون بپیوندید[(%%%%action.register%%%%) تا پیام‌های **%s** و بلکه "
 "بیش‌تر را دنبال کنید! (]بیش‌تر بخوانید[(%%%%doc.help%%%%))"
 
-#: actions/showstream.php:248
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:271
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4906,7 +4948,8 @@ msgstr ""
 "wikipedia.org/wiki/%D9%85%DB%8C%DA%A9%D8%B1%D9%88%D8%A8%D9%84%D8%A7%DA%AF%DB%"
 "8C%D9%86%DA%AF) بر پایهٔ نرم‌افزار آزاد [StatusNet](http://status.net/) ،دارد. "
 
-#: actions/showstream.php:305
+#. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
+#: actions/showstream.php:328
 #, php-format
 msgid "Repeat of %s"
 msgstr "تکرار %s"
@@ -5018,31 +5061,40 @@ msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 "چه مدت کاربران باید منتظر بمانند (به ثانیه) تا همان چیز را دوباره بفرستند."
 
-#: actions/sitenoticeadminpanel.php:56
+#. TRANS: Page title for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:55
 msgid "Site Notice"
 msgstr "پیام وب‌گاه"
 
-#: actions/sitenoticeadminpanel.php:67
+#. TRANS: Instructions for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:66
 msgid "Edit site-wide message"
 msgstr "ویرایش پیام عمومی وب‌گاه"
 
-#: actions/sitenoticeadminpanel.php:103
+#. TRANS: Server error displayed when saving a site-wide notice was impossible.
+#: actions/sitenoticeadminpanel.php:101
 msgid "Unable to save site notice."
 msgstr "نمی‌توان پیام وب‌گاه را ذخیره کرد."
 
-#: actions/sitenoticeadminpanel.php:113
-msgid "Max length for the site-wide notice is 255 chars."
+#. TRANS: Client error displayed when a site-wide notice was longer than allowed.
+#: actions/sitenoticeadminpanel.php:112
+#, fuzzy
+msgid "Maximum length for the site-wide notice is 255 characters."
 msgstr "بیشینهٔ طول برای پیام عمومی وب‌گاه ۲۵۵ نویسه است."
 
+#. TRANS: Label for site-wide notice text field in admin panel.
 #: actions/sitenoticeadminpanel.php:176
 msgid "Site notice text"
 msgstr "متن پیام وب‌گاه"
 
-#: actions/sitenoticeadminpanel.php:178
-msgid "Site-wide notice text (255 chars max; HTML okay)"
+#. TRANS: Tooltip for site-wide notice text field in admin panel.
+#: actions/sitenoticeadminpanel.php:179
+#, fuzzy
+msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr "متن پیام عمومی وب‌گاه (حداکثر ۲۵۵ نویسه؛ می‌توان از HTML استفاده کرد)"
 
-#: actions/sitenoticeadminpanel.php:198
+#. TRANS: Title for button to save site notice in admin panel.
+#: actions/sitenoticeadminpanel.php:201
 msgid "Save site notice"
 msgstr "ذخیرهٔ پیام وب‌گاه"
 
@@ -5508,75 +5560,93 @@ msgid ""
 msgstr "مجوز پیام «%1$s» با مجوز وب‌گاه «%2$s» سازگار نیست."
 
 #. TRANS: User admin panel title
-#: actions/useradminpanel.php:60
+#: actions/useradminpanel.php:58
 msgctxt "TITLE"
 msgid "User"
 msgstr "کاربر"
 
-#: actions/useradminpanel.php:71
+#. TRANS: Instruction for user admin panel.
+#: actions/useradminpanel.php:69
 msgid "User settings for this StatusNet site"
 msgstr ""
 
-#: actions/useradminpanel.php:150
+#. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
+#: actions/useradminpanel.php:147
 msgid "Invalid bio limit. Must be numeric."
 msgstr "محدودیت شرح‌حال نادرست است. مقدار محدودیت باید عددی باشد."
 
-#: actions/useradminpanel.php:156
-msgid "Invalid welcome text. Max length is 255 characters."
+#. TRANS: Form validation error in user admin panel when welcome text is too long.
+#: actions/useradminpanel.php:154
+#, fuzzy
+msgid "Invalid welcome text. Maximum length is 255 characters."
 msgstr "متن خوشامدگویی نامعتبر است. بیشینهٔ طول متن ۲۵۵ نویسه است."
 
+#. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
+#. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
-#, php-format
-msgid "Invalid default subscripton: '%1$s' is not user."
+#, fuzzy, php-format
+msgid "Invalid default subscripton: '%1$s' is not a user."
 msgstr "اشتراک پیش‌فرض نامعتبر است: «%1$s» کاربر نیست."
 
 #. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:106
+#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
 #: lib/personalgroupnav.php:109
 msgid "Profile"
 msgstr "نمایه"
 
-#: actions/useradminpanel.php:223
+#. TRANS: Field label in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:220
 msgid "Bio Limit"
 msgstr "محدودیت شرح‌حال"
 
-#: actions/useradminpanel.php:224
+#. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:222
 msgid "Maximum length of a profile bio in characters."
 msgstr "بیشینهٔ طول یک شرح‌حال نمایه بر اساس نویسه‌ها."
 
-#: actions/useradminpanel.php:232
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:231
 msgid "New users"
 msgstr "کاربران تازه"
 
+#. TRANS: Field label in user admin panel for setting new user welcome text.
 #: actions/useradminpanel.php:236
 msgid "New user welcome"
 msgstr "خوشامدگویی کاربر جدید"
 
-#: actions/useradminpanel.php:237
-msgid "Welcome text for new users (Max 255 chars)."
+#. TRANS: Tooltip in user admin panel for setting new user welcome text.
+#: actions/useradminpanel.php:238
+#, fuzzy
+msgid "Welcome text for new users (maximum 255 characters)."
 msgstr "متن خوشامدگویی برای کاربران جدید (حداکثر ۲۵۵ نویسه)."
 
-#: actions/useradminpanel.php:242
+#. TRANS: Field label in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:244
 msgid "Default subscription"
 msgstr "اشتراک پیش‌فرض"
 
-#: actions/useradminpanel.php:243
+#. TRANS: Tooltip in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:246
 msgid "Automatically subscribe new users to this user."
 msgstr "به صورت خودکار کاربران تازه‌وارد را مشترک این کاربر کن."
 
-#: actions/useradminpanel.php:252
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:256
 msgid "Invitations"
 msgstr "دعوت‌نامه‌ها"
 
-#: actions/useradminpanel.php:257
+#. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:262
 msgid "Invitations enabled"
 msgstr "دعوت نامه ها فعال شدند"
 
-#: actions/useradminpanel.php:259
+#. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:265
 msgid "Whether to allow users to invite new users."
 msgstr "چنان‌که به کاربران اجازهٔ دعوت‌کردن کاربران تازه داده شود."
 
-#: actions/useradminpanel.php:295
+#. TRANS: Title for button to save user settings in user admin panel.
+#: actions/useradminpanel.php:302
 msgid "Save user settings"
 msgstr ""
 
@@ -5780,7 +5850,7 @@ msgid "Plugins"
 msgstr "افزونه‌ها"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:831
+#: actions/version.php:198 lib/action.php:880
 msgid "Version"
 msgstr "نسخه"
 
@@ -5993,16 +6063,23 @@ msgstr "نمی‌توان اطلاعات گروه محلی را ذخیره کر�
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
+#. TRANS: Full name of a profile or group followed by nickname in parens
+#: classes/Profile.php:164
+#, fuzzy, php-format
+msgctxt "FANCYNAME"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:791
+#: classes/Profile.php:812
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr "نمی‌توان نقش «%1$s» را از کاربر  #%2$d گرفت، وجود ندارد."
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:800
+#: classes/Profile.php:821
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6150,194 +6227,201 @@ msgstr "%1$s (%2$s)"
 msgid "Untitled page"
 msgstr "صفحهٔ بدون عنوان"
 
+#. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
+#: lib/action.php:310
+msgctxt "TOOLTIP"
+msgid "Show more"
+msgstr ""
+
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:477
+#: lib/action.php:526
 msgid "Primary site navigation"
 msgstr "مسیریابی اصلی وب‌گاه"
 
 #. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:483
+#: lib/action.php:532
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "نمایهٔ شخصی و خط‌زمانی دوستان"
 
 #. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:486
+#: lib/action.php:535
 msgctxt "MENU"
 msgid "Personal"
 msgstr "شخصی"
 
 #. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:488
+#: lib/action.php:537
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
 msgstr "پست الکترونیکی، تصویر، گذرواژه یا نمایهٔ خودتان را تغییر دهید"
 
 #. TRANS: Main menu option when logged in for access to user settings
-#: lib/action.php:491
+#: lib/action.php:540
 msgid "Account"
 msgstr "حساب کاربری"
 
 #. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:493
+#: lib/action.php:542
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "اتصال به سرویس‌ها"
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:496
+#: lib/action.php:545
 msgid "Connect"
 msgstr "وصل‌شدن"
 
 #. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:499
+#: lib/action.php:548
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "تغییر پیکربندی وب‌گاه"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:502 lib/groupnav.php:117
+#: lib/action.php:551 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "مدیر"
 
 #. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:506
+#: lib/action.php:555
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "دوستان و همکاران‌تان را دعوت کنید تا به شما در %s بپیوندند"
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:509
+#: lib/action.php:558
 msgctxt "MENU"
 msgid "Invite"
 msgstr "دعوت‌کردن"
 
 #. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:515
+#: lib/action.php:564
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "خارج‌شدن از وب‌گاه"
 
 #. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:518
+#: lib/action.php:567
 msgctxt "MENU"
 msgid "Logout"
 msgstr "خروج"
 
 #. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:523
+#: lib/action.php:572
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "ساختن یک جساب‌کاربری"
 
 #. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:526
+#: lib/action.php:575
 msgctxt "MENU"
 msgid "Register"
 msgstr "ثبت‌نام"
 
 #. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:529
+#: lib/action.php:578
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "ورود به وب‌گاه"
 
 #. TRANS: Main menu option when not logged in to log in
-#: lib/action.php:532
+#: lib/action.php:581
 msgctxt "MENU"
 msgid "Login"
 msgstr "ورود"
 
 #. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:535
+#: lib/action.php:584
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "به من کمک کنید!"
 
 #. TRANS: Main menu option for help on the StatusNet site
-#: lib/action.php:538
+#: lib/action.php:587
 msgctxt "MENU"
 msgid "Help"
 msgstr "کمک"
 
 #. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:541
+#: lib/action.php:590
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr "جست‌وجو برای افراد یا متن"
 
 #. TRANS: Main menu option when logged in or when the StatusNet instance is not private
-#: lib/action.php:544
+#: lib/action.php:593
 msgctxt "MENU"
 msgid "Search"
 msgstr "جست‌وجو"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:566 lib/adminpanelaction.php:387
+#: lib/action.php:615 lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "پیام وب‌گاه"
 
 #. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:633
+#: lib/action.php:682
 msgid "Local views"
 msgstr "دید محلی"
 
 #. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:703
+#: lib/action.php:752
 msgid "Page notice"
 msgstr "پیام صفحه"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:804
+#: lib/action.php:853
 msgid "Secondary site navigation"
 msgstr "مسیریابی فرعی وب‌گاه"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:810
+#: lib/action.php:859
 msgid "Help"
 msgstr "کمک"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:813
+#: lib/action.php:862
 msgid "About"
 msgstr "دربارهٔ"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:816
+#: lib/action.php:865
 msgid "FAQ"
 msgstr "سوال‌های رایج"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:821
+#: lib/action.php:870
 msgid "TOS"
 msgstr "شرایط سرویس"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:825
+#: lib/action.php:874
 msgid "Privacy"
 msgstr "خصوصی"
 
-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:828
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+#: lib/action.php:877
 msgid "Source"
 msgstr "منبع"
 
-#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:834
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+#: lib/action.php:884
 msgid "Contact"
 msgstr "تماس"
 
-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:837
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+#: lib/action.php:887
 msgid "Badge"
 msgstr "نشان"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:866
+#: lib/action.php:916
 msgid "StatusNet software license"
 msgstr "StatusNet مجوز نرم افزار"
 
@@ -6345,7 +6429,7 @@ msgstr "StatusNet مجوز نرم افزار"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:873
+#: lib/action.php:923
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -6355,7 +6439,7 @@ msgstr ""
 "broughtbyurl%%) برای شما راه‌اندازی شده است."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:876
+#: lib/action.php:926
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** یک سرویس میکروبلاگینگ است."
@@ -6364,7 +6448,7 @@ msgstr "**%%site.name%%** یک سرویس میکروبلاگینگ است."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:883
+#: lib/action.php:933
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -6376,50 +6460,50 @@ msgstr ""
 "org/licensing/licenses/agpl-3.0.html) در دسترس است."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:899
+#: lib/action.php:949
 msgid "Site content license"
 msgstr "مجوز محتویات وب‌گاه"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:906
+#: lib/action.php:956
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "محتویات و داده‌های %1$s خصوصی و محرمانه هستند."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:913
+#: lib/action.php:963
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr "حق تکثیر محتوا و داده‌ها با %1$s است. تمام حقوق محفوظ است."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:917
+#: lib/action.php:967
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr "حق تکثیر محتوا و داده‌ها با مشارکت‌کنندگان است. تمام حقوق محفوظ است."
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:949
+#: lib/action.php:999
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr "تمام محتویات و داده‌های %1$s زیر مجوز %2$s در دسترس هستند."
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1285
+#: lib/action.php:1335
 msgid "Pagination"
 msgstr "صفحه بندى"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1296
+#: lib/action.php:1346
 msgid "After"
 msgstr "پس از"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1306
+#: lib/action.php:1356
 msgid "Before"
 msgstr "قبل از"
 
@@ -6764,7 +6848,7 @@ msgid "AJAX error"
 msgstr "خطای آژاکس"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:233 lib/mailhandler.php:142
+#: lib/channel.php:233 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "دستور انجام شد"
 
@@ -6780,7 +6864,7 @@ msgstr "پیامی با آن شناسه وجود ندارد."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:626
+#: lib/command.php:99 lib/command.php:630
 #, fuzzy
 msgid "User has no last notice."
 msgstr "کاربر آگهی آخر ندارد"
@@ -6850,6 +6934,14 @@ msgstr "%1$s به گروه %2$s پیوست."
 msgid "%1$s left group %2$s."
 msgstr "%1$s گروه %2$s را ترک کرد."
 
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: lib/command.php:426
+#, fuzzy, php-format
+msgctxt "WHOIS"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
 #. TRANS: Whois output. %s is the full name of the queried user.
 #: lib/command.php:430
 #, php-format
@@ -6889,117 +6981,119 @@ msgstr ""
 "%s یک نمایهٔ ازراه‌دور است؛ شما تنها می‌توانید پیام‌های مستقیم را به کاربران در "
 "یک کارگزار بفرستید."
 
-#. TRANS: Message given if content is too long.
+#. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
 #: lib/command.php:488
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] ""
 "پیام خیلی طولانی است - حداکثر تعداد مجاز %1$d نویسه است که شما %2$d نویسه را "
 "فرستادید."
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:514
+#: lib/command.php:516
 msgid "Error sending direct message."
 msgstr "خطا در فرستادن پیام مستقیم."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:551
+#: lib/command.php:553
 #, php-format
 msgid "Notice from %s repeated."
 msgstr "پیام %s تکرار شد."
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:554
+#: lib/command.php:556
 msgid "Error repeating notice."
 msgstr "هنگام تکرار پیام خطایی رخ داد."
 
-#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:589
-#, php-format
-msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
+#: lib/command.php:591
+#, fuzzy, php-format
+msgid "Notice too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] ""
 "پیام بسیار طولانی است - بیشترین اندازه امکان پذیر %d نویسه است، شما %d نویسه "
 "فرستاده‌اید"
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:600
+#: lib/command.php:604
 #, php-format
 msgid "Reply to %s sent."
 msgstr "پاسخ به %s فرستاده شد."
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:603
+#: lib/command.php:607
 msgid "Error saving notice."
 msgstr "هنگام ذخیرهٔ پیام خطا رخ داد."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:650
+#: lib/command.php:654
 msgid "Specify the name of the user to subscribe to."
 msgstr ""
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:659
+#: lib/command.php:663
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "نمی‌توان با دستور مشترک نمایه‌های OMB شد."
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:667
+#: lib/command.php:671
 #, php-format
 msgid "Subscribed to %s."
 msgstr ""
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:688 lib/command.php:799
+#: lib/command.php:692 lib/command.php:803
 msgid "Specify the name of the user to unsubscribe from."
 msgstr ""
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:699
+#: lib/command.php:703
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr "اشتراک از %s لغو شد."
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:719 lib/command.php:745
+#: lib/command.php:723 lib/command.php:749
 msgid "Command not yet implemented."
 msgstr "دستور هنوز پیاده نشده است."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:723
+#: lib/command.php:727
 msgid "Notification off."
 msgstr "آگاه‌سازی خاموش شد."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:726
+#: lib/command.php:730
 msgid "Can't turn off notification."
 msgstr "ناتوان در خاموش کردن آگاه سازی."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:749
+#: lib/command.php:753
 msgid "Notification on."
 msgstr "آگاه سازی فعال است."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:752
+#: lib/command.php:756
 msgid "Can't turn on notification."
 msgstr "ناتوان در روشن کردن آگاه سازی."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:766
+#: lib/command.php:770
 msgid "Login command is disabled."
 msgstr "فرمان ورود غیرفعال شده است."
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:779
+#: lib/command.php:783
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
@@ -7007,54 +7101,54 @@ msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:808
+#: lib/command.php:812
 #, php-format
 msgid "Unsubscribed %s."
 msgstr "%s لغو اشتراک شد."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:826
+#: lib/command.php:830
 msgid "You are not subscribed to anyone."
 msgstr "شما مشترک هیچ‌کسی نشده‌اید."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:831
+#: lib/command.php:835
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "شما مشترک این فرد شده‌اید:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:853
+#: lib/command.php:857
 msgid "No one is subscribed to you."
 msgstr "هیچ‌کس مشترک شما نشده است."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:858
+#: lib/command.php:862
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "این فرد مشترک شما شده است:"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:880
+#: lib/command.php:884
 msgid "You are not a member of any groups."
 msgstr "شما در هیچ گروهی عضو نیستید ."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:885
+#: lib/command.php:889
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "شما یک عضو این گروه هستید:"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:900
+#: lib/command.php:904
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -7285,7 +7379,8 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "۱-۶۴ کاراکتر کوچک یا اعداد، بدون نقطه گذاری یا فاصله"
 
 #: lib/groupeditform.php:163
-msgid "URL of the homepage or blog of the group or topic"
+#, fuzzy
+msgid "URL of the homepage or blog of the group or topic."
 msgstr "نشانی اینترنتی صفحهٔ‌خانگی یا وبلاگ گروه یا موضوع"
 
 #: lib/groupeditform.php:168
@@ -7293,19 +7388,27 @@ msgid "Describe the group or topic"
 msgstr "گروه یا موضوع را توصیف کنید"
 
 #: lib/groupeditform.php:170
-#, php-format
-msgid "Describe the group or topic in %d characters"
-msgstr "گروه یا موضوع را در %d نویسه توصیف کنید"
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d character or less"
+msgid_plural "Describe the group or topic in %d characters or less"
+msgstr[0] "گروه یا موضوع را در %d نویسه توصیف کنید"
 
-#: lib/groupeditform.php:179
+#: lib/groupeditform.php:182
+#, fuzzy
 msgid ""
-"Location for the group, if any, like \"City, State (or Region), Country\""
+"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 "نام‌های مستعار اضافی برای گروه، با کاما- یا فاصله- جدا شود، بیشینه %d"
+#: lib/groupeditform.php:190
+#, fuzzy, php-format
+msgid ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"alias allowed."
+msgid_plural ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"aliases allowed."
+msgstr[0] ""
+"نام‌های مستعار اضافی برای گروه، با کاما- یا فاصله- جدا شود، بیشینه %d"
 
 #. TRANS: Menu item in the group navigation page.
 #: lib/groupnav.php:86
@@ -7856,7 +7959,7 @@ msgstr "با عرض پوزش، این پست الکترونیک شما نیست.
 msgid "Sorry, no incoming email allowed."
 msgstr "با عرض پوزش، اجازه‌ی ورودی پست الکترونیک وجود ندارد"
 
-#: lib/mailhandler.php:228
+#: lib/mailhandler.php:229
 #, php-format
 msgid "Unsupported message type: %s"
 msgstr "نوع پیام پشتیبانی نشده است: %s"
@@ -8204,16 +8307,17 @@ msgid "Sandbox this user"
 msgstr "آزاد سازی کاربر"
 
 #. TRANS: Fieldset legend for the search form.
-#: lib/searchaction.php:121
+#: lib/searchaction.php:120
 msgid "Search site"
 msgstr "جست‌وجوی وب‌گاه"
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
-#: lib/searchaction.php:129
+#: lib/searchaction.php:128
 msgid "Keyword(s)"
 msgstr "کلمه(های) کلیدی"
 
+#. TRANS: Button text for searching site.
 #: lib/searchaction.php:130
 msgctxt "BUTTON"
 msgid "Search"
@@ -8303,8 +8407,8 @@ msgid "The theme file is missing or the upload failed."
 msgstr ""
 
 #: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:278 lib/themeuploader.php:282
-#: lib/themeuploader.php:290 lib/themeuploader.php:297
+#: lib/themeuploader.php:279 lib/themeuploader.php:283
+#: lib/themeuploader.php:291 lib/themeuploader.php:298
 #, fuzzy
 msgid "Failed saving theme."
 msgstr "به روز رسانی چهره موفقیت آمیر نبود."
@@ -8315,29 +8419,31 @@ msgstr ""
 
 #: lib/themeuploader.php:166
 #, php-format
-msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
-msgstr ""
+msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
+msgid_plural ""
+"Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr[0] ""
 
-#: lib/themeuploader.php:178
+#: lib/themeuploader.php:179
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr ""
 
-#: lib/themeuploader.php:218
+#: lib/themeuploader.php:219
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
 msgstr ""
 
-#: lib/themeuploader.php:224
+#: lib/themeuploader.php:225
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr ""
 
-#: lib/themeuploader.php:241
+#: lib/themeuploader.php:242
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr ""
 
-#: lib/themeuploader.php:259
+#: lib/themeuploader.php:260
 #, fuzzy
 msgid "Error opening theme archive."
 msgstr "خطا هنگام به‌هنگام‌سازی نمایهٔ از راه دور."
@@ -8517,23 +8623,38 @@ msgstr[0] ""
 "پیام خیلی طولانی است - حداکثر تعداد مجاز %1$d نویسه است که شما %2$d نویسه را "
 "فرستادید."
 
-#: scripts/restoreuser.php:82
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: scripts/restoreuser.php:61
 #, php-format
-msgid "Backup file for user %s (%s)"
+msgid "Getting backup from file '%s'."
 msgstr ""
 
-#: scripts/restoreuser.php:88
+#. TRANS: Commandline script output.
+#: scripts/restoreuser.php:91
 #, fuzzy
 msgid "No user specified; using backup user."
 msgstr "هیچ شناسهٔ کاربری مشخص نشده است."
 
-#: scripts/restoreuser.php:94
+#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
+#: scripts/restoreuser.php:98
 #, php-format
-msgid "%d entries in backup."
-msgstr ""
+msgid "%d entry in backup."
+msgid_plural "%d entries in backup."
+msgstr[0] ""
+
+#, fuzzy
+#~ msgid "Name is too long (maximum 255 chars)."
+#~ msgstr "نام خیلی طولانی است (حداکثر ۲۵۵ نویسه)."
+
+#, fuzzy
+#~ msgid "Organization is too long (maximum 255 chars)."
+#~ msgstr "نام سازمان خیلی طولانی است (حداکثر ۲۵۵ نویسه)."
+
+#~ msgid "That's too long. Max notice size is %d chars."
+#~ msgstr "این خیلی طولانی است. بیشینهٔ طول پیام %d نویسه است."
 
-#~ msgid "Description is too long (max %d chars)."
-#~ msgstr "توصیف خیلی طولانی است (حداکثر %d نویسه)"
+#~ msgid "Max notice size is %d chars, including attachment URL."
+#~ msgstr "بیشینهٔ طول پیام %d نویسه که شامل نشانی اینترنتی پیوست هم هست."
 
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "نام‌های مستعار بسیار زیاد هستند! حداکثر %d."
+#~ msgid " tagged %s"
+#~ msgstr " برچسب‌گذاری‌شده %s"
diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po
index cd6c5c235..01b4a4bcc 100644
--- a/locale/fi/LC_MESSAGES/statusnet.po
+++ b/locale/fi/LC_MESSAGES/statusnet.po
@@ -14,17 +14,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-30 23:18+0000\n"
-"PO-Revision-Date: 2010-10-30 23:20:13+0000\n"
+"POT-Creation-Date: 2010-11-02 22:51+0000\n"
+"PO-Revision-Date: 2010-11-02 22:53:17+0000\n"
 "Language-Team: Finnish <http://translatewiki.net/wiki/Portal:fi>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r75708); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r75875); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fi\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2010-10-30 09:48:40+0000\n"
+"X-POT-Import-Date: 2010-10-30 23:42:01+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -87,15 +87,20 @@ msgstr "Profiilikuva-asetukset"
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
+#. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
+#. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #: actions/accessadminpanel.php:193 actions/emailsettings.php:228
-#: actions/imsettings.php:187 actions/pathsadminpanel.php:512
-#: actions/profilesettings.php:201 actions/smssettings.php:209
-#: actions/subscriptions.php:246 lib/applicationeditform.php:355
+#: actions/imsettings.php:187 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: lib/applicationeditform.php:355 lib/groupeditform.php:207
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Tallenna"
@@ -146,7 +151,7 @@ msgstr "Sivua ei ole."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:495 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Käyttäjää ei ole."
@@ -219,7 +224,9 @@ msgstr ""
 
 #. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:208
+#. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -573,8 +580,11 @@ msgstr "Koko nimi on liian pitkä (max 255 merkkiä)."
 #. TRANS: Group edit form validation error.
 #. TRANS: Form validation error in New application form.
 #. TRANS: %d is the maximum number of characters for the description.
+#. TRANS: Group create form validation error.
+#. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:220 actions/editapplication.php:201
 #: actions/editgroup.php:216 actions/newapplication.php:178
+#: actions/newgroup.php:152
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -734,14 +744,14 @@ msgstr "Sinulla ei ole valtuutusta tähän."
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:172 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:74
 #: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
 #: actions/groupunblock.php:65 actions/imsettings.php:230
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
-#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/othersettings.php:153 actions/passwordsettings.php:138
 #: actions/profilesettings.php:221 actions/recoverpassword.php:350
 #: actions/register.php:172 actions/remotesubscribe.php:77
 #: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
@@ -918,21 +928,22 @@ msgstr "Et voi poistaa toisen käyttäjän päivitystä."
 
 #. TRANS: Client error displayed trying to repeat a non-existing notice through the API.
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
+#. TRANS: Error message displayed trying to delete a non-existing notice.
 #: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/deletenotice.php:58 actions/shownotice.php:92
+#: actions/deletenotice.php:61 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "Päivitystä ei ole."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:535
+#: actions/apistatusesretweet.php:83 lib/command.php:537
 #, fuzzy
 msgid "Cannot repeat your own notice."
 msgstr "Ilmoituksia ei voi pistää päälle."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:541
+#: actions/apistatusesretweet.php:92 lib/command.php:543
 msgid "Already repeated that notice."
 msgstr "Tätä päivitystä ei voi poistaa."
 
@@ -953,7 +964,8 @@ msgstr ""
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#: actions/apistatusesupdate.php:244
+#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
+#: lib/mailhandler.php:60
 #, fuzzy, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
@@ -968,7 +980,7 @@ msgstr "API-metodia ei löytynyt."
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
-#: actions/apistatusesupdate.php:308
+#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
 #, fuzzy, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
@@ -1180,17 +1192,18 @@ msgstr "Valitse neliön muotoinen alue kuvasta profiilikuvaksi"
 msgid "Lost our file data."
 msgstr "Tiedoston data hävisi."
 
-#: actions/avatarsettings.php:384
+#. TRANS: Success message for having updated a user avatar.
+#: actions/avatarsettings.php:385
 msgid "Avatar updated."
 msgstr "Kuva päivitetty."
 
 #. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
-#: actions/avatarsettings.php:388
+#: actions/avatarsettings.php:389
 msgid "Failed updating avatar."
 msgstr "Profiilikuvan päivittäminen epäonnistui."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:412
+#: actions/avatarsettings.php:413
 msgid "Avatar deleted."
 msgstr "Kuva poistettu."
 
@@ -1219,8 +1232,8 @@ msgstr ""
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:154 actions/deleteapplication.php:154
-#: actions/deletegroup.php:220 actions/deletenotice.php:150
+#: actions/block.php:154 actions/deleteapplication.php:157
+#: actions/deletegroup.php:220 actions/deletenotice.php:155
 #: actions/deleteuser.php:152 actions/groupblock.php:178
 msgctxt "BUTTON"
 msgid "No"
@@ -1238,8 +1251,8 @@ msgstr "Älä estä tätä käyttäjää"
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:161 actions/deleteapplication.php:161
-#: actions/deletegroup.php:227 actions/deletenotice.php:157
+#: actions/block.php:161 actions/deleteapplication.php:164
+#: actions/deletegroup.php:227 actions/deletenotice.php:162
 #: actions/deleteuser.php:159 actions/groupblock.php:185
 #, fuzzy
 msgctxt "BUTTON"
@@ -1357,12 +1370,13 @@ msgstr "Tämä osoite on jo vahvistettu."
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
 #. TRANS: Server error thrown on database error updating IM preferences.
 #. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
 #. TRANS: Server error thrown when user profile settings could not be updated.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #: actions/confirmaddress.php:118 actions/emailsettings.php:331
 #: actions/emailsettings.php:477 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:174
+#: actions/imsettings.php:442 actions/othersettings.php:184
 #: actions/profilesettings.php:326 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
@@ -1398,16 +1412,19 @@ msgstr "Keskustelu"
 msgid "Notices"
 msgstr "Päivitykset"
 
-#: actions/deleteapplication.php:63
+#. TRANS: Client error displayed trying to delete an application while not logged in.
+#: actions/deleteapplication.php:62
 msgid "You must be logged in to delete an application."
 msgstr "Sinun pitää olla kirjautunut sisään, jotta voit erota ryhmästä."
 
+#. TRANS: Client error displayed trying to delete an application that does not exist.
 #: actions/deleteapplication.php:71
 msgid "Application not found."
 msgstr "Vahvistuskoodia ei löytynyt."
 
+#. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
-#: actions/deleteapplication.php:78 actions/editapplication.php:78
+#: actions/deleteapplication.php:79 actions/editapplication.php:78
 #: actions/showapplication.php:94
 #, fuzzy
 msgid "You are not the owner of this application."
@@ -1416,16 +1433,19 @@ msgstr "Sinä et kuulu tähän ryhmään."
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
 #: actions/newapplication.php:114 actions/showapplication.php:118
-#: lib/action.php:1354
+#: lib/action.php:1404
 msgid "There was a problem with your session token."
 msgstr "Istuntoavaimesi kanssa oli ongelma."
 
-#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+#. TRANS: Title for delete application page.
+#. TRANS: Fieldset legend on delete application page.
+#: actions/deleteapplication.php:124 actions/deleteapplication.php:149
 #, fuzzy
 msgid "Delete application"
 msgstr "Päivitystä ei ole."
 
-#: actions/deleteapplication.php:149
+#. TRANS: Confirmation text on delete application page.
+#: actions/deleteapplication.php:152
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
 "about the application from the database, including all existing user "
@@ -1433,13 +1453,13 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:158
+#: actions/deleteapplication.php:161
 #, fuzzy
 msgid "Do not delete this application"
 msgstr "Älä poista tätä päivitystä"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:164
+#: actions/deleteapplication.php:167
 #, fuzzy
 msgid "Delete this application"
 msgstr "Poista tämä päivitys"
@@ -1477,13 +1497,14 @@ msgstr "Ei voitu päivittää ryhmää."
 msgid "Deleted group %s"
 msgstr "Käyttäjän %1$s päivitys %2$s"
 
-#. TRANS: Title.
+#. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
 #: actions/deletegroup.php:176 actions/deletegroup.php:202
 #, fuzzy
 msgid "Delete group"
 msgstr "Poista käyttäjä"
 
+#. TRANS: Warning in form for deleleting a group.
 #: actions/deletegroup.php:206
 msgid ""
 "Are you sure you want to delete this group? This will clear all data about "
@@ -1503,10 +1524,11 @@ msgstr "Älä poista tätä päivitystä"
 msgid "Delete this group"
 msgstr "Poista käyttäjä"
 
+#. TRANS: Error message displayed trying to delete a notice while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1516,11 +1538,13 @@ msgstr "Poista käyttäjä"
 msgid "Not logged in."
 msgstr "Et ole kirjautunut sisään."
 
-#: actions/deletenotice.php:74
+#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
+#: actions/deletenotice.php:78
 msgid "Can't delete this notice."
 msgstr "Tätä päivitystä ei voi poistaa."
 
-#: actions/deletenotice.php:106
+#. TRANS: Instructions for deleting a notice.
+#: actions/deletenotice.php:110
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
@@ -1528,21 +1552,24 @@ msgstr ""
 "Olet poistamassa tämän päivityksen pysyvästi.  Kun tämä on tehty, poistoa ei "
 "voi enää perua."
 
-#: actions/deletenotice.php:112 actions/deletenotice.php:144
+#. TRANS: Page title when deleting a notice.
+#. TRANS: Fieldset legend for the delete notice form.
+#: actions/deletenotice.php:117 actions/deletenotice.php:148
 msgid "Delete notice"
 msgstr "Poista päivitys"
 
-#: actions/deletenotice.php:147
+#. TRANS: Message for the delete notice form.
+#: actions/deletenotice.php:152
 msgid "Are you sure you want to delete this notice?"
 msgstr "Oletko varma että haluat poistaa tämän päivityksen?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:154
+#: actions/deletenotice.php:159
 msgid "Do not delete this notice"
 msgstr "Älä poista tätä päivitystä"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:161 lib/noticelist.php:667
+#: actions/deletenotice.php:166 lib/noticelist.php:667
 msgid "Delete this notice"
 msgstr "Poista tämä päivitys"
 
@@ -1712,11 +1739,9 @@ msgstr "Käytä oletusasetuksia"
 
 #. TRANS: Submit button title.
 #: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
-#: actions/othersettings.php:126 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: actions/useradminpanel.php:295 lib/applicationeditform.php:357
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: lib/applicationeditform.php:357 lib/designsettings.php:256
 msgid "Save"
 msgstr "Tallenna"
 
@@ -1770,9 +1795,9 @@ msgid "Name is required."
 msgstr "Sama kuin ylläoleva salasana. Pakollinen."
 
 #. TRANS: Validation error shown when providing too long a name in the "Edit application" form.
-#: actions/editapplication.php:188
+#: actions/editapplication.php:188 actions/newapplication.php:169
 #, fuzzy
-msgid "Name is too long (max 255 characters)."
+msgid "Name is too long (maximum 255 characters)."
 msgstr "Koko nimi on liian pitkä (max 255 merkkiä)."
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
@@ -1804,7 +1829,7 @@ msgid "Organization is required."
 msgstr ""
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#: actions/editapplication.php:223
+#: actions/editapplication.php:223 actions/newapplication.php:199
 #, fuzzy
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "Kotipaikka on liian pitkä (max 255 merkkiä)."
@@ -2600,7 +2625,7 @@ msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Julkaise MicroID Jabber/GTalk-osoitteelleni."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:180
+#: actions/imsettings.php:290 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "Asetukset tallennettu."
 
@@ -2725,10 +2750,9 @@ msgstr[1] "Olet jo tilannut seuraavien käyttäjien päivitykset:"
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#. TRANS: Whois output.
-#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:145 actions/invite.php:159 lib/command.php:426
-#, php-format
+#: actions/invite.php:145 actions/invite.php:159
+#, fuzzy, php-format
+msgctxt "INVITE"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
@@ -2915,8 +2939,9 @@ msgid ""
 msgstr ""
 
 #: actions/licenseadminpanel.php:156
-msgid "Invalid license title. Max length is 255 characters."
-msgstr ""
+#, fuzzy
+msgid "Invalid license title. Maximum length is 255 characters."
+msgstr "Kotipaikka on liian pitkä (max 255 merkkiä)."
 
 #: actions/licenseadminpanel.php:168
 msgid "Invalid license URL."
@@ -3095,20 +3120,10 @@ msgstr "Sinun pitää olla kirjautunut sisään jotta voit luoda ryhmän."
 msgid "Use this form to register a new application."
 msgstr "Käytä tätä lomaketta luodaksesi ryhmän."
 
-#: actions/newapplication.php:169
-#, fuzzy
-msgid "Name is too long (maximum 255 chars)."
-msgstr "Koko nimi on liian pitkä (max 255 merkkiä)."
-
 #: actions/newapplication.php:184
 msgid "Source URL is required."
 msgstr ""
 
-#: actions/newapplication.php:199
-#, fuzzy
-msgid "Organization is too long (maximum 255 chars)."
-msgstr "Kotipaikka on liian pitkä (max 255 merkkiä)."
-
 #: actions/newapplication.php:266 actions/newapplication.php:275
 #, fuzzy
 msgid "Could not create application."
@@ -3129,14 +3144,14 @@ msgid "New message"
 msgstr "Uusi viesti"
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:499
+#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501
 msgid "You can't send a message to this user."
 msgstr "Et voi lähettää viestiä tälle käyttäjälle."
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
 #: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
-#: lib/command.php:579
+#: lib/command.php:581
 msgid "No content!"
 msgstr "Ei sisältöä!"
 
@@ -3145,7 +3160,7 @@ msgid "No recipient specified."
 msgstr "Vastaanottajaa ei ole määritelty."
 
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:503
+#: actions/newmessage.php:167 lib/command.php:505
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "Älä lähetä viestiä itsellesi, vaan kuiskaa se vain hiljaa itsellesi."
@@ -3156,12 +3171,12 @@ msgstr "Viesti lähetetty"
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:511
+#: actions/newmessage.php:188 lib/command.php:513
 #, fuzzy, php-format
 msgid "Direct message to %s sent."
 msgstr "Suora viesti käyttäjälle %s lähetetty"
 
-#: actions/newmessage.php:213 actions/newnotice.php:263
+#: actions/newmessage.php:213 actions/newnotice.php:264
 msgid "Ajax Error"
 msgstr "Ajax-virhe"
 
@@ -3169,17 +3184,7 @@ msgstr "Ajax-virhe"
 msgid "New notice"
 msgstr "Uusi päivitys"
 
-#: actions/newnotice.php:159 lib/mailhandler.php:60
-#, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr "Päivitys on liian pitkä. Maksimipituus on %d merkkiä."
-
-#: actions/newnotice.php:183
-#, php-format
-msgid "Max notice size is %d chars, including attachment URL."
-msgstr "Maksimikoko päivitykselle on %d merkkiä, mukaan lukien URL-osoite."
-
-#: actions/newnotice.php:229
+#: actions/newnotice.php:230
 msgid "Notice posted"
 msgstr "Päivitys lähetetty"
 
@@ -3352,36 +3357,46 @@ msgstr "Etsi ihmisiä"
 msgid "Notice Search"
 msgstr "Etsi Päivityksistä"
 
-#: actions/othersettings.php:60
+#: actions/othersettings.php:59
 msgid "Other settings"
 msgstr "Profiilikuva-asetukset"
 
+#. TRANS: Instructions for tab "Other" in user profile settings.
 #: actions/othersettings.php:71
 msgid "Manage various other options."
 msgstr "Hallinnoi muita asetuksia."
 
-#: actions/othersettings.php:108
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/othersettings.php:111
 msgid " (free service)"
 msgstr ""
 
-#: actions/othersettings.php:116
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/othersettings.php:120
 msgid "Shorten URLs with"
 msgstr "Lyhennä URL-osoitteita"
 
-#: actions/othersettings.php:117
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/othersettings.php:122
 msgid "Automatic shortening service to use."
 msgstr "Käytettävä automaattinen lyhennyspalvelu."
 
-#: actions/othersettings.php:122
+#. TRANS: Label for checkbox.
+#: actions/othersettings.php:128
 msgid "View profile designs"
 msgstr "Näytä tai piillota profiilin ulkoasu."
 
-#: actions/othersettings.php:123
+#. TRANS: Tooltip for checkbox.
+#: actions/othersettings.php:130
 msgid "Show or hide profile designs."
 msgstr "Näytä tai piillota profiilin ulkoasu."
 
-#: actions/othersettings.php:153
-msgid "URL shortening service is too long (max 50 chars)."
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/othersettings.php:162
+#, fuzzy
+msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "URL-lyhennyspalvelun nimi on liian pitkä (max 50 merkkiä)."
 
 #: actions/otp.php:69
@@ -3882,7 +3897,7 @@ msgstr "Tietoja"
 #. TRANS: Label for group location (dt). Text hidden by default.
 #: actions/profilesettings.php:149 actions/register.php:485
 #: actions/showgroup.php:267 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:177
+#: actions/userauthorization.php:166 lib/groupeditform.php:180
 #: lib/userprofile.php:165
 msgid "Location"
 msgstr "Kotipaikka"
@@ -4221,7 +4236,8 @@ msgid "Unexpected password reset."
 msgstr "Odottamaton salasanan uudelleenasetus."
 
 #: actions/recoverpassword.php:365
-msgid "Password must be 6 chars or more."
+#, fuzzy
+msgid "Password must be 6 characters or more."
 msgstr "Salasanassa pitää olla 6 tai useampia merkkejä."
 
 #: actions/recoverpassword.php:369
@@ -4613,7 +4629,7 @@ msgstr "Sivutus"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:172
+#: lib/applicationeditform.php:208 lib/groupeditform.php:175
 msgid "Description"
 msgstr "Kuvaus"
 
@@ -4756,7 +4772,7 @@ msgid "Note"
 msgstr "Huomaa"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:298 lib/groupeditform.php:184
+#: actions/showgroup.php:298 lib/groupeditform.php:187
 msgid "Aliases"
 msgstr "Aliakset"
 
@@ -4882,55 +4898,77 @@ msgstr "Viesti käyttäjältä %1$s, %2$s"
 msgid "Notice deleted."
 msgstr "Päivitys on poistettu."
 
-#: actions/showstream.php:72
+#. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
+#: actions/showstream.php:70
+#, fuzzy, php-format
+msgid "%1$s tagged %2$s"
+msgstr "Ryhmät, sivu %d"
+
+#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#: actions/showstream.php:74
 #, fuzzy, php-format
-msgid " tagged %s"
+msgid "%1$s tagged %2$s, page %3$d"
 msgstr "Päivitykset joilla on tagi %s"
 
-#: actions/showstream.php:78
+#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$d is the page number.
+#: actions/showstream.php:82
 #, php-format
 msgid "%1$s, page %2$d"
 msgstr "Ryhmät, sivu %d"
 
-#: actions/showstream.php:120
+#. TRANS: Title for link to notice feed.
+#. TRANS: %1$s is a user nickname, %2$s is a hashtag.
+#: actions/showstream.php:127
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Syöte ryhmän %s päivityksille (RSS 1.0)"
 
-#: actions/showstream.php:127
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:136
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "Syöte ryhmän %s päivityksille (RSS 1.0)"
 
-#: actions/showstream.php:134
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:145
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "Syöte ryhmän %s päivityksille (RSS 2.0)"
 
-#: actions/showstream.php:141
+#: actions/showstream.php:152
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "Syöte ryhmän %s päivityksille (Atom)"
 
-#: actions/showstream.php:146
+#. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
+#. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
+#: actions/showstream.php:159
 #, fuzzy, php-format
 msgid "FOAF for %s"
 msgstr "Käyttäjän %s lähetetyt viestit"
 
-#: actions/showstream.php:197
-#, php-format
-msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
+#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
+#: actions/showstream.php:211
+#, fuzzy, php-format
+msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr ""
 "Tämä on käyttäjän %s ja kavereiden aikajana, mutta kukaan ei ole lähettyänyt "
 "vielä mitään."
 
-#: actions/showstream.php:202
+#. TRANS: Second sentence of empty list message for a stream for the user themselves.
+#: actions/showstream.php:217
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
 msgstr ""
 
-#: actions/showstream.php:204
+#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:221
 #, fuzzy, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -4939,7 +4977,9 @@ msgstr ""
 "Ole ensimmäinen joka [lähettää päivityksen tästä aiheesta](%%%%action."
 "newnotice%%%%?status_textarea=%s)!"
 
-#: actions/showstream.php:243
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:264
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4948,7 +4988,9 @@ msgid ""
 "follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
 
-#: actions/showstream.php:248
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:271
 #, fuzzy, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4958,7 +5000,8 @@ msgstr ""
 "Käyttäjällä **%s** on käyttäjätili palvelussa %%%%site.name%%%%, joka on "
 "[mikroblogauspalvelu](http://en.wikipedia.org/wiki/Micro-blogging)"
 
-#: actions/showstream.php:305
+#. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
+#: actions/showstream.php:328
 #, fuzzy, php-format
 msgid "Repeat of %s"
 msgstr "Vastaukset käyttäjälle %s"
@@ -5075,35 +5118,42 @@ msgstr ""
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:56
+#. TRANS: Page title for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:55
 #, fuzzy
 msgid "Site Notice"
 msgstr "Palvelun ilmoitus"
 
-#: actions/sitenoticeadminpanel.php:67
+#. TRANS: Instructions for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:66
 #, fuzzy
 msgid "Edit site-wide message"
 msgstr "Uusi viesti"
 
-#: actions/sitenoticeadminpanel.php:103
+#. TRANS: Server error displayed when saving a site-wide notice was impossible.
+#: actions/sitenoticeadminpanel.php:101
 #, fuzzy
 msgid "Unable to save site notice."
 msgstr "Twitter-asetuksia ei voitu tallentaa!"
 
-#: actions/sitenoticeadminpanel.php:113
-msgid "Max length for the site-wide notice is 255 chars."
+#. TRANS: Client error displayed when a site-wide notice was longer than allowed.
+#: actions/sitenoticeadminpanel.php:112
+msgid "Maximum length for the site-wide notice is 255 characters."
 msgstr ""
 
+#. TRANS: Label for site-wide notice text field in admin panel.
 #: actions/sitenoticeadminpanel.php:176
 #, fuzzy
 msgid "Site notice text"
 msgstr "Palvelun ilmoitus"
 
-#: actions/sitenoticeadminpanel.php:178
-msgid "Site-wide notice text (255 chars max; HTML okay)"
+#. TRANS: Tooltip for site-wide notice text field in admin panel.
+#: actions/sitenoticeadminpanel.php:179
+msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:198
+#. TRANS: Title for button to save site notice in admin panel.
+#: actions/sitenoticeadminpanel.php:201
 #, fuzzy
 msgid "Save site notice"
 msgstr "Palvelun ilmoitus"
@@ -5568,83 +5618,100 @@ msgid ""
 msgstr ""
 
 #. TRANS: User admin panel title
-#: actions/useradminpanel.php:60
+#: actions/useradminpanel.php:58
 #, fuzzy
 msgctxt "TITLE"
 msgid "User"
 msgstr "Käyttäjä"
 
-#: actions/useradminpanel.php:71
+#. TRANS: Instruction for user admin panel.
+#: actions/useradminpanel.php:69
 msgid "User settings for this StatusNet site"
 msgstr ""
 
-#: actions/useradminpanel.php:150
+#. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
+#: actions/useradminpanel.php:147
 msgid "Invalid bio limit. Must be numeric."
 msgstr ""
 
-#: actions/useradminpanel.php:156
-msgid "Invalid welcome text. Max length is 255 characters."
+#. TRANS: Form validation error in user admin panel when welcome text is too long.
+#: actions/useradminpanel.php:154
+msgid "Invalid welcome text. Maximum length is 255 characters."
 msgstr ""
 
+#. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
+#. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
 #, php-format
-msgid "Invalid default subscripton: '%1$s' is not user."
+msgid "Invalid default subscripton: '%1$s' is not a user."
 msgstr ""
 
 #. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:106
+#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
 #: lib/personalgroupnav.php:109
 msgid "Profile"
 msgstr "Profiili"
 
-#: actions/useradminpanel.php:223
+#. TRANS: Field label in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:220
 msgid "Bio Limit"
 msgstr ""
 
-#: actions/useradminpanel.php:224
+#. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:222
 msgid "Maximum length of a profile bio in characters."
 msgstr ""
 
-#: actions/useradminpanel.php:232
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:231
 #, fuzzy
 msgid "New users"
 msgstr "Kutsu uusia käyttäjiä"
 
+#. TRANS: Field label in user admin panel for setting new user welcome text.
 #: actions/useradminpanel.php:236
 msgid "New user welcome"
 msgstr ""
 
-#: actions/useradminpanel.php:237
-msgid "Welcome text for new users (Max 255 chars)."
-msgstr ""
+#. TRANS: Tooltip in user admin panel for setting new user welcome text.
+#: actions/useradminpanel.php:238
+#, fuzzy
+msgid "Welcome text for new users (maximum 255 characters)."
+msgstr "Koko nimi on liian pitkä (max 255 merkkiä)."
 
-#: actions/useradminpanel.php:242
+#. TRANS: Field label in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:244
 #, fuzzy
 msgid "Default subscription"
 msgstr "Kaikki tilaukset"
 
-#: actions/useradminpanel.php:243
+#. TRANS: Tooltip in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:246
 #, fuzzy
 msgid "Automatically subscribe new users to this user."
 msgstr ""
 "Tilaa automaattisesti kaikki, jotka tilaavat päivitykseni (ei sovi hyvin "
 "ihmiskäyttäjille)"
 
-#: actions/useradminpanel.php:252
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:256
 #, fuzzy
 msgid "Invitations"
 msgstr "Kutsu(t) lähetettiin"
 
-#: actions/useradminpanel.php:257
+#. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:262
 #, fuzzy
 msgid "Invitations enabled"
 msgstr "Kutsu(t) lähetettiin"
 
-#: actions/useradminpanel.php:259
+#. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:265
 msgid "Whether to allow users to invite new users."
 msgstr ""
 
-#: actions/useradminpanel.php:295
+#. TRANS: Title for button to save user settings in user admin panel.
+#: actions/useradminpanel.php:302
 msgid "Save user settings"
 msgstr ""
 
@@ -5845,7 +5912,7 @@ msgid "Plugins"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:831
+#: actions/version.php:198 lib/action.php:880
 #, fuzzy
 msgid "Version"
 msgstr "Omat"
@@ -6061,16 +6128,23 @@ msgstr "Tilausta ei onnistuttu tallentamaan."
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
+#. TRANS: Full name of a profile or group followed by nickname in parens
+#: classes/Profile.php:164
+#, fuzzy, php-format
+msgctxt "FANCYNAME"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:791
+#: classes/Profile.php:812
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:800
+#: classes/Profile.php:821
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6221,50 +6295,56 @@ msgstr "%1$s (%2$s)"
 msgid "Untitled page"
 msgstr "Nimetön sivu"
 
+#. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
+#: lib/action.php:310
+msgctxt "TOOLTIP"
+msgid "Show more"
+msgstr ""
+
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:477
+#: lib/action.php:526
 msgid "Primary site navigation"
 msgstr "Ensisijainen sivunavigointi"
 
 #. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:483
+#: lib/action.php:532
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "Henkilökohtainen profiili ja kavereiden aikajana"
 
 #. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:486
+#: lib/action.php:535
 #, fuzzy
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Omat"
 
 #. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:488
+#: lib/action.php:537
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
 msgstr "Vaihda salasanasi"
 
 #. TRANS: Main menu option when logged in for access to user settings
-#: lib/action.php:491
+#: lib/action.php:540
 msgid "Account"
 msgstr "Käyttäjätili"
 
 #. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:493
+#: lib/action.php:542
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "Ei voitu uudelleenohjata palvelimelle: %s"
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:496
+#: lib/action.php:545
 msgid "Connect"
 msgstr "Yhdistä"
 
 #. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:499
+#: lib/action.php:548
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
@@ -6272,85 +6352,85 @@ msgstr "Ensisijainen sivunavigointi"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:502 lib/groupnav.php:117
+#: lib/action.php:551 lib/groupnav.php:117
 #, fuzzy
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Ylläpito"
 
 #. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:506
+#: lib/action.php:555
 #, fuzzy, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Kutsu kavereita ja työkavereita liittymään palveluun %s"
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:509
+#: lib/action.php:558
 #, fuzzy
 msgctxt "MENU"
 msgid "Invite"
 msgstr "Kutsu"
 
 #. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:515
+#: lib/action.php:564
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "Kirjaudu sisään"
 
 #. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:518
+#: lib/action.php:567
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Kirjaudu ulos"
 
 #. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:523
+#: lib/action.php:572
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "Luo uusi ryhmä"
 
 #. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:526
+#: lib/action.php:575
 #, fuzzy
 msgctxt "MENU"
 msgid "Register"
 msgstr "Rekisteröidy"
 
 #. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:529
+#: lib/action.php:578
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "Kirjaudu sisään"
 
 #. TRANS: Main menu option when not logged in to log in
-#: lib/action.php:532
+#: lib/action.php:581
 #, fuzzy
 msgctxt "MENU"
 msgid "Login"
 msgstr "Kirjaudu sisään"
 
 #. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:535
+#: lib/action.php:584
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Ohjeet"
 
 #. TRANS: Main menu option for help on the StatusNet site
-#: lib/action.php:538
+#: lib/action.php:587
 #, fuzzy
 msgctxt "MENU"
 msgid "Help"
 msgstr "Ohjeet"
 
 #. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:541
+#: lib/action.php:590
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr "Hae lisää ryhmiä"
 
 #. TRANS: Main menu option when logged in or when the StatusNet instance is not private
-#: lib/action.php:544
+#: lib/action.php:593
 #, fuzzy
 msgctxt "MENU"
 msgid "Search"
@@ -6358,68 +6438,69 @@ msgstr "Haku"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:566 lib/adminpanelaction.php:387
+#: lib/action.php:615 lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "Palvelun ilmoitus"
 
 #. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:633
+#: lib/action.php:682
 msgid "Local views"
 msgstr "Paikalliset näkymät"
 
 #. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:703
+#: lib/action.php:752
 msgid "Page notice"
 msgstr "Sivuilmoitus"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:804
+#: lib/action.php:853
 msgid "Secondary site navigation"
 msgstr "Toissijainen sivunavigointi"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:810
+#: lib/action.php:859
 msgid "Help"
 msgstr "Ohjeet"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:813
+#: lib/action.php:862
 msgid "About"
 msgstr "Tietoa"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:816
+#: lib/action.php:865
 msgid "FAQ"
 msgstr "UKK"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:821
+#: lib/action.php:870
 msgid "TOS"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:825
+#: lib/action.php:874
 msgid "Privacy"
 msgstr "Yksityisyys"
 
-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:828
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+#: lib/action.php:877
 msgid "Source"
 msgstr "Lähdekoodi"
 
-#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:834
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+#: lib/action.php:884
 msgid "Contact"
 msgstr "Ota yhteyttä"
 
-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:837
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+#: lib/action.php:887
 #, fuzzy
 msgid "Badge"
 msgstr "Tönäise"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:866
+#: lib/action.php:916
 msgid "StatusNet software license"
 msgstr "StatusNet-ohjelmiston lisenssi"
 
@@ -6427,7 +6508,7 @@ msgstr "StatusNet-ohjelmiston lisenssi"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:873
+#: lib/action.php:923
 #, fuzzy, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -6437,7 +6518,7 @@ msgstr ""
 "site.broughtbyurl%%). "
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:876
+#: lib/action.php:926
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** on mikroblogipalvelu."
@@ -6446,7 +6527,7 @@ msgstr "**%%site.name%%** on mikroblogipalvelu."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:883
+#: lib/action.php:933
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -6458,51 +6539,51 @@ msgstr ""
 "www.fsf.org/licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:899
+#: lib/action.php:949
 #, fuzzy
 msgid "Site content license"
 msgstr "StatusNet-ohjelmiston lisenssi"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:906
+#: lib/action.php:956
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:913
+#: lib/action.php:963
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:917
+#: lib/action.php:967
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:949
+#: lib/action.php:999
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1285
+#: lib/action.php:1335
 msgid "Pagination"
 msgstr "Sivutus"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1296
+#: lib/action.php:1346
 msgid "After"
 msgstr "Myöhemmin"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1306
+#: lib/action.php:1356
 msgid "Before"
 msgstr "Aiemmin"
 
@@ -6867,7 +6948,7 @@ msgid "AJAX error"
 msgstr "Ajax-virhe"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:233 lib/mailhandler.php:142
+#: lib/channel.php:233 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "Komento suoritettu"
 
@@ -6884,7 +6965,7 @@ msgstr "Ei profiilia tuolla id:llä."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:626
+#: lib/command.php:99 lib/command.php:630
 #, fuzzy
 msgid "User has no last notice."
 msgstr "Käyttäjällä ei ole viimeistä päivitystä"
@@ -6951,6 +7032,14 @@ msgstr ""
 msgid "%1$s left group %2$s."
 msgstr ""
 
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: lib/command.php:426
+#, fuzzy, php-format
+msgctxt "WHOIS"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
 #. TRANS: Whois output. %s is the full name of the queried user.
 #: lib/command.php:430
 #, php-format
@@ -6988,130 +7077,134 @@ msgid ""
 "same server."
 msgstr ""
 
-#. TRANS: Message given if content is too long.
+#. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
 #: lib/command.php:488
 #, fuzzy, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr "Viesti oli liian pitkä - maksimikoko on 140 merkkiä, lähetit %d"
+msgid "Message too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] "Viesti oli liian pitkä - maksimikoko on 140 merkkiä, lähetit %d"
+msgstr[1] "Viesti oli liian pitkä - maksimikoko on 140 merkkiä, lähetit %d"
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:514
+#: lib/command.php:516
 msgid "Error sending direct message."
 msgstr "Tapahtui virhe suoran viestin lähetyksessä."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:551
+#: lib/command.php:553
 #, fuzzy, php-format
 msgid "Notice from %s repeated."
 msgstr "Päivitys lähetetty"
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:554
+#: lib/command.php:556
 msgid "Error repeating notice."
 msgstr "Virhe tapahtui käyttäjän asettamisessa."
 
-#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:589
+#: lib/command.php:591
 #, fuzzy, php-format
-msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
-msgstr "Viesti oli liian pitkä - maksimikoko on 140 merkkiä, lähetit %d"
+msgid "Notice too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] "Viesti oli liian pitkä - maksimikoko on 140 merkkiä, lähetit %d"
+msgstr[1] "Viesti oli liian pitkä - maksimikoko on 140 merkkiä, lähetit %d"
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:600
+#: lib/command.php:604
 #, fuzzy, php-format
 msgid "Reply to %s sent."
 msgstr "Vastaa tähän päivitykseen"
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:603
+#: lib/command.php:607
 #, fuzzy
 msgid "Error saving notice."
 msgstr "Ongelma päivityksen tallentamisessa."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:650
+#: lib/command.php:654
 #, fuzzy
 msgid "Specify the name of the user to subscribe to."
 msgstr "Anna käyttäjätunnus, jonka päivitykset haluat tilata"
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:659
+#: lib/command.php:663
 #, fuzzy
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Et ole tilannut tämän käyttäjän päivityksiä."
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:667
+#: lib/command.php:671
 #, php-format
 msgid "Subscribed to %s."
 msgstr ""
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:688 lib/command.php:799
+#: lib/command.php:692 lib/command.php:803
 #, fuzzy
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "Anna käyttäjätunnus, jonka päivityksien tilauksen haluat lopettaa"
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:699
+#: lib/command.php:703
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:719 lib/command.php:745
+#: lib/command.php:723 lib/command.php:749
 msgid "Command not yet implemented."
 msgstr "Komentoa ei ole vielä toteutettu."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:723
+#: lib/command.php:727
 msgid "Notification off."
 msgstr "Ilmoitukset pois päältä."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:726
+#: lib/command.php:730
 msgid "Can't turn off notification."
 msgstr "Ilmoituksia ei voi pistää pois päältä."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:749
+#: lib/command.php:753
 msgid "Notification on."
 msgstr "Ilmoitukset päällä."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:752
+#: lib/command.php:756
 msgid "Can't turn on notification."
 msgstr "Ilmoituksia ei voi pistää päälle."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:766
+#: lib/command.php:770
 msgid "Login command is disabled."
 msgstr ""
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:779
+#: lib/command.php:783
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:808
+#: lib/command.php:812
 #, php-format
 msgid "Unsubscribed %s."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:826
+#: lib/command.php:830
 #, fuzzy
 msgid "You are not subscribed to anyone."
 msgstr "Et ole tilannut tämän käyttäjän päivityksiä."
@@ -7119,7 +7212,7 @@ msgstr "Et ole tilannut tämän käyttäjän päivityksiä."
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:831
+#: lib/command.php:835
 #, fuzzy
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
@@ -7128,7 +7221,7 @@ msgstr[1] "Olet jos tilannut seuraavien käyttäjien päivitykset:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:853
+#: lib/command.php:857
 #, fuzzy
 msgid "No one is subscribed to you."
 msgstr "Toista ei voitu asettaa tilaamaan sinua."
@@ -7136,7 +7229,7 @@ msgstr "Toista ei voitu asettaa tilaamaan sinua."
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:858
+#: lib/command.php:862
 #, fuzzy
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
@@ -7145,7 +7238,7 @@ msgstr[1] "Toista ei voitu asettaa tilaamaan sinua."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:880
+#: lib/command.php:884
 #, fuzzy
 msgid "You are not a member of any groups."
 msgstr "Sinä et kuulu tähän ryhmään."
@@ -7153,14 +7246,14 @@ msgstr "Sinä et kuulu tähän ryhmään."
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:885
+#: lib/command.php:889
 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."
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:900
+#: lib/command.php:904
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -7356,7 +7449,8 @@ msgstr ""
 "välilyöntejä"
 
 #: lib/groupeditform.php:163
-msgid "URL of the homepage or blog of the group or topic"
+#, fuzzy
+msgid "URL of the homepage or blog of the group or topic."
 msgstr "Ryhmän tai aiheen kotisivun tai blogin osoite"
 
 #: lib/groupeditform.php:168
@@ -7365,21 +7459,30 @@ msgid "Describe the group or topic"
 msgstr "Kuvaile ryhmää tai aihetta 140 merkillä"
 
 #: lib/groupeditform.php:170
-#, php-format
-msgid "Describe the group or topic in %d characters"
-msgstr "Kuvaile itseäsi ja kiinnostuksen kohteitasi %d merkillä"
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d character or less"
+msgid_plural "Describe the group or topic in %d characters or less"
+msgstr[0] "Kuvaile itseäsi ja kiinnostuksen kohteitasi %d merkillä"
+msgstr[1] "Kuvaile itseäsi ja kiinnostuksen kohteitasi %d merkillä"
 
-#: lib/groupeditform.php:179
+#: lib/groupeditform.php:182
+#, fuzzy
 msgid ""
-"Location for the group, if any, like \"City, State (or Region), Country\""
+"Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr ""
 "Ryhmän paikka, jos sellainen on, kuten \"Kaupunki, Maakunta (tai Lääni), Maa"
 "\""
 
-#: lib/groupeditform.php:187
+#: lib/groupeditform.php:190
 #, php-format
-msgid "Extra nicknames for the group, comma- or space- separated, max %d"
-msgstr ""
+msgid ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"alias allowed."
+msgid_plural ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"aliases allowed."
+msgstr[0] ""
+msgstr[1] ""
 
 #. TRANS: Menu item in the group navigation page.
 #: lib/groupnav.php:86
@@ -7850,7 +7953,7 @@ msgstr "Valitettavasti tuo ei ole oikea osoite sähköpostipäivityksille."
 msgid "Sorry, no incoming email allowed."
 msgstr "Valitettavasti päivitysten teko sähköpostilla ei ole sallittua."
 
-#: lib/mailhandler.php:228
+#: lib/mailhandler.php:229
 #, fuzzy, php-format
 msgid "Unsupported message type: %s"
 msgstr "Kuvatiedoston formaattia ei ole tuettu."
@@ -8205,17 +8308,18 @@ msgid "Sandbox this user"
 msgstr "Poista esto tältä käyttäjältä"
 
 #. TRANS: Fieldset legend for the search form.
-#: lib/searchaction.php:121
+#: lib/searchaction.php:120
 #, fuzzy
 msgid "Search site"
 msgstr "Haku"
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
-#: lib/searchaction.php:129
+#: lib/searchaction.php:128
 msgid "Keyword(s)"
 msgstr ""
 
+#. TRANS: Button text for searching site.
 #: lib/searchaction.php:130
 msgctxt "BUTTON"
 msgid "Search"
@@ -8308,8 +8412,8 @@ msgid "The theme file is missing or the upload failed."
 msgstr ""
 
 #: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:278 lib/themeuploader.php:282
-#: lib/themeuploader.php:290 lib/themeuploader.php:297
+#: lib/themeuploader.php:279 lib/themeuploader.php:283
+#: lib/themeuploader.php:291 lib/themeuploader.php:298
 #, fuzzy
 msgid "Failed saving theme."
 msgstr "Profiilikuvan päivittäminen epäonnistui."
@@ -8320,29 +8424,32 @@ msgstr ""
 
 #: lib/themeuploader.php:166
 #, php-format
-msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
-msgstr ""
+msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
+msgid_plural ""
+"Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr[0] ""
+msgstr[1] ""
 
-#: lib/themeuploader.php:178
+#: lib/themeuploader.php:179
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr ""
 
-#: lib/themeuploader.php:218
+#: lib/themeuploader.php:219
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
 msgstr ""
 
-#: lib/themeuploader.php:224
+#: lib/themeuploader.php:225
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr ""
 
-#: lib/themeuploader.php:241
+#: lib/themeuploader.php:242
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr ""
 
-#: lib/themeuploader.php:259
+#: lib/themeuploader.php:260
 msgid "Error opening theme archive."
 msgstr "Tapahtui virhe, kun estoa poistettiin."
 
@@ -8529,23 +8636,40 @@ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
 msgstr[0] "Viesti oli liian pitkä - maksimikoko on 140 merkkiä, lähetit %d"
 msgstr[1] "Viesti oli liian pitkä - maksimikoko on 140 merkkiä, lähetit %d"
 
-#: scripts/restoreuser.php:82
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: scripts/restoreuser.php:61
 #, php-format
-msgid "Backup file for user %s (%s)"
+msgid "Getting backup from file '%s'."
 msgstr ""
 
-#: scripts/restoreuser.php:88
+#. TRANS: Commandline script output.
+#: scripts/restoreuser.php:91
 #, fuzzy
 msgid "No user specified; using backup user."
 msgstr "Ryhmää ei ole määritelty."
 
-#: scripts/restoreuser.php:94
+#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
+#: scripts/restoreuser.php:98
 #, php-format
-msgid "%d entries in backup."
-msgstr ""
+msgid "%d entry in backup."
+msgid_plural "%d entries in backup."
+msgstr[0] ""
+msgstr[1] ""
+
+#, fuzzy
+#~ msgid "Name is too long (maximum 255 chars)."
+#~ msgstr "Koko nimi on liian pitkä (max 255 merkkiä)."
+
+#, fuzzy
+#~ msgid "Organization is too long (maximum 255 chars)."
+#~ msgstr "Kotipaikka on liian pitkä (max 255 merkkiä)."
 
-#~ msgid "Description is too long (max %d chars)."
-#~ msgstr "kuvaus on liian pitkä (max %d merkkiä)."
+#~ msgid "That's too long. Max notice size is %d chars."
+#~ msgstr "Päivitys on liian pitkä. Maksimipituus on %d merkkiä."
 
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "Liikaa aliaksia. Maksimimäärä on %d."
+#~ msgid "Max notice size is %d chars, including attachment URL."
+#~ msgstr "Maksimikoko päivitykselle on %d merkkiä, mukaan lukien URL-osoite."
+
+#, fuzzy
+#~ msgid " tagged %s"
+#~ msgstr "Päivitykset joilla on tagi %s"
diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po
index b2e8cc18a..ed36d7e2a 100644
--- a/locale/fr/LC_MESSAGES/statusnet.po
+++ b/locale/fr/LC_MESSAGES/statusnet.po
@@ -20,17 +20,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-30 23:18+0000\n"
-"PO-Revision-Date: 2010-10-30 23:20:16+0000\n"
+"POT-Creation-Date: 2010-11-02 22:51+0000\n"
+"PO-Revision-Date: 2010-11-02 22:53:18+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r75708); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r75875); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-POT-Import-Date: 2010-10-30 09:48:40+0000\n"
+"X-POT-Import-Date: 2010-10-30 23:42:01+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -87,15 +87,20 @@ msgstr "Sauvegarder les paramètres d’accès"
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
+#. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
+#. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #: actions/accessadminpanel.php:193 actions/emailsettings.php:228
-#: actions/imsettings.php:187 actions/pathsadminpanel.php:512
-#: actions/profilesettings.php:201 actions/smssettings.php:209
-#: actions/subscriptions.php:246 lib/applicationeditform.php:355
+#: actions/imsettings.php:187 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: lib/applicationeditform.php:355 lib/groupeditform.php:207
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Enregistrer"
@@ -146,7 +151,7 @@ msgstr "Page non trouvée."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:495 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Utilisateur non trouvé."
@@ -220,7 +225,9 @@ msgstr ""
 
 #. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:208
+#. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -578,8 +585,11 @@ msgstr "Le nom complet est trop long (limité à 255 caractères maximum)."
 #. TRANS: Group edit form validation error.
 #. TRANS: Form validation error in New application form.
 #. TRANS: %d is the maximum number of characters for the description.
+#. TRANS: Group create form validation error.
+#. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:220 actions/editapplication.php:201
 #: actions/editgroup.php:216 actions/newapplication.php:178
+#: actions/newgroup.php:152
 #, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -735,14 +745,14 @@ msgstr "Le jeton de requête a déjà été autorisé."
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:172 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:74
 #: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
 #: actions/groupunblock.php:65 actions/imsettings.php:230
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
-#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/othersettings.php:153 actions/passwordsettings.php:138
 #: actions/profilesettings.php:221 actions/recoverpassword.php:350
 #: actions/register.php:172 actions/remotesubscribe.php:77
 #: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
@@ -929,20 +939,21 @@ msgstr "Vous ne pouvez pas supprimer le statut d’un autre utilisateur."
 
 #. TRANS: Client error displayed trying to repeat a non-existing notice through the API.
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
+#. TRANS: Error message displayed trying to delete a non-existing notice.
 #: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/deletenotice.php:58 actions/shownotice.php:92
+#: actions/deletenotice.php:61 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "Avis non trouvé."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:535
+#: actions/apistatusesretweet.php:83 lib/command.php:537
 msgid "Cannot repeat your own notice."
 msgstr "Vous ne pouvez pas reprendre votre propre avis."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:541
+#: actions/apistatusesretweet.php:92 lib/command.php:543
 msgid "Already repeated that notice."
 msgstr "Vous avez déjà repris cet avis."
 
@@ -963,7 +974,8 @@ msgstr "Le client doit fournir un paramètre « statut » avec une valeur."
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#: actions/apistatusesupdate.php:244
+#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
+#: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
@@ -979,7 +991,7 @@ msgstr "L’avis parent correspondant à cette réponse n’a pas été trouvé.
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
-#: actions/apistatusesupdate.php:308
+#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
 #, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
@@ -1195,17 +1207,18 @@ msgstr "Sélectionnez une zone de forme carrée pour définir votre avatar"
 msgid "Lost our file data."
 msgstr "Données perdues."
 
-#: actions/avatarsettings.php:384
+#. TRANS: Success message for having updated a user avatar.
+#: actions/avatarsettings.php:385
 msgid "Avatar updated."
 msgstr "Avatar mis à jour."
 
 #. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
-#: actions/avatarsettings.php:388
+#: actions/avatarsettings.php:389
 msgid "Failed updating avatar."
 msgstr "La mise à jour de l’avatar a échoué."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:412
+#: actions/avatarsettings.php:413
 msgid "Avatar deleted."
 msgstr "Avatar supprimé."
 
@@ -1237,8 +1250,8 @@ msgstr ""
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:154 actions/deleteapplication.php:154
-#: actions/deletegroup.php:220 actions/deletenotice.php:150
+#: actions/block.php:154 actions/deleteapplication.php:157
+#: actions/deletegroup.php:220 actions/deletenotice.php:155
 #: actions/deleteuser.php:152 actions/groupblock.php:178
 msgctxt "BUTTON"
 msgid "No"
@@ -1256,8 +1269,8 @@ msgstr "Ne pas bloquer cet utilisateur"
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:161 actions/deleteapplication.php:161
-#: actions/deletegroup.php:227 actions/deletenotice.php:157
+#: actions/block.php:161 actions/deleteapplication.php:164
+#: actions/deletegroup.php:227 actions/deletenotice.php:162
 #: actions/deleteuser.php:159 actions/groupblock.php:185
 msgctxt "BUTTON"
 msgid "Yes"
@@ -1374,12 +1387,13 @@ msgstr "Cette adresse a déjà été confirmée."
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
 #. TRANS: Server error thrown on database error updating IM preferences.
 #. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
 #. TRANS: Server error thrown when user profile settings could not be updated.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #: actions/confirmaddress.php:118 actions/emailsettings.php:331
 #: actions/emailsettings.php:477 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:174
+#: actions/imsettings.php:442 actions/othersettings.php:184
 #: actions/profilesettings.php:326 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
@@ -1415,16 +1429,19 @@ msgstr "Conversation"
 msgid "Notices"
 msgstr "Avis"
 
-#: actions/deleteapplication.php:63
+#. TRANS: Client error displayed trying to delete an application while not logged in.
+#: actions/deleteapplication.php:62
 msgid "You must be logged in to delete an application."
 msgstr "Vous devez être connecté pour supprimer une application."
 
+#. TRANS: Client error displayed trying to delete an application that does not exist.
 #: actions/deleteapplication.php:71
 msgid "Application not found."
 msgstr "Application non trouvée."
 
+#. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
-#: actions/deleteapplication.php:78 actions/editapplication.php:78
+#: actions/deleteapplication.php:79 actions/editapplication.php:78
 #: actions/showapplication.php:94
 msgid "You are not the owner of this application."
 msgstr "Vous n’êtes pas le propriétaire de cette application."
@@ -1432,15 +1449,18 @@ msgstr "Vous n’êtes pas le propriétaire de cette application."
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
 #: actions/newapplication.php:114 actions/showapplication.php:118
-#: lib/action.php:1354
+#: lib/action.php:1404
 msgid "There was a problem with your session token."
 msgstr "Un problème est survenu avec votre jeton de session."
 
-#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+#. TRANS: Title for delete application page.
+#. TRANS: Fieldset legend on delete application page.
+#: actions/deleteapplication.php:124 actions/deleteapplication.php:149
 msgid "Delete application"
 msgstr "Supprimer l’application"
 
-#: actions/deleteapplication.php:149
+#. TRANS: Confirmation text on delete application page.
+#: actions/deleteapplication.php:152
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
 "about the application from the database, including all existing user "
@@ -1451,12 +1471,12 @@ msgstr ""
 "utilisateur existantes."
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:158
+#: actions/deleteapplication.php:161
 msgid "Do not delete this application"
 msgstr "Ne pas supprimer cette application"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:164
+#: actions/deleteapplication.php:167
 msgid "Delete this application"
 msgstr "Supprimer cette application"
 
@@ -1490,12 +1510,13 @@ msgstr "Impossible de supprimer le groupe « %s »."
 msgid "Deleted group %s"
 msgstr "Groupe « %s » supprimé"
 
-#. TRANS: Title.
+#. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
 #: actions/deletegroup.php:176 actions/deletegroup.php:202
 msgid "Delete group"
 msgstr "Supprimer le groupe"
 
+#. TRANS: Warning in form for deleleting a group.
 #: actions/deletegroup.php:206
 msgid ""
 "Are you sure you want to delete this group? This will clear all data about "
@@ -1517,10 +1538,11 @@ msgstr "Ne pas supprimer ce groupe"
 msgid "Delete this group"
 msgstr "Supprimer ce groupe"
 
+#. TRANS: Error message displayed trying to delete a notice while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1530,11 +1552,13 @@ msgstr "Supprimer ce groupe"
 msgid "Not logged in."
 msgstr "Non connecté."
 
-#: actions/deletenotice.php:74
+#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
+#: actions/deletenotice.php:78
 msgid "Can't delete this notice."
 msgstr "Impossible de supprimer cet avis."
 
-#: actions/deletenotice.php:106
+#. TRANS: Instructions for deleting a notice.
+#: actions/deletenotice.php:110
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
@@ -1542,21 +1566,24 @@ msgstr ""
 "Vous êtes sur le point de supprimer définitivement un message. Une fois cela "
 "fait, il est impossible de l’annuler."
 
-#: actions/deletenotice.php:112 actions/deletenotice.php:144
+#. TRANS: Page title when deleting a notice.
+#. TRANS: Fieldset legend for the delete notice form.
+#: actions/deletenotice.php:117 actions/deletenotice.php:148
 msgid "Delete notice"
 msgstr "Supprimer cet avis"
 
-#: actions/deletenotice.php:147
+#. TRANS: Message for the delete notice form.
+#: actions/deletenotice.php:152
 msgid "Are you sure you want to delete this notice?"
 msgstr "Voulez-vous vraiment supprimer cet avis ?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:154
+#: actions/deletenotice.php:159
 msgid "Do not delete this notice"
 msgstr "Ne pas supprimer cet avis"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:161 lib/noticelist.php:667
+#: actions/deletenotice.php:166 lib/noticelist.php:667
 msgid "Delete this notice"
 msgstr "Supprimer cet avis"
 
@@ -1719,11 +1746,9 @@ msgstr "Revenir aux valeurs par défaut"
 
 #. TRANS: Submit button title.
 #: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
-#: actions/othersettings.php:126 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: actions/useradminpanel.php:295 lib/applicationeditform.php:357
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: lib/applicationeditform.php:357 lib/designsettings.php:256
 msgid "Save"
 msgstr "Enregistrer"
 
@@ -1771,8 +1796,9 @@ msgid "Name is required."
 msgstr "Le nom est requis."
 
 #. TRANS: Validation error shown when providing too long a name in the "Edit application" form.
-#: actions/editapplication.php:188
-msgid "Name is too long (max 255 characters)."
+#: actions/editapplication.php:188 actions/newapplication.php:169
+#, fuzzy
+msgid "Name is too long (maximum 255 characters)."
 msgstr "Le nom est trop long (limité à 255 caractères maximum)."
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
@@ -1801,7 +1827,7 @@ msgid "Organization is required."
 msgstr "L’organisation est requise."
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#: actions/editapplication.php:223
+#: actions/editapplication.php:223 actions/newapplication.php:199
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "L’organisation est trop longue (limitée à 255 caractères maximum)."
 
@@ -2605,7 +2631,7 @@ msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Publier un MicroID pour mon adresse Jabber/GTalk."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:180
+#: actions/imsettings.php:290 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "Préférences enregistrées"
 
@@ -2729,10 +2755,9 @@ msgstr[1] "Vous êtes déjà abonné à ces utilisateurs :"
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#. TRANS: Whois output.
-#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:145 actions/invite.php:159 lib/command.php:426
-#, php-format
+#: actions/invite.php:145 actions/invite.php:159
+#, fuzzy, php-format
+msgctxt "INVITE"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
@@ -2922,7 +2947,8 @@ msgstr ""
 "licence « Tous droits réservés »."
 
 #: actions/licenseadminpanel.php:156
-msgid "Invalid license title. Max length is 255 characters."
+#, fuzzy
+msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "Titre de licence invalide. La taille maximale est de 255 caractères."
 
 #: actions/licenseadminpanel.php:168
@@ -3101,18 +3127,10 @@ msgstr "Vous devez être connecté pour enregistrer une application."
 msgid "Use this form to register a new application."
 msgstr "Utilisez ce formulaire pour inscrire une nouvelle application."
 
-#: actions/newapplication.php:169
-msgid "Name is too long (maximum 255 chars)."
-msgstr "Le nom est trop long (limité à 255 caractères maximum)."
-
 #: actions/newapplication.php:184
 msgid "Source URL is required."
 msgstr "L’URL source est requise."
 
-#: actions/newapplication.php:199
-msgid "Organization is too long (maximum 255 chars)."
-msgstr "L’organisation est trop longue (limitée à 255 caractères maximum)."
-
 #: actions/newapplication.php:266 actions/newapplication.php:275
 msgid "Could not create application."
 msgstr "Impossible de créer l’application."
@@ -3132,14 +3150,14 @@ msgid "New message"
 msgstr "Nouveau message"
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:499
+#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501
 msgid "You can't send a message to this user."
 msgstr "Vous ne pouvez pas envoyer de messages à cet utilisateur."
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
 #: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
-#: lib/command.php:579
+#: lib/command.php:581
 msgid "No content!"
 msgstr "Aucun contenu !"
 
@@ -3148,7 +3166,7 @@ msgid "No recipient specified."
 msgstr "Aucun destinataire n’a été spécifié."
 
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:503
+#: actions/newmessage.php:167 lib/command.php:505
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -3160,12 +3178,12 @@ msgstr "Message envoyé"
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:511
+#: actions/newmessage.php:188 lib/command.php:513
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Message direct envoyé à %s."
 
-#: actions/newmessage.php:213 actions/newnotice.php:263
+#: actions/newmessage.php:213 actions/newnotice.php:264
 msgid "Ajax Error"
 msgstr "Erreur Ajax"
 
@@ -3173,19 +3191,7 @@ msgstr "Erreur Ajax"
 msgid "New notice"
 msgstr "Nouvel avis"
 
-#: actions/newnotice.php:159 lib/mailhandler.php:60
-#, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr "C’est trop long ! La taille maximale de l’avis est de %d caractères."
-
-#: actions/newnotice.php:183
-#, php-format
-msgid "Max notice size is %d chars, including attachment URL."
-msgstr ""
-"La taille maximale de l’avis est de %d caractères, en incluant l’URL de la "
-"pièce jointe."
-
-#: actions/newnotice.php:229
+#: actions/newnotice.php:230
 msgid "Notice posted"
 msgstr "Avis publié"
 
@@ -3359,36 +3365,46 @@ msgstr "Recherche de personnes"
 msgid "Notice Search"
 msgstr "Recherche d’avis"
 
-#: actions/othersettings.php:60
+#: actions/othersettings.php:59
 msgid "Other settings"
 msgstr "Autres paramètres"
 
+#. TRANS: Instructions for tab "Other" in user profile settings.
 #: actions/othersettings.php:71
 msgid "Manage various other options."
 msgstr "Autres options à configurer"
 
-#: actions/othersettings.php:108
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/othersettings.php:111
 msgid " (free service)"
 msgstr " (service gratuit)"
 
-#: actions/othersettings.php:116
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/othersettings.php:120
 msgid "Shorten URLs with"
 msgstr "Raccourcir les URL avec"
 
-#: actions/othersettings.php:117
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/othersettings.php:122
 msgid "Automatic shortening service to use."
 msgstr "Sélectionnez un service de réduction d’URL."
 
-#: actions/othersettings.php:122
+#. TRANS: Label for checkbox.
+#: actions/othersettings.php:128
 msgid "View profile designs"
 msgstr "Afficher les conceptions de profils"
 
-#: actions/othersettings.php:123
+#. TRANS: Tooltip for checkbox.
+#: actions/othersettings.php:130
 msgid "Show or hide profile designs."
 msgstr "Afficher ou masquer les paramètres de conception."
 
-#: actions/othersettings.php:153
-msgid "URL shortening service is too long (max 50 chars)."
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/othersettings.php:162
+#, fuzzy
+msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "Le service de réduction d’URL est trop long (50 caractères maximum)."
 
 #: actions/otp.php:69
@@ -3861,7 +3877,7 @@ msgstr "Bio"
 #. TRANS: Label for group location (dt). Text hidden by default.
 #: actions/profilesettings.php:149 actions/register.php:485
 #: actions/showgroup.php:267 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:177
+#: actions/userauthorization.php:166 lib/groupeditform.php:180
 #: lib/userprofile.php:165
 msgid "Location"
 msgstr "Emplacement"
@@ -4205,7 +4221,8 @@ msgid "Unexpected password reset."
 msgstr "Réinitialisation inattendue du mot de passe."
 
 #: actions/recoverpassword.php:365
-msgid "Password must be 6 chars or more."
+#, fuzzy
+msgid "Password must be 6 characters or more."
 msgstr "Le mot de passe doit contenir au moins 6 caractères."
 
 #: actions/recoverpassword.php:369
@@ -4590,7 +4607,7 @@ msgstr "Organisation"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:172
+#: lib/applicationeditform.php:208 lib/groupeditform.php:175
 msgid "Description"
 msgstr "Description"
 
@@ -4742,7 +4759,7 @@ msgid "Note"
 msgstr "Note"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:298 lib/groupeditform.php:184
+#: actions/showgroup.php:298 lib/groupeditform.php:187
 msgid "Aliases"
 msgstr "Alias"
 
@@ -4877,48 +4894,68 @@ msgstr "Message reçu de %1$s le %2$s"
 msgid "Notice deleted."
 msgstr "Avis supprimé."
 
-#: actions/showstream.php:72
-#, php-format
-msgid " tagged %s"
-msgstr "   marqué %s"
+#. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
+#: actions/showstream.php:70
+#, fuzzy, php-format
+msgid "%1$s tagged %2$s"
+msgstr "%1$s, page %2$d"
 
-#: actions/showstream.php:78
+#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#: actions/showstream.php:74
+#, fuzzy, php-format
+msgid "%1$s tagged %2$s, page %3$d"
+msgstr "Avis marqués avec %1$s, page %2$d"
+
+#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$d is the page number.
+#: actions/showstream.php:82
 #, php-format
 msgid "%1$s, page %2$d"
 msgstr "%1$s, page %2$d"
 
-#: actions/showstream.php:120
+#. TRANS: Title for link to notice feed.
+#. TRANS: %1$s is a user nickname, %2$s is a hashtag.
+#: actions/showstream.php:127
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Fil des avis pour %1$s marqués %2$s (RSS 1.0)"
 
-#: actions/showstream.php:127
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:136
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "Flux des avis de %s (RSS 1.0)"
 
-#: actions/showstream.php:134
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:145
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "Flux des avis de %s (RSS 2.0)"
 
-#: actions/showstream.php:141
+#: actions/showstream.php:152
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "Flux des avis de %s (Atom)"
 
-#: actions/showstream.php:146
+#. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
+#. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
+#: actions/showstream.php:159
 #, php-format
 msgid "FOAF for %s"
 msgstr "ami d’un ami pour %s"
 
-#: actions/showstream.php:197
-#, php-format
-msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
+#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
+#: actions/showstream.php:211
+#, fuzzy, php-format
+msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr ""
 "Ceci est la chronologie de %1$s mais %2$s n’a rien publié pour le moment."
 
-#: actions/showstream.php:202
+#. TRANS: Second sentence of empty list message for a stream for the user themselves.
+#: actions/showstream.php:217
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -4926,7 +4963,9 @@ msgstr ""
 "Avez-vous vu quelque chose d’intéressant récemment ? Vous n’avez pas publié "
 "d’avis pour le moment, vous pourriez commencer maintenant :)"
 
-#: actions/showstream.php:204
+#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:221
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -4935,7 +4974,9 @@ msgstr ""
 "Vous pouvez essayer de faire un clin d’œil à %1$s ou de [poster quelque "
 "chose à son intention](%%%%action.newnotice%%%%?status_textarea=%2$s)."
 
-#: actions/showstream.php:243
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:264
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4949,7 +4990,9 @@ msgstr ""
 "register%%%%) pour suivre les avis de **%s** et bien plus ! ([En lire plus](%"
 "%%%doc.help%%%%))"
 
-#: actions/showstream.php:248
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:271
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4960,7 +5003,8 @@ msgstr ""
 "wikipedia.org/wiki/Microblog)  basé sur le logiciel libre [StatusNet](http://"
 "status.net/). "
 
-#: actions/showstream.php:305
+#. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
+#: actions/showstream.php:328
 #, php-format
 msgid "Repeat of %s"
 msgstr "Reprises de %s"
@@ -5074,32 +5118,41 @@ msgstr ""
 "Combien de temps (en secondes) les utilisateurs doivent attendre pour poster "
 "la même chose de nouveau."
 
-#: actions/sitenoticeadminpanel.php:56
+#. TRANS: Page title for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:55
 msgid "Site Notice"
 msgstr "Avis du site"
 
-#: actions/sitenoticeadminpanel.php:67
+#. TRANS: Instructions for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:66
 msgid "Edit site-wide message"
 msgstr "Modifier un message portant sur tout le site"
 
-#: actions/sitenoticeadminpanel.php:103
+#. TRANS: Server error displayed when saving a site-wide notice was impossible.
+#: actions/sitenoticeadminpanel.php:101
 msgid "Unable to save site notice."
 msgstr "Impossible d'enregistrer l'avis du site."
 
-#: actions/sitenoticeadminpanel.php:113
-msgid "Max length for the site-wide notice is 255 chars."
+#. TRANS: Client error displayed when a site-wide notice was longer than allowed.
+#: actions/sitenoticeadminpanel.php:112
+#, fuzzy
+msgid "Maximum length for the site-wide notice is 255 characters."
 msgstr "La longueur maximale pour l'avis du site est de 255 caractères."
 
+#. TRANS: Label for site-wide notice text field in admin panel.
 #: actions/sitenoticeadminpanel.php:176
 msgid "Site notice text"
 msgstr "Texte de l'avis du site"
 
-#: actions/sitenoticeadminpanel.php:178
-msgid "Site-wide notice text (255 chars max; HTML okay)"
+#. TRANS: Tooltip for site-wide notice text field in admin panel.
+#: actions/sitenoticeadminpanel.php:179
+#, fuzzy
+msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr ""
 "Texte de l'avis portant sur tout le site (max. 255 caractères ; HTML activé)"
 
-#: actions/sitenoticeadminpanel.php:198
+#. TRANS: Title for button to save site notice in admin panel.
+#: actions/sitenoticeadminpanel.php:201
 msgid "Save site notice"
 msgstr "Enregistrer l'avis du site"
 
@@ -5570,77 +5623,95 @@ msgstr ""
 "avec la licence du site « %2$s »."
 
 #. TRANS: User admin panel title
-#: actions/useradminpanel.php:60
+#: actions/useradminpanel.php:58
 msgctxt "TITLE"
 msgid "User"
 msgstr "Utilisateur"
 
-#: actions/useradminpanel.php:71
+#. TRANS: Instruction for user admin panel.
+#: actions/useradminpanel.php:69
 msgid "User settings for this StatusNet site"
 msgstr "Paramètres des utilisateurs pour ce site StatusNet"
 
-#: actions/useradminpanel.php:150
+#. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
+#: actions/useradminpanel.php:147
 msgid "Invalid bio limit. Must be numeric."
 msgstr "Limite de bio invalide : doit être numérique."
 
-#: actions/useradminpanel.php:156
-msgid "Invalid welcome text. Max length is 255 characters."
+#. TRANS: Form validation error in user admin panel when welcome text is too long.
+#: actions/useradminpanel.php:154
+#, fuzzy
+msgid "Invalid welcome text. Maximum length is 255 characters."
 msgstr "Texte de bienvenue invalide. La taille maximale est de 255 caractères."
 
+#. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
+#. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
-#, php-format
-msgid "Invalid default subscripton: '%1$s' is not user."
+#, fuzzy, php-format
+msgid "Invalid default subscripton: '%1$s' is not a user."
 msgstr "Abonnement par défaut invalide : « %1$s » n’est pas un utilisateur."
 
 #. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:106
+#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
 #: lib/personalgroupnav.php:109
 msgid "Profile"
 msgstr "Profil"
 
-#: actions/useradminpanel.php:223
+#. TRANS: Field label in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:220
 msgid "Bio Limit"
 msgstr "Limite de bio"
 
-#: actions/useradminpanel.php:224
+#. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:222
 msgid "Maximum length of a profile bio in characters."
 msgstr "Longueur maximale de la bio d’un profil en caractères."
 
-#: actions/useradminpanel.php:232
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:231
 msgid "New users"
 msgstr "Nouveaux utilisateurs"
 
+#. TRANS: Field label in user admin panel for setting new user welcome text.
 #: actions/useradminpanel.php:236
 msgid "New user welcome"
 msgstr "Accueil des nouveaux utilisateurs"
 
-#: actions/useradminpanel.php:237
-msgid "Welcome text for new users (Max 255 chars)."
+#. TRANS: Tooltip in user admin panel for setting new user welcome text.
+#: actions/useradminpanel.php:238
+#, fuzzy
+msgid "Welcome text for new users (maximum 255 characters)."
 msgstr ""
 "Texte de bienvenue pour les nouveaux utilisateurs (maximum 255 caractères)."
 
-#: actions/useradminpanel.php:242
+#. TRANS: Field label in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:244
 msgid "Default subscription"
 msgstr "Abonnements par défaut"
 
-#: actions/useradminpanel.php:243
+#. TRANS: Tooltip in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:246
 msgid "Automatically subscribe new users to this user."
 msgstr "Abonner automatiquement les nouveaux utilisateurs à cet utilisateur."
 
-#: actions/useradminpanel.php:252
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:256
 msgid "Invitations"
 msgstr "Invitations"
 
-#: actions/useradminpanel.php:257
+#. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:262
 msgid "Invitations enabled"
 msgstr "Invitations activées"
 
-#: actions/useradminpanel.php:259
+#. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:265
 msgid "Whether to allow users to invite new users."
 msgstr ""
 "S’il faut autoriser les utilisateurs à inviter de nouveaux utilisateurs."
 
-#: actions/useradminpanel.php:295
+#. TRANS: Title for button to save user settings in user admin panel.
+#: actions/useradminpanel.php:302
 msgid "Save user settings"
 msgstr "Sauvegarder les paramètres utilisateur"
 
@@ -5854,7 +5925,7 @@ msgid "Plugins"
 msgstr "Extensions"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:831
+#: actions/version.php:198 lib/action.php:880
 msgid "Version"
 msgstr "Version"
 
@@ -6063,9 +6134,16 @@ msgstr "Impossible d’enregistrer la réponse à %1$d, %2$d."
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
+#. TRANS: Full name of a profile or group followed by nickname in parens
+#: classes/Profile.php:164
+#, fuzzy, php-format
+msgctxt "FANCYNAME"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:791
+#: classes/Profile.php:812
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
@@ -6074,7 +6152,7 @@ msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:800
+#: classes/Profile.php:821
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6221,194 +6299,201 @@ msgstr "%1$s - %2$s"
 msgid "Untitled page"
 msgstr "Page sans nom"
 
+#. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
+#: lib/action.php:310
+msgctxt "TOOLTIP"
+msgid "Show more"
+msgstr ""
+
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:477
+#: lib/action.php:526
 msgid "Primary site navigation"
 msgstr "Navigation primaire du site"
 
 #. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:483
+#: lib/action.php:532
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "Profil personnel et flux des amis"
 
 #. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:486
+#: lib/action.php:535
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Personnel"
 
 #. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:488
+#: lib/action.php:537
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
 msgstr "Modifier votre adresse électronique, avatar, mot de passe, profil"
 
 #. TRANS: Main menu option when logged in for access to user settings
-#: lib/action.php:491
+#: lib/action.php:540
 msgid "Account"
 msgstr "Compte"
 
 #. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:493
+#: lib/action.php:542
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "Se connecter aux services"
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:496
+#: lib/action.php:545
 msgid "Connect"
 msgstr "Connexion"
 
 #. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:499
+#: lib/action.php:548
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "Modifier la configuration du site"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:502 lib/groupnav.php:117
+#: lib/action.php:551 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Administrer"
 
 #. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:506
+#: lib/action.php:555
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Inviter des amis et collègues à vous rejoindre sur %s"
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:509
+#: lib/action.php:558
 msgctxt "MENU"
 msgid "Invite"
 msgstr "Inviter"
 
 #. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:515
+#: lib/action.php:564
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "Fermer la session"
 
 #. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:518
+#: lib/action.php:567
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Déconnexion"
 
 #. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:523
+#: lib/action.php:572
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "Créer un compte"
 
 #. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:526
+#: lib/action.php:575
 msgctxt "MENU"
 msgid "Register"
 msgstr "S’inscrire"
 
 #. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:529
+#: lib/action.php:578
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "Ouvrir une session"
 
 #. TRANS: Main menu option when not logged in to log in
-#: lib/action.php:532
+#: lib/action.php:581
 msgctxt "MENU"
 msgid "Login"
 msgstr "Connexion"
 
 #. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:535
+#: lib/action.php:584
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "À l’aide !"
 
 #. TRANS: Main menu option for help on the StatusNet site
-#: lib/action.php:538
+#: lib/action.php:587
 msgctxt "MENU"
 msgid "Help"
 msgstr "Aide"
 
 #. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:541
+#: lib/action.php:590
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr "Rechercher des personnes ou du texte"
 
 #. TRANS: Main menu option when logged in or when the StatusNet instance is not private
-#: lib/action.php:544
+#: lib/action.php:593
 msgctxt "MENU"
 msgid "Search"
 msgstr "Rechercher"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:566 lib/adminpanelaction.php:387
+#: lib/action.php:615 lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "Notice du site"
 
 #. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:633
+#: lib/action.php:682
 msgid "Local views"
 msgstr "Vues locales"
 
 #. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:703
+#: lib/action.php:752
 msgid "Page notice"
 msgstr "Avis de la page"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:804
+#: lib/action.php:853
 msgid "Secondary site navigation"
 msgstr "Navigation secondaire du site"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:810
+#: lib/action.php:859
 msgid "Help"
 msgstr "Aide"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:813
+#: lib/action.php:862
 msgid "About"
 msgstr "À propos"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:816
+#: lib/action.php:865
 msgid "FAQ"
 msgstr "FAQ"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:821
+#: lib/action.php:870
 msgid "TOS"
 msgstr "CGU"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:825
+#: lib/action.php:874
 msgid "Privacy"
 msgstr "Confidentialité"
 
-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:828
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+#: lib/action.php:877
 msgid "Source"
 msgstr "Source"
 
-#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:834
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+#: lib/action.php:884
 msgid "Contact"
 msgstr "Contact"
 
-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:837
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+#: lib/action.php:887
 msgid "Badge"
 msgstr "Insigne"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:866
+#: lib/action.php:916
 msgid "StatusNet software license"
 msgstr "Licence du logiciel StatusNet"
 
@@ -6416,7 +6501,7 @@ msgstr "Licence du logiciel StatusNet"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:873
+#: lib/action.php:923
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -6426,7 +6511,7 @@ msgstr ""
 "%site.broughtby%%](%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:876
+#: lib/action.php:926
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** est un service de micro-blogging."
@@ -6435,7 +6520,7 @@ msgstr "**%%site.name%%** est un service de micro-blogging."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:883
+#: lib/action.php:933
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -6447,20 +6532,20 @@ msgstr ""
 "(http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:899
+#: lib/action.php:949
 msgid "Site content license"
 msgstr "Licence du contenu du site"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:906
+#: lib/action.php:956
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "Le contenu et les données de %1$s sont privés et confidentiels."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:913
+#: lib/action.php:963
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
@@ -6468,7 +6553,7 @@ msgstr ""
 "réservés."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:917
+#: lib/action.php:967
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "Le contenu et les données sont sous le droit d’auteur du contributeur. Tous "
@@ -6476,26 +6561,26 @@ msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:949
+#: lib/action.php:999
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 "Tous les contenus %1$s et les données sont disponibles sous la licence %2$s."
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1285
+#: lib/action.php:1335
 msgid "Pagination"
 msgstr "Pagination"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1296
+#: lib/action.php:1346
 msgid "After"
 msgstr "Après"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1306
+#: lib/action.php:1356
 msgid "Before"
 msgstr "Avant"
 
@@ -6842,7 +6927,7 @@ msgid "AJAX error"
 msgstr "Erreur Ajax"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:233 lib/mailhandler.php:142
+#: lib/channel.php:233 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "Commande complétée"
 
@@ -6858,7 +6943,7 @@ msgstr "Aucun avis avec cet identifiant n’existe."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:626
+#: lib/command.php:99 lib/command.php:630
 msgid "User has no last notice."
 msgstr "Aucun avis récent pour cet utilisateur."
 
@@ -6927,6 +7012,14 @@ msgstr "%1$s a rejoint le groupe %2$s."
 msgid "%1$s left group %2$s."
 msgstr "%1$s a quitté le groupe %2$s."
 
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: lib/command.php:426
+#, fuzzy, php-format
+msgctxt "WHOIS"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
 #. TRANS: Whois output. %s is the full name of the queried user.
 #: lib/command.php:430
 #, php-format
@@ -6966,118 +7059,126 @@ msgstr ""
 "%s est un profil distant ; vous ne pouvez envoyer de messages directs qu'aux "
 "utilisateurs du même serveur."
 
-#. TRANS: Message given if content is too long.
+#. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
 #: lib/command.php:488
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] ""
+"Message trop long ! La taille maximale est de %1$d caractères ; vous en avez "
+"entré %2$d."
+msgstr[1] ""
 "Message trop long ! La taille maximale est de %1$d caractères ; vous en avez "
 "entré %2$d."
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:514
+#: lib/command.php:516
 msgid "Error sending direct message."
 msgstr "Une erreur est survenue pendant l’envoi de votre message."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:551
+#: lib/command.php:553
 #, php-format
 msgid "Notice from %s repeated."
 msgstr "Avis de %s repris."
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:554
+#: lib/command.php:556
 msgid "Error repeating notice."
 msgstr "Erreur lors de la reprise de l’avis."
 
-#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:589
-#, php-format
-msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
+#: lib/command.php:591
+#, fuzzy, php-format
+msgid "Notice too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] ""
+"Avis trop long ! La taille maximale est de %1$d caractères ; vous en avez "
+"entré %2$d."
+msgstr[1] ""
 "Avis trop long ! La taille maximale est de %1$d caractères ; vous en avez "
 "entré %2$d."
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:600
+#: lib/command.php:604
 #, php-format
 msgid "Reply to %s sent."
 msgstr "Réponse à %s envoyée."
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:603
+#: lib/command.php:607
 msgid "Error saving notice."
 msgstr "Problème lors de l’enregistrement de l’avis."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:650
+#: lib/command.php:654
 msgid "Specify the name of the user to subscribe to."
 msgstr "Indiquez le nom de l’utilisateur auquel vous souhaitez vous abonner."
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:659
+#: lib/command.php:663
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Impossible de s'inscrire aux profils OMB par cette commande."
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:667
+#: lib/command.php:671
 #, php-format
 msgid "Subscribed to %s."
 msgstr "Abonné à %s."
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:688 lib/command.php:799
+#: lib/command.php:692 lib/command.php:803
 msgid "Specify the name of the user to unsubscribe from."
 msgstr ""
 "Indiquez le nom de l’utilisateur duquel vous souhaitez vous désabonner."
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:699
+#: lib/command.php:703
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr "Désabonné de %s."
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:719 lib/command.php:745
+#: lib/command.php:723 lib/command.php:749
 msgid "Command not yet implemented."
 msgstr "Cette commande n’a pas encore été implémentée."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:723
+#: lib/command.php:727
 msgid "Notification off."
 msgstr "Avertissements désactivés."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:726
+#: lib/command.php:730
 msgid "Can't turn off notification."
 msgstr "Impossible de désactiver les avertissements."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:749
+#: lib/command.php:753
 msgid "Notification on."
 msgstr "Avertissements activés."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:752
+#: lib/command.php:756
 msgid "Can't turn on notification."
 msgstr "Impossible d’activer les avertissements."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:766
+#: lib/command.php:770
 msgid "Login command is disabled."
 msgstr "La commande d’ouverture de session est désactivée."
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:779
+#: lib/command.php:783
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
@@ -7086,20 +7187,20 @@ msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:808
+#: lib/command.php:812
 #, php-format
 msgid "Unsubscribed %s."
 msgstr "Désabonné de %s."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:826
+#: lib/command.php:830
 msgid "You are not subscribed to anyone."
 msgstr "Vous n’êtes abonné(e) à personne."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:831
+#: lib/command.php:835
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Vous êtes abonné à cette personne :"
@@ -7107,14 +7208,14 @@ msgstr[1] "Vous êtes abonné à ces personnes :"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:853
+#: lib/command.php:857
 msgid "No one is subscribed to you."
 msgstr "Personne ne s’est abonné à vous."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:858
+#: lib/command.php:862
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Cette personne est abonnée à vous :"
@@ -7122,21 +7223,21 @@ msgstr[1] "Ces personnes sont abonnées à vous :"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:880
+#: lib/command.php:884
 msgid "You are not a member of any groups."
 msgstr "Vous n’êtes membre d’aucun groupe."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:885
+#: lib/command.php:889
 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 :"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:900
+#: lib/command.php:904
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -7367,7 +7468,8 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1 à 64 lettres minuscules ou chiffres, sans ponctuation ni espaces"
 
 #: lib/groupeditform.php:163
-msgid "URL of the homepage or blog of the group or topic"
+#, fuzzy
+msgid "URL of the homepage or blog of the group or topic."
 msgstr "URL du site Web ou blogue du groupe ou sujet "
 
 #: lib/groupeditform.php:168
@@ -7375,21 +7477,32 @@ msgid "Describe the group or topic"
 msgstr "Description du groupe ou du sujet"
 
 #: lib/groupeditform.php:170
-#, php-format
-msgid "Describe the group or topic in %d characters"
-msgstr "Description du groupe ou du sujet en %d caractères"
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d character or less"
+msgid_plural "Describe the group or topic in %d characters or less"
+msgstr[0] "Description du groupe ou du sujet en %d caractères"
+msgstr[1] "Description du groupe ou du sujet en %d caractères"
 
-#: lib/groupeditform.php:179
+#: lib/groupeditform.php:182
+#, fuzzy
 msgid ""
-"Location for the group, if any, like \"City, State (or Region), Country\""
+"Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr ""
 "Emplacement du groupe, s’il y a lieu, de la forme « Ville, État ou région, "
 "Pays »"
 
-#: lib/groupeditform.php:187
-#, php-format
-msgid "Extra nicknames for the group, comma- or space- separated, max %d"
-msgstr ""
+#: lib/groupeditform.php:190
+#, fuzzy, php-format
+msgid ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"alias allowed."
+msgid_plural ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"aliases allowed."
+msgstr[0] ""
+"Pseudos supplémentaires pour le groupe, séparés par des virgules ou des "
+"espaces, %d au maximum"
+msgstr[1] ""
 "Pseudos supplémentaires pour le groupe, séparés par des virgules ou des "
 "espaces, %d au maximum"
 
@@ -7951,7 +8064,7 @@ msgstr "Désolé, ceci n’est pas votre adresse de courriel entrant."
 msgid "Sorry, no incoming email allowed."
 msgstr "Désolé, la réception de courriels n’est pas permise."
 
-#: lib/mailhandler.php:228
+#: lib/mailhandler.php:229
 #, php-format
 msgid "Unsupported message type: %s"
 msgstr "Type de message non supporté : %s"
@@ -8299,16 +8412,17 @@ msgid "Sandbox this user"
 msgstr "Mettre cet utilisateur dans un bac à sable"
 
 #. TRANS: Fieldset legend for the search form.
-#: lib/searchaction.php:121
+#: lib/searchaction.php:120
 msgid "Search site"
 msgstr "Rechercher sur le site"
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
-#: lib/searchaction.php:129
+#: lib/searchaction.php:128
 msgid "Keyword(s)"
 msgstr "Mot(s) clef(s)"
 
+#. TRANS: Button text for searching site.
 #: lib/searchaction.php:130
 msgctxt "BUTTON"
 msgid "Search"
@@ -8400,8 +8514,8 @@ msgid "The theme file is missing or the upload failed."
 msgstr "Le fichier de thème est manquant ou le téléversement a échoué."
 
 #: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:278 lib/themeuploader.php:282
-#: lib/themeuploader.php:290 lib/themeuploader.php:297
+#: lib/themeuploader.php:279 lib/themeuploader.php:283
+#: lib/themeuploader.php:291 lib/themeuploader.php:298
 msgid "Failed saving theme."
 msgstr "L’enregistrement du thème a échoué."
 
@@ -8410,17 +8524,22 @@ msgid "Invalid theme: bad directory structure."
 msgstr "Thème invalide : mauvaise arborescence."
 
 #: lib/themeuploader.php:166
-#, php-format
-msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
-msgstr ""
+#, fuzzy, php-format
+msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
+msgid_plural ""
+"Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr[0] ""
+"Le thème importé est trop volumineux. Non compressé, il doit occuper moins "
+"de %d octets."
+msgstr[1] ""
 "Le thème importé est trop volumineux. Non compressé, il doit occuper moins "
 "de %d octets."
 
-#: lib/themeuploader.php:178
+#: lib/themeuploader.php:179
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr "Archive de thème invalide : fichier css/display.css manquant"
 
-#: lib/themeuploader.php:218
+#: lib/themeuploader.php:219
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
@@ -8428,18 +8547,18 @@ msgstr ""
 "Le thème contient un nom de fichier ou de dossier invalide. Limitez-vous aux "
 "lettres ASCII et aux chiffres, caractère de soulignement et signe moins."
 
-#: lib/themeuploader.php:224
+#: lib/themeuploader.php:225
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr ""
 "Ce thème contient un nom d'extension de ficher dangereux; peut être "
 "dangereux."
 
-#: lib/themeuploader.php:241
+#: lib/themeuploader.php:242
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr "Le thème contient un fichier de type « .%s », qui n'est pas autorisé."
 
-#: lib/themeuploader.php:259
+#: lib/themeuploader.php:260
 msgid "Error opening theme archive."
 msgstr "Erreur lors de l’ouverture de l’archive du thème."
 
@@ -8626,22 +8745,42 @@ msgstr[1] ""
 "Message trop long ! La taille maximale est de %1$d caractères ; vous en avez "
 "envoyé %2$d."
 
-#: scripts/restoreuser.php:82
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: scripts/restoreuser.php:61
 #, php-format
-msgid "Backup file for user %s (%s)"
-msgstr "Fichier de sauvegarde pour l’utilisateur %s (%s)"
+msgid "Getting backup from file '%s'."
+msgstr ""
 
-#: scripts/restoreuser.php:88
+#. TRANS: Commandline script output.
+#: scripts/restoreuser.php:91
 msgid "No user specified; using backup user."
 msgstr "Aucun utilisateur spécifié ; utilisation de l’utilisateur de secours."
 
-#: scripts/restoreuser.php:94
-#, php-format
-msgid "%d entries in backup."
-msgstr "%d entrées dans la sauvegarde."
+#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
+#: scripts/restoreuser.php:98
+#, fuzzy, php-format
+msgid "%d entry in backup."
+msgid_plural "%d entries in backup."
+msgstr[0] "%d entrées dans la sauvegarde."
+msgstr[1] "%d entrées dans la sauvegarde."
+
+#~ msgid "Name is too long (maximum 255 chars)."
+#~ msgstr "Le nom est trop long (limité à 255 caractères maximum)."
+
+#~ msgid "Organization is too long (maximum 255 chars)."
+#~ msgstr "L’organisation est trop longue (limitée à 255 caractères maximum)."
+
+#~ msgid "That's too long. Max notice size is %d chars."
+#~ msgstr ""
+#~ "C’est trop long ! La taille maximale de l’avis est de %d caractères."
+
+#~ msgid "Max notice size is %d chars, including attachment URL."
+#~ msgstr ""
+#~ "La taille maximale de l’avis est de %d caractères, en incluant l’URL de "
+#~ "la pièce jointe."
 
-#~ msgid "Description is too long (max %d chars)."
-#~ msgstr "La description est trop longue (limitée à %d caractères maximum)."
+#~ msgid " tagged %s"
+#~ msgstr "   marqué %s"
 
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "Trop d’alias ! Maximum %d."
+#~ msgid "Backup file for user %s (%s)"
+#~ msgstr "Fichier de sauvegarde pour l’utilisateur %s (%s)"
diff --git a/locale/ga/LC_MESSAGES/statusnet.po b/locale/ga/LC_MESSAGES/statusnet.po
index 5ceb45a93..b05f9aba2 100644
--- a/locale/ga/LC_MESSAGES/statusnet.po
+++ b/locale/ga/LC_MESSAGES/statusnet.po
@@ -9,18 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-30 23:18+0000\n"
-"PO-Revision-Date: 2010-10-30 23:20:18+0000\n"
+"POT-Creation-Date: 2010-11-02 22:51+0000\n"
+"PO-Revision-Date: 2010-11-02 22:53:19+0000\n"
 "Language-Team: Irish <http://translatewiki.net/wiki/Portal:ga>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r75708); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r75875); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ga\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=5; plural=(n == 1) ? 0 : ( (n == 2) ? 1 : ( (n < 7) ? "
 "2 : ( (n < 11) ? 3 : 4 ) ) );\n"
-"X-POT-Import-Date: 2010-10-30 09:48:40+0000\n"
+"X-POT-Import-Date: 2010-10-30 23:42:01+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -83,15 +83,20 @@ msgstr "Configuracións de Twitter"
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
+#. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
+#. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #: actions/accessadminpanel.php:193 actions/emailsettings.php:228
-#: actions/imsettings.php:187 actions/pathsadminpanel.php:512
-#: actions/profilesettings.php:201 actions/smssettings.php:209
-#: actions/subscriptions.php:246 lib/applicationeditform.php:355
+#: actions/imsettings.php:187 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: lib/applicationeditform.php:355 lib/groupeditform.php:207
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Save"
@@ -144,7 +149,7 @@ msgstr "Non existe a etiqueta."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:495 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Ningún usuario."
@@ -211,7 +216,9 @@ msgstr ""
 
 #. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:208
+#. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -579,8 +586,11 @@ msgstr "O nome completo é demasiado longo (max 255 car)."
 #. TRANS: Group edit form validation error.
 #. TRANS: Form validation error in New application form.
 #. TRANS: %d is the maximum number of characters for the description.
+#. TRANS: Group create form validation error.
+#. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:220 actions/editapplication.php:201
 #: actions/editgroup.php:216 actions/newapplication.php:178
+#: actions/newgroup.php:152
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -746,14 +756,14 @@ msgstr "Non estás suscrito a ese perfil"
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:172 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:74
 #: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
 #: actions/groupunblock.php:65 actions/imsettings.php:230
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
-#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/othersettings.php:153 actions/passwordsettings.php:138
 #: actions/profilesettings.php:221 actions/recoverpassword.php:350
 #: actions/register.php:172 actions/remotesubscribe.php:77
 #: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
@@ -928,21 +938,22 @@ msgstr "Non deberías eliminar o estado de outro usuario"
 
 #. TRANS: Client error displayed trying to repeat a non-existing notice through the API.
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
+#. TRANS: Error message displayed trying to delete a non-existing notice.
 #: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/deletenotice.php:58 actions/shownotice.php:92
+#: actions/deletenotice.php:61 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "Ningún chío."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:535
+#: actions/apistatusesretweet.php:83 lib/command.php:537
 #, fuzzy
 msgid "Cannot repeat your own notice."
 msgstr "Non se pode activar a notificación."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:541
+#: actions/apistatusesretweet.php:92 lib/command.php:543
 msgid "Already repeated that notice."
 msgstr "Non se pode eliminar este chíos."
 
@@ -964,7 +975,8 @@ msgstr ""
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#: actions/apistatusesupdate.php:244
+#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
+#: lib/mailhandler.php:60
 #, fuzzy, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
@@ -982,7 +994,7 @@ msgstr "Método da API non atopado"
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
-#: actions/apistatusesupdate.php:308
+#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
 #, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
@@ -1196,17 +1208,18 @@ msgstr ""
 msgid "Lost our file data."
 msgstr ""
 
-#: actions/avatarsettings.php:384
+#. TRANS: Success message for having updated a user avatar.
+#: actions/avatarsettings.php:385
 msgid "Avatar updated."
 msgstr "Avatar actualizado."
 
 #. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
-#: actions/avatarsettings.php:388
+#: actions/avatarsettings.php:389
 msgid "Failed updating avatar."
 msgstr "Acounteceu un fallo ó actualizar o avatar."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:412
+#: actions/avatarsettings.php:413
 #, fuzzy
 msgid "Avatar deleted."
 msgstr "Avatar actualizado."
@@ -1239,8 +1252,8 @@ msgstr ""
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:154 actions/deleteapplication.php:154
-#: actions/deletegroup.php:220 actions/deletenotice.php:150
+#: actions/block.php:154 actions/deleteapplication.php:157
+#: actions/deletegroup.php:220 actions/deletenotice.php:155
 #: actions/deleteuser.php:152 actions/groupblock.php:178
 #, fuzzy
 msgctxt "BUTTON"
@@ -1260,8 +1273,8 @@ msgstr "Bloquear usuario"
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:161 actions/deleteapplication.php:161
-#: actions/deletegroup.php:227 actions/deletenotice.php:157
+#: actions/block.php:161 actions/deleteapplication.php:164
+#: actions/deletegroup.php:227 actions/deletenotice.php:162
 #: actions/deleteuser.php:159 actions/groupblock.php:185
 #, fuzzy
 msgctxt "BUTTON"
@@ -1383,12 +1396,13 @@ msgstr "Esa dirección xa foi confirmada."
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
 #. TRANS: Server error thrown on database error updating IM preferences.
 #. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
 #. TRANS: Server error thrown when user profile settings could not be updated.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #: actions/confirmaddress.php:118 actions/emailsettings.php:331
 #: actions/emailsettings.php:477 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:174
+#: actions/imsettings.php:442 actions/othersettings.php:184
 #: actions/profilesettings.php:326 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
@@ -1425,17 +1439,20 @@ msgstr "Código de confirmación."
 msgid "Notices"
 msgstr "Chíos"
 
-#: actions/deleteapplication.php:63
+#. TRANS: Client error displayed trying to delete an application while not logged in.
+#: actions/deleteapplication.php:62
 #, fuzzy
 msgid "You must be logged in to delete an application."
 msgstr "Debes estar logueado para invitar a outros usuarios a empregar %s"
 
+#. TRANS: Client error displayed trying to delete an application that does not exist.
 #: actions/deleteapplication.php:71
 msgid "Application not found."
 msgstr "Confirmation code not found."
 
+#. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
-#: actions/deleteapplication.php:78 actions/editapplication.php:78
+#: actions/deleteapplication.php:79 actions/editapplication.php:78
 #: actions/showapplication.php:94
 #, fuzzy
 msgid "You are not the owner of this application."
@@ -1444,17 +1461,20 @@ msgstr "Non estás suscrito a ese perfil"
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
 #: actions/newapplication.php:114 actions/showapplication.php:118
-#: lib/action.php:1354
+#: lib/action.php:1404
 #, fuzzy
 msgid "There was a problem with your session token."
 msgstr "Houbo un problema co teu token de sesión. Tentao de novo, anda..."
 
-#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+#. TRANS: Title for delete application page.
+#. TRANS: Fieldset legend on delete application page.
+#: actions/deleteapplication.php:124 actions/deleteapplication.php:149
 #, fuzzy
 msgid "Delete application"
 msgstr "Ningún chío."
 
-#: actions/deleteapplication.php:149
+#. TRANS: Confirmation text on delete application page.
+#: actions/deleteapplication.php:152
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
 "about the application from the database, including all existing user "
@@ -1462,13 +1482,13 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:158
+#: actions/deleteapplication.php:161
 #, fuzzy
 msgid "Do not delete this application"
 msgstr "Non se pode eliminar este chíos."
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:164
+#: actions/deleteapplication.php:167
 #, fuzzy
 msgid "Delete this application"
 msgstr "Eliminar chío"
@@ -1506,13 +1526,14 @@ msgstr "Non se puido actualizar o usuario."
 msgid "Deleted group %s"
 msgstr "Estado de %1$s en  %2$s"
 
-#. TRANS: Title.
+#. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
 #: actions/deletegroup.php:176 actions/deletegroup.php:202
 #, fuzzy
 msgid "Delete group"
 msgstr "Eliminar chío"
 
+#. TRANS: Warning in form for deleleting a group.
 #: actions/deletegroup.php:206
 msgid ""
 "Are you sure you want to delete this group? This will clear all data about "
@@ -1532,10 +1553,11 @@ msgstr "Non se pode eliminar este chíos."
 msgid "Delete this group"
 msgstr "Eliminar chío"
 
+#. TRANS: Error message displayed trying to delete a notice while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1545,11 +1567,13 @@ msgstr "Eliminar chío"
 msgid "Not logged in."
 msgstr "Non está logueado."
 
-#: actions/deletenotice.php:74
+#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
+#: actions/deletenotice.php:78
 msgid "Can't delete this notice."
 msgstr "Non se pode eliminar este chíos."
 
-#: actions/deletenotice.php:106
+#. TRANS: Instructions for deleting a notice.
+#: actions/deletenotice.php:110
 #, fuzzy
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
@@ -1558,22 +1582,25 @@ msgstr ""
 "Vas a eliminar permanentemente este chío. Unha vez feito, xa non hai volta "
 "atrás... Quedas avisado!"
 
-#: actions/deletenotice.php:112 actions/deletenotice.php:144
+#. TRANS: Page title when deleting a notice.
+#. TRANS: Fieldset legend for the delete notice form.
+#: actions/deletenotice.php:117 actions/deletenotice.php:148
 msgid "Delete notice"
 msgstr "Eliminar chío"
 
-#: actions/deletenotice.php:147
+#. TRANS: Message for the delete notice form.
+#: actions/deletenotice.php:152
 msgid "Are you sure you want to delete this notice?"
 msgstr "Estas seguro que queres eliminar este chío?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:154
+#: actions/deletenotice.php:159
 #, fuzzy
 msgid "Do not delete this notice"
 msgstr "Non se pode eliminar este chíos."
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:161 lib/noticelist.php:667
+#: actions/deletenotice.php:166 lib/noticelist.php:667
 #, fuzzy
 msgid "Delete this notice"
 msgstr "Eliminar chío"
@@ -1745,11 +1772,9 @@ msgstr ""
 
 #. TRANS: Submit button title.
 #: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
-#: actions/othersettings.php:126 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: actions/useradminpanel.php:295 lib/applicationeditform.php:357
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: lib/applicationeditform.php:357 lib/designsettings.php:256
 msgid "Save"
 msgstr "Gardar"
 
@@ -1803,9 +1828,9 @@ msgid "Name is required."
 msgstr "A mesma contrasinal que arriba. Requerido."
 
 #. TRANS: Validation error shown when providing too long a name in the "Edit application" form.
-#: actions/editapplication.php:188
+#: actions/editapplication.php:188 actions/newapplication.php:169
 #, fuzzy
-msgid "Name is too long (max 255 characters)."
+msgid "Name is too long (maximum 255 characters)."
 msgstr "O nome completo é demasiado longo (max 255 car)."
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
@@ -1836,7 +1861,7 @@ msgid "Organization is required."
 msgstr ""
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#: actions/editapplication.php:223
+#: actions/editapplication.php:223 actions/newapplication.php:199
 #, fuzzy
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "A localización é demasiado longa (max 255 car.)."
@@ -2647,7 +2672,7 @@ msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Publicar unha MicroID dende a miña dirección de Jabber/GTalk."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:180
+#: actions/imsettings.php:290 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "Preferencias gardadas."
 
@@ -2775,10 +2800,9 @@ msgstr[4] "Xa estas suscrito a estes usuarios:"
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#. TRANS: Whois output.
-#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:145 actions/invite.php:159 lib/command.php:426
-#, php-format
+#: actions/invite.php:145 actions/invite.php:159
+#, fuzzy, php-format
+msgctxt "INVITE"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
@@ -2974,8 +2998,9 @@ msgid ""
 msgstr ""
 
 #: actions/licenseadminpanel.php:156
-msgid "Invalid license title. Max length is 255 characters."
-msgstr ""
+#, fuzzy
+msgid "Invalid license title. Maximum length is 255 characters."
+msgstr "A localización é demasiado longa (max 255 car.)."
 
 #: actions/licenseadminpanel.php:168
 msgid "Invalid license URL."
@@ -3152,20 +3177,10 @@ msgstr "Debes estar logueado para invitar a outros usuarios a empregar %s"
 msgid "Use this form to register a new application."
 msgstr ""
 
-#: actions/newapplication.php:169
-#, fuzzy
-msgid "Name is too long (maximum 255 chars)."
-msgstr "O nome completo é demasiado longo (max 255 car)."
-
 #: actions/newapplication.php:184
 msgid "Source URL is required."
 msgstr ""
 
-#: actions/newapplication.php:199
-#, fuzzy
-msgid "Organization is too long (maximum 255 chars)."
-msgstr "A localización é demasiado longa (max 255 car.)."
-
 #: actions/newapplication.php:266 actions/newapplication.php:275
 #, fuzzy
 msgid "Could not create application."
@@ -3186,14 +3201,14 @@ msgid "New message"
 msgstr "Nova mensaxe"
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:499
+#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501
 msgid "You can't send a message to this user."
 msgstr "Non podes enviar mensaxes a este usurio."
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
 #: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
-#: lib/command.php:579
+#: lib/command.php:581
 msgid "No content!"
 msgstr "Sen contido!"
 
@@ -3202,7 +3217,7 @@ msgid "No recipient specified."
 msgstr "Non se especificou ningún destinatario"
 
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:503
+#: actions/newmessage.php:167 lib/command.php:505
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -3216,12 +3231,12 @@ msgstr "Non hai mensaxes de texto!"
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:511
+#: actions/newmessage.php:188 lib/command.php:513
 #, fuzzy, php-format
 msgid "Direct message to %s sent."
 msgstr "Mensaxe directo a %s enviado"
 
-#: actions/newmessage.php:213 actions/newnotice.php:263
+#: actions/newmessage.php:213 actions/newnotice.php:264
 msgid "Ajax Error"
 msgstr "Erro de Ajax"
 
@@ -3229,17 +3244,7 @@ msgstr "Erro de Ajax"
 msgid "New notice"
 msgstr "Novo chío"
 
-#: actions/newnotice.php:159 lib/mailhandler.php:60
-#, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr "Podes actualizar a túa información do perfil persoal aquí"
-
-#: actions/newnotice.php:183
-#, php-format
-msgid "Max notice size is %d chars, including attachment URL."
-msgstr ""
-
-#: actions/newnotice.php:229
+#: actions/newnotice.php:230
 msgid "Notice posted"
 msgstr "Chío publicado"
 
@@ -3409,37 +3414,47 @@ msgstr "Procurar xente"
 msgid "Notice Search"
 msgstr "Procura de Chíos"
 
-#: actions/othersettings.php:60
+#: actions/othersettings.php:59
 msgid "Other settings"
 msgstr "Outras opcions"
 
+#. TRANS: Instructions for tab "Other" in user profile settings.
 #: actions/othersettings.php:71
 msgid "Manage various other options."
 msgstr "Xestionár axustes varios."
 
-#: actions/othersettings.php:108
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/othersettings.php:111
 msgid " (free service)"
 msgstr ""
 
-#: actions/othersettings.php:116
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/othersettings.php:120
 msgid "Shorten URLs with"
 msgstr ""
 
-#: actions/othersettings.php:117
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/othersettings.php:122
 msgid "Automatic shortening service to use."
 msgstr "Servizo de acortado automático a usar."
 
-#: actions/othersettings.php:122
+#. TRANS: Label for checkbox.
+#: actions/othersettings.php:128
 #, fuzzy
 msgid "View profile designs"
 msgstr "Configuración de perfil"
 
-#: actions/othersettings.php:123
+#. TRANS: Tooltip for checkbox.
+#: actions/othersettings.php:130
 msgid "Show or hide profile designs."
 msgstr ""
 
-#: actions/othersettings.php:153
-msgid "URL shortening service is too long (max 50 chars)."
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/othersettings.php:162
+#, fuzzy
+msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "Sistema de acortamento de URLs demasiado longo (max 50 car.)."
 
 #: actions/otp.php:69
@@ -3937,7 +3952,7 @@ msgstr "Bio"
 #. TRANS: Label for group location (dt). Text hidden by default.
 #: actions/profilesettings.php:149 actions/register.php:485
 #: actions/showgroup.php:267 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:177
+#: actions/userauthorization.php:166 lib/groupeditform.php:180
 #: lib/userprofile.php:165
 msgid "Location"
 msgstr "Localización"
@@ -4284,7 +4299,8 @@ msgid "Unexpected password reset."
 msgstr "Restauración de contrasinal non esperada."
 
 #: actions/recoverpassword.php:365
-msgid "Password must be 6 chars or more."
+#, fuzzy
+msgid "Password must be 6 characters or more."
 msgstr "A contrasinal debe ter 6 caracteres ou máis."
 
 #: actions/recoverpassword.php:369
@@ -4670,7 +4686,7 @@ msgstr "Invitación(s) enviada(s)."
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:172
+#: lib/applicationeditform.php:208 lib/groupeditform.php:175
 #, fuzzy
 msgid "Description"
 msgstr "Subscricións"
@@ -4815,7 +4831,7 @@ msgid "Note"
 msgstr "Chíos"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:298 lib/groupeditform.php:184
+#: actions/showgroup.php:298 lib/groupeditform.php:187
 msgid "Aliases"
 msgstr ""
 
@@ -4950,60 +4966,84 @@ msgstr "Mensaxe dende %1$s en %2$s"
 msgid "Notice deleted."
 msgstr "Chío publicado"
 
-#: actions/showstream.php:72
+#. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
+#: actions/showstream.php:70
+#, fuzzy, php-format
+msgid "%1$s tagged %2$s"
+msgstr "%1$s (%2$s)"
+
+#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#: actions/showstream.php:74
 #, fuzzy, php-format
-msgid " tagged %s"
+msgid "%1$s tagged %2$s, page %3$d"
 msgstr "Chíos tagueados con %s"
 
-#: actions/showstream.php:78
+#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$d is the page number.
+#: actions/showstream.php:82
 #, php-format
 msgid "%1$s, page %2$d"
 msgstr "%1$s (%2$s)"
 
-#: actions/showstream.php:120
+#. TRANS: Title for link to notice feed.
+#. TRANS: %1$s is a user nickname, %2$s is a hashtag.
+#: actions/showstream.php:127
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Fonte para os amigos de %s"
 
-#: actions/showstream.php:127
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:136
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "Fonte para os amigos de %s"
 
-#: actions/showstream.php:134
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:145
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "Fonte para os amigos de %s"
 
-#: actions/showstream.php:141
+#: actions/showstream.php:152
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "Fonte para os amigos de %s"
 
-#: actions/showstream.php:146
+#. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
+#. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
+#: actions/showstream.php:159
 #, fuzzy, php-format
 msgid "FOAF for %s"
 msgstr "Band. Saída para %s"
 
-#: actions/showstream.php:197
+#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
+#: actions/showstream.php:211
 #, php-format
-msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
+msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr ""
 
-#: actions/showstream.php:202
+#. TRANS: Second sentence of empty list message for a stream for the user themselves.
+#: actions/showstream.php:217
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
 msgstr ""
 
-#: actions/showstream.php:204
+#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:221
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
 "%?status_textarea=%2$s)."
 msgstr ""
 
-#: actions/showstream.php:243
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:264
 #, fuzzy, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5016,7 +5056,9 @@ msgstr ""
 "(http://status.net/). [Únete agora](%%action.register%%) para compartir "
 "chíos cos teus amigos, colegas e familia! ([Ler mais](%%doc.help%%))"
 
-#: actions/showstream.php:248
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:271
 #, fuzzy, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5028,7 +5070,8 @@ msgstr ""
 "(http://status.net/). [Únete agora](%%action.register%%) para compartir "
 "chíos cos teus amigos, colegas e familia! ([Ler mais](%%doc.help%%))"
 
-#: actions/showstream.php:305
+#. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
+#: actions/showstream.php:328
 #, fuzzy, php-format
 msgid "Repeat of %s"
 msgstr "Replies to %s"
@@ -5144,33 +5187,40 @@ msgstr ""
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:56
+#. TRANS: Page title for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:55
 msgid "Site Notice"
 msgstr "Chíos"
 
-#: actions/sitenoticeadminpanel.php:67
+#. TRANS: Instructions for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:66
 #, fuzzy
 msgid "Edit site-wide message"
 msgstr "Nova mensaxe"
 
-#: actions/sitenoticeadminpanel.php:103
+#. TRANS: Server error displayed when saving a site-wide notice was impossible.
+#: actions/sitenoticeadminpanel.php:101
 #, fuzzy
 msgid "Unable to save site notice."
 msgstr "Non se puideron gardar os teus axustes de Twitter!"
 
-#: actions/sitenoticeadminpanel.php:113
-msgid "Max length for the site-wide notice is 255 chars."
+#. TRANS: Client error displayed when a site-wide notice was longer than allowed.
+#: actions/sitenoticeadminpanel.php:112
+msgid "Maximum length for the site-wide notice is 255 characters."
 msgstr ""
 
+#. TRANS: Label for site-wide notice text field in admin panel.
 #: actions/sitenoticeadminpanel.php:176
 msgid "Site notice text"
 msgstr "Eliminar chío"
 
-#: actions/sitenoticeadminpanel.php:178
-msgid "Site-wide notice text (255 chars max; HTML okay)"
+#. TRANS: Tooltip for site-wide notice text field in admin panel.
+#: actions/sitenoticeadminpanel.php:179
+msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:198
+#. TRANS: Title for button to save site notice in admin panel.
+#: actions/sitenoticeadminpanel.php:201
 msgid "Save site notice"
 msgstr "Eliminar chío"
 
@@ -5635,83 +5685,100 @@ msgid ""
 msgstr ""
 
 #. TRANS: User admin panel title
-#: actions/useradminpanel.php:60
+#: actions/useradminpanel.php:58
 #, fuzzy
 msgctxt "TITLE"
 msgid "User"
 msgstr "Usuario"
 
-#: actions/useradminpanel.php:71
+#. TRANS: Instruction for user admin panel.
+#: actions/useradminpanel.php:69
 msgid "User settings for this StatusNet site"
 msgstr ""
 
-#: actions/useradminpanel.php:150
+#. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
+#: actions/useradminpanel.php:147
 msgid "Invalid bio limit. Must be numeric."
 msgstr ""
 
-#: actions/useradminpanel.php:156
-msgid "Invalid welcome text. Max length is 255 characters."
+#. TRANS: Form validation error in user admin panel when welcome text is too long.
+#: actions/useradminpanel.php:154
+msgid "Invalid welcome text. Maximum length is 255 characters."
 msgstr ""
 
+#. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
+#. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
 #, php-format
-msgid "Invalid default subscripton: '%1$s' is not user."
+msgid "Invalid default subscripton: '%1$s' is not a user."
 msgstr ""
 
 #. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:106
+#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
 #: lib/personalgroupnav.php:109
 msgid "Profile"
 msgstr "Perfil"
 
-#: actions/useradminpanel.php:223
+#. TRANS: Field label in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:220
 msgid "Bio Limit"
 msgstr ""
 
-#: actions/useradminpanel.php:224
+#. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:222
 msgid "Maximum length of a profile bio in characters."
 msgstr ""
 
-#: actions/useradminpanel.php:232
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:231
 #, fuzzy
 msgid "New users"
 msgstr "Invitar a novos usuarios"
 
+#. TRANS: Field label in user admin panel for setting new user welcome text.
 #: actions/useradminpanel.php:236
 msgid "New user welcome"
 msgstr ""
 
-#: actions/useradminpanel.php:237
-msgid "Welcome text for new users (Max 255 chars)."
-msgstr ""
+#. TRANS: Tooltip in user admin panel for setting new user welcome text.
+#: actions/useradminpanel.php:238
+#, fuzzy
+msgid "Welcome text for new users (maximum 255 characters)."
+msgstr "O nome completo é demasiado longo (max 255 car)."
 
-#: actions/useradminpanel.php:242
+#. TRANS: Field label in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:244
 #, fuzzy
 msgid "Default subscription"
 msgstr "Tódalas subscricións"
 
-#: actions/useradminpanel.php:243
+#. TRANS: Tooltip in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:246
 #, fuzzy
 msgid "Automatically subscribe new users to this user."
 msgstr ""
 "Suscribirse automáticamente a calquera que se suscriba a min (o mellor para "
 "non humáns)"
 
-#: actions/useradminpanel.php:252
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:256
 #, fuzzy
 msgid "Invitations"
 msgstr "Invitación(s) enviada(s)."
 
-#: actions/useradminpanel.php:257
+#. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:262
 #, fuzzy
 msgid "Invitations enabled"
 msgstr "Invitación(s) enviada(s)."
 
-#: actions/useradminpanel.php:259
+#. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:265
 msgid "Whether to allow users to invite new users."
 msgstr ""
 
-#: actions/useradminpanel.php:295
+#. TRANS: Title for button to save user settings in user admin panel.
+#: actions/useradminpanel.php:302
 msgid "Save user settings"
 msgstr ""
 
@@ -5914,7 +5981,7 @@ msgid "Plugins"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:831
+#: actions/version.php:198 lib/action.php:880
 #, fuzzy
 msgid "Version"
 msgstr "Persoal"
@@ -6132,16 +6199,23 @@ msgstr "Non se pode gardar a subscrición."
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
+#. TRANS: Full name of a profile or group followed by nickname in parens
+#: classes/Profile.php:164
+#, fuzzy, php-format
+msgctxt "FANCYNAME"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:791
+#: classes/Profile.php:812
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:800
+#: classes/Profile.php:821
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6295,51 +6369,57 @@ msgstr "%1$s (%2$s)"
 msgid "Untitled page"
 msgstr ""
 
+#. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
+#: lib/action.php:310
+msgctxt "TOOLTIP"
+msgid "Show more"
+msgstr ""
+
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:477
+#: lib/action.php:526
 msgid "Primary site navigation"
 msgstr ""
 
 #. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:483
+#: lib/action.php:532
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr ""
 
 #. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:486
+#: lib/action.php:535
 #, fuzzy
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Persoal"
 
 #. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:488
+#: lib/action.php:537
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
 msgstr "Cambiar contrasinal"
 
 #. TRANS: Main menu option when logged in for access to user settings
-#: lib/action.php:491
+#: lib/action.php:540
 #, fuzzy
 msgid "Account"
 msgstr "Sobre"
 
 #. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:493
+#: lib/action.php:542
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "Non se pode redireccionar ao servidor: %s"
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:496
+#: lib/action.php:545
 msgid "Connect"
 msgstr "Conectar"
 
 #. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:499
+#: lib/action.php:548
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
@@ -6347,13 +6427,13 @@ msgstr "Navegación de subscricións"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:502 lib/groupnav.php:117
+#: lib/action.php:551 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr ""
 
 #. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:506
+#: lib/action.php:555
 #, fuzzy, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
@@ -6362,74 +6442,74 @@ msgstr ""
 "este servizo."
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:509
+#: lib/action.php:558
 #, fuzzy
 msgctxt "MENU"
 msgid "Invite"
 msgstr "Invitar"
 
 #. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:515
+#: lib/action.php:564
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr ""
 
 #. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:518
+#: lib/action.php:567
 #, fuzzy
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Sair"
 
 #. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:523
+#: lib/action.php:572
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "Crear nova conta"
 
 #. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:526
+#: lib/action.php:575
 #, fuzzy
 msgctxt "MENU"
 msgid "Register"
 msgstr "Rexistrar"
 
 #. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:529
+#: lib/action.php:578
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr ""
 
 #. TRANS: Main menu option when not logged in to log in
-#: lib/action.php:532
+#: lib/action.php:581
 #, fuzzy
 msgctxt "MENU"
 msgid "Login"
 msgstr "Inicio de sesión"
 
 #. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:535
+#: lib/action.php:584
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Axuda"
 
 #. TRANS: Main menu option for help on the StatusNet site
-#: lib/action.php:538
+#: lib/action.php:587
 #, fuzzy
 msgctxt "MENU"
 msgid "Help"
 msgstr "Axuda"
 
 #. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:541
+#: lib/action.php:590
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr ""
 
 #. TRANS: Main menu option when logged in or when the StatusNet instance is not private
-#: lib/action.php:544
+#: lib/action.php:593
 #, fuzzy
 msgctxt "MENU"
 msgid "Search"
@@ -6437,70 +6517,71 @@ msgstr "Buscar"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:566 lib/adminpanelaction.php:387
+#: lib/action.php:615 lib/adminpanelaction.php:387
 #, fuzzy
 msgid "Site notice"
 msgstr "Novo chío"
 
 #. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:633
+#: lib/action.php:682
 msgid "Local views"
 msgstr ""
 
 #. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:703
+#: lib/action.php:752
 #, fuzzy
 msgid "Page notice"
 msgstr "Novo chío"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:804
+#: lib/action.php:853
 #, fuzzy
 msgid "Secondary site navigation"
 msgstr "Navegación de subscricións"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:810
+#: lib/action.php:859
 msgid "Help"
 msgstr "Axuda"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:813
+#: lib/action.php:862
 msgid "About"
 msgstr "Sobre"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:816
+#: lib/action.php:865
 msgid "FAQ"
 msgstr "Preguntas frecuentes"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:821
+#: lib/action.php:870
 msgid "TOS"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:825
+#: lib/action.php:874
 msgid "Privacy"
 msgstr "Privacidade"
 
-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:828
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+#: lib/action.php:877
 msgid "Source"
 msgstr "Fonte"
 
-#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:834
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+#: lib/action.php:884
 msgid "Contact"
 msgstr "Contacto"
 
-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:837
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+#: lib/action.php:887
 msgid "Badge"
 msgstr ""
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:866
+#: lib/action.php:916
 msgid "StatusNet software license"
 msgstr ""
 
@@ -6508,7 +6589,7 @@ msgstr ""
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:873
+#: lib/action.php:923
 #, fuzzy, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -6518,7 +6599,7 @@ msgstr ""
 "broughtby%%](%%site.broughtbyurl%%). "
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:876
+#: lib/action.php:926
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** é un servizo de microbloguexo."
@@ -6527,7 +6608,7 @@ msgstr "**%%site.name%%** é un servizo de microbloguexo."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:883
+#: lib/action.php:933
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -6539,51 +6620,51 @@ msgstr ""
 "fsf.org/licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:899
+#: lib/action.php:949
 #, fuzzy
 msgid "Site content license"
 msgstr "Atopar no contido dos chíos"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:906
+#: lib/action.php:956
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:913
+#: lib/action.php:963
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:917
+#: lib/action.php:967
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:949
+#: lib/action.php:999
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1285
+#: lib/action.php:1335
 msgid "Pagination"
 msgstr ""
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1296
+#: lib/action.php:1346
 msgid "After"
 msgstr "Outros"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1306
+#: lib/action.php:1356
 #, fuzzy
 msgid "Before"
 msgstr "Antes »"
@@ -6950,7 +7031,7 @@ msgid "AJAX error"
 msgstr "Erro de Ajax"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:233 lib/mailhandler.php:142
+#: lib/channel.php:233 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "Comando completo"
 
@@ -6967,7 +7048,7 @@ msgstr "Non se atopou un perfil con ese ID."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:626
+#: lib/command.php:99 lib/command.php:630
 #, fuzzy
 msgid "User has no last notice."
 msgstr "O usuario non ten último chio."
@@ -7037,6 +7118,14 @@ msgstr ""
 msgid "%1$s left group %2$s."
 msgstr ""
 
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: lib/command.php:426
+#, fuzzy, php-format
+msgctxt "WHOIS"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
 #. TRANS: Whois output. %s is the full name of the queried user.
 #: lib/command.php:430
 #, php-format
@@ -7074,130 +7163,150 @@ msgid ""
 "same server."
 msgstr ""
 
-#. TRANS: Message given if content is too long.
+#. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
 #: lib/command.php:488
 #, fuzzy, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr "Mensaxe demasiado longa - o máximo é 140 caracteres, ti enviaches %d "
+msgid "Message too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] ""
+"Mensaxe demasiado longa - o máximo é 140 caracteres, ti enviaches %d "
+msgstr[1] ""
+"Mensaxe demasiado longa - o máximo é 140 caracteres, ti enviaches %d "
+msgstr[2] ""
+"Mensaxe demasiado longa - o máximo é 140 caracteres, ti enviaches %d "
+msgstr[3] ""
+"Mensaxe demasiado longa - o máximo é 140 caracteres, ti enviaches %d "
+msgstr[4] ""
+"Mensaxe demasiado longa - o máximo é 140 caracteres, ti enviaches %d "
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:514
+#: lib/command.php:516
 msgid "Error sending direct message."
 msgstr "Erro ó enviar a mensaxe directa."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:551
+#: lib/command.php:553
 #, fuzzy, php-format
 msgid "Notice from %s repeated."
 msgstr "Chío publicado"
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:554
+#: lib/command.php:556
 msgid "Error repeating notice."
 msgstr "Acounteceu un erro configurando o usuario."
 
-#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:589
+#: lib/command.php:591
 #, fuzzy, php-format
-msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
-msgstr "Mensaxe demasiado longa - o máximo é 140 caracteres, ti enviaches %d "
+msgid "Notice too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] ""
+"Mensaxe demasiado longa - o máximo é 140 caracteres, ti enviaches %d "
+msgstr[1] ""
+"Mensaxe demasiado longa - o máximo é 140 caracteres, ti enviaches %d "
+msgstr[2] ""
+"Mensaxe demasiado longa - o máximo é 140 caracteres, ti enviaches %d "
+msgstr[3] ""
+"Mensaxe demasiado longa - o máximo é 140 caracteres, ti enviaches %d "
+msgstr[4] ""
+"Mensaxe demasiado longa - o máximo é 140 caracteres, ti enviaches %d "
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:600
+#: lib/command.php:604
 #, fuzzy, php-format
 msgid "Reply to %s sent."
 msgstr "Non se pode eliminar este chíos."
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:603
+#: lib/command.php:607
 #, fuzzy
 msgid "Error saving notice."
 msgstr "Aconteceu un erro ó gardar o chío."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:650
+#: lib/command.php:654
 #, fuzzy
 msgid "Specify the name of the user to subscribe to."
 msgstr "Especifica o nome do usuario ó que queres suscribirte"
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:659
+#: lib/command.php:663
 #, fuzzy
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Non estás suscrito a ese perfil"
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:667
+#: lib/command.php:671
 #, php-format
 msgid "Subscribed to %s."
 msgstr ""
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:688 lib/command.php:799
+#: lib/command.php:692 lib/command.php:803
 #, fuzzy
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "Especifica o nome de usuario ó que queres deixar de seguir"
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:699
+#: lib/command.php:703
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:719 lib/command.php:745
+#: lib/command.php:723 lib/command.php:749
 msgid "Command not yet implemented."
 msgstr "Comando non implementado."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:723
+#: lib/command.php:727
 msgid "Notification off."
 msgstr "Notificación desactivada."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:726
+#: lib/command.php:730
 msgid "Can't turn off notification."
 msgstr "No se pode desactivar a notificación."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:749
+#: lib/command.php:753
 msgid "Notification on."
 msgstr "Notificación habilitada."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:752
+#: lib/command.php:756
 msgid "Can't turn on notification."
 msgstr "Non se pode activar a notificación."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:766
+#: lib/command.php:770
 msgid "Login command is disabled."
 msgstr ""
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:779
+#: lib/command.php:783
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:808
+#: lib/command.php:812
 #, php-format
 msgid "Unsubscribed %s."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:826
+#: lib/command.php:830
 #, fuzzy
 msgid "You are not subscribed to anyone."
 msgstr "Non estás suscrito a ese perfil"
@@ -7205,7 +7314,7 @@ msgstr "Non estás suscrito a ese perfil"
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:831
+#: lib/command.php:835
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Xa estas suscrito a estes usuarios:"
@@ -7216,7 +7325,7 @@ msgstr[4] ""
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:853
+#: lib/command.php:857
 #, fuzzy
 msgid "No one is subscribed to you."
 msgstr "Outro usuario non se puido suscribir a ti."
@@ -7224,7 +7333,7 @@ msgstr "Outro usuario non se puido suscribir a ti."
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:858
+#: lib/command.php:862
 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."
@@ -7235,7 +7344,7 @@ msgstr[4] ""
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:880
+#: lib/command.php:884
 #, fuzzy
 msgid "You are not a member of any groups."
 msgstr "Non estás suscrito a ese perfil"
@@ -7243,7 +7352,7 @@ msgstr "Non estás suscrito a ese perfil"
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:885
+#: lib/command.php:889
 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"
@@ -7253,7 +7362,7 @@ msgstr[3] ""
 msgstr[4] ""
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:900
+#: lib/command.php:904
 #, fuzzy
 msgid ""
 "Commands:\n"
@@ -7474,7 +7583,7 @@ msgstr ""
 
 #: lib/groupeditform.php:163
 #, fuzzy
-msgid "URL of the homepage or blog of the group or topic"
+msgid "URL of the homepage or blog of the group or topic."
 msgstr "Enderezo da túa páxina persoal, blogue, ou perfil noutro sitio"
 
 #: lib/groupeditform.php:168
@@ -7484,19 +7593,33 @@ msgstr "Contanos un pouco de ti e dos teus intereses en 140 caractéres."
 
 #: lib/groupeditform.php:170
 #, fuzzy, php-format
-msgid "Describe the group or topic in %d characters"
-msgstr "Contanos un pouco de ti e dos teus intereses en 140 caractéres."
+msgid "Describe the group or topic in %d character or less"
+msgid_plural "Describe the group or topic in %d characters or less"
+msgstr[0] "Contanos un pouco de ti e dos teus intereses en 140 caractéres."
+msgstr[1] "Contanos un pouco de ti e dos teus intereses en 140 caractéres."
+msgstr[2] "Contanos un pouco de ti e dos teus intereses en 140 caractéres."
+msgstr[3] "Contanos un pouco de ti e dos teus intereses en 140 caractéres."
+msgstr[4] "Contanos un pouco de ti e dos teus intereses en 140 caractéres."
 
-#: lib/groupeditform.php:179
+#: lib/groupeditform.php:182
 #, fuzzy
 msgid ""
-"Location for the group, if any, like \"City, State (or Region), Country\""
+"Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr "¿Onde estas, coma \"Cidade, Provincia, País\""
 
-#: lib/groupeditform.php:187
+#: lib/groupeditform.php:190
 #, php-format
-msgid "Extra nicknames for the group, comma- or space- separated, max %d"
-msgstr ""
+msgid ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"alias allowed."
+msgid_plural ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"aliases allowed."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
 
 #. TRANS: Menu item in the group navigation page.
 #: lib/groupnav.php:86
@@ -8023,7 +8146,7 @@ msgstr "Ise é un enderezo IM incorrecto."
 msgid "Sorry, no incoming email allowed."
 msgstr "Aivá, non se permiten correos entrantes."
 
-#: lib/mailhandler.php:228
+#: lib/mailhandler.php:229
 #, fuzzy, php-format
 msgid "Unsupported message type: %s"
 msgstr "Formato de ficheiro de imaxe non soportado."
@@ -8387,17 +8510,18 @@ msgid "Sandbox this user"
 msgstr "Bloquear usuario"
 
 #. TRANS: Fieldset legend for the search form.
-#: lib/searchaction.php:121
+#: lib/searchaction.php:120
 #, fuzzy
 msgid "Search site"
 msgstr "Buscar"
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
-#: lib/searchaction.php:129
+#: lib/searchaction.php:128
 msgid "Keyword(s)"
 msgstr ""
 
+#. TRANS: Button text for searching site.
 #: lib/searchaction.php:130
 msgctxt "BUTTON"
 msgid "Search"
@@ -8494,8 +8618,8 @@ msgid "The theme file is missing or the upload failed."
 msgstr ""
 
 #: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:278 lib/themeuploader.php:282
-#: lib/themeuploader.php:290 lib/themeuploader.php:297
+#: lib/themeuploader.php:279 lib/themeuploader.php:283
+#: lib/themeuploader.php:291 lib/themeuploader.php:298
 #, fuzzy
 msgid "Failed saving theme."
 msgstr "Acounteceu un fallo ó actualizar o avatar."
@@ -8506,29 +8630,35 @@ msgstr ""
 
 #: lib/themeuploader.php:166
 #, php-format
-msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
-msgstr ""
+msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
+msgid_plural ""
+"Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
 
-#: lib/themeuploader.php:178
+#: lib/themeuploader.php:179
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr ""
 
-#: lib/themeuploader.php:218
+#: lib/themeuploader.php:219
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
 msgstr ""
 
-#: lib/themeuploader.php:224
+#: lib/themeuploader.php:225
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr ""
 
-#: lib/themeuploader.php:241
+#: lib/themeuploader.php:242
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr ""
 
-#: lib/themeuploader.php:259
+#: lib/themeuploader.php:260
 msgid "Error opening theme archive."
 msgstr "Acounteceu un erro borrando o bloqueo."
 
@@ -8738,20 +8868,40 @@ msgstr[3] ""
 msgstr[4] ""
 "Mensaxe demasiado longa - o máximo é 140 caracteres, ti enviaches %d "
 
-#: scripts/restoreuser.php:82
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: scripts/restoreuser.php:61
 #, php-format
-msgid "Backup file for user %s (%s)"
+msgid "Getting backup from file '%s'."
 msgstr ""
 
-#: scripts/restoreuser.php:88
+#. TRANS: Commandline script output.
+#: scripts/restoreuser.php:91
 #, fuzzy
 msgid "No user specified; using backup user."
 msgstr "Non se especificou ningún perfil."
 
-#: scripts/restoreuser.php:94
+#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
+#: scripts/restoreuser.php:98
 #, php-format
-msgid "%d entries in backup."
-msgstr ""
+msgid "%d entry in backup."
+msgid_plural "%d entries in backup."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
 
-#~ msgid "Description is too long (max %d chars)."
-#~ msgstr "O teu Bio é demasiado longo (max %d car.)."
+#, fuzzy
+#~ msgid "Name is too long (maximum 255 chars)."
+#~ msgstr "O nome completo é demasiado longo (max 255 car)."
+
+#, fuzzy
+#~ msgid "Organization is too long (maximum 255 chars)."
+#~ msgstr "A localización é demasiado longa (max 255 car.)."
+
+#~ msgid "That's too long. Max notice size is %d chars."
+#~ msgstr "Podes actualizar a túa información do perfil persoal aquí"
+
+#, fuzzy
+#~ msgid " tagged %s"
+#~ msgstr "Chíos tagueados con %s"
diff --git a/locale/gl/LC_MESSAGES/statusnet.po b/locale/gl/LC_MESSAGES/statusnet.po
index ab9374d1f..a5e70638f 100644
--- a/locale/gl/LC_MESSAGES/statusnet.po
+++ b/locale/gl/LC_MESSAGES/statusnet.po
@@ -11,17 +11,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-30 23:18+0000\n"
-"PO-Revision-Date: 2010-10-30 23:20:19+0000\n"
+"POT-Creation-Date: 2010-11-02 22:51+0000\n"
+"PO-Revision-Date: 2010-11-02 22:53:20+0000\n"
 "Language-Team: Galician <http://translatewiki.net/wiki/Portal:gl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r75708); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r75875); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2010-10-30 09:48:40+0000\n"
+"X-POT-Import-Date: 2010-10-30 23:42:01+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -78,15 +78,20 @@ msgstr "Gardar a configuración de acceso"
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
+#. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
+#. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #: actions/accessadminpanel.php:193 actions/emailsettings.php:228
-#: actions/imsettings.php:187 actions/pathsadminpanel.php:512
-#: actions/profilesettings.php:201 actions/smssettings.php:209
-#: actions/subscriptions.php:246 lib/applicationeditform.php:355
+#: actions/imsettings.php:187 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: lib/applicationeditform.php:355 lib/groupeditform.php:207
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Gardar"
@@ -137,7 +142,7 @@ msgstr "Esa páxina non existe."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:495 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Non existe tal usuario."
@@ -210,7 +215,9 @@ msgstr ""
 
 #. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:208
+#. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -569,8 +576,11 @@ msgstr "O nome completo é longo de máis (o máximo son 255 caracteres)."
 #. TRANS: Group edit form validation error.
 #. TRANS: Form validation error in New application form.
 #. TRANS: %d is the maximum number of characters for the description.
+#. TRANS: Group create form validation error.
+#. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:220 actions/editapplication.php:201
 #: actions/editgroup.php:216 actions/newapplication.php:178
+#: actions/newgroup.php:152
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -730,14 +740,14 @@ msgstr "Non está autorizado."
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:172 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:74
 #: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
 #: actions/groupunblock.php:65 actions/imsettings.php:230
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
-#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/othersettings.php:153 actions/passwordsettings.php:138
 #: actions/profilesettings.php:221 actions/recoverpassword.php:350
 #: actions/register.php:172 actions/remotesubscribe.php:77
 #: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
@@ -919,20 +929,21 @@ msgstr "Non pode borrar o estado doutro usuario."
 
 #. TRANS: Client error displayed trying to repeat a non-existing notice through the API.
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
+#. TRANS: Error message displayed trying to delete a non-existing notice.
 #: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/deletenotice.php:58 actions/shownotice.php:92
+#: actions/deletenotice.php:61 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "Non existe tal nota."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:535
+#: actions/apistatusesretweet.php:83 lib/command.php:537
 msgid "Cannot repeat your own notice."
 msgstr "Non pode repetir a súa propia nota."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:541
+#: actions/apistatusesretweet.php:92 lib/command.php:543
 msgid "Already repeated that notice."
 msgstr "Xa repetiu esa nota."
 
@@ -953,7 +964,8 @@ msgstr "O cliente debe proporcionar un parámetro de \"estado\" cun valor."
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#: actions/apistatusesupdate.php:244
+#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
+#: lib/mailhandler.php:60
 #, fuzzy, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
@@ -968,7 +980,7 @@ msgstr "Non se atopou o método da API."
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
-#: actions/apistatusesupdate.php:308
+#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
 #, fuzzy, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
@@ -1185,17 +1197,18 @@ msgstr "Escolla unha zona cadrada da imaxe para usala como avatar"
 msgid "Lost our file data."
 msgstr "Perdéronse os datos do ficheiro."
 
-#: actions/avatarsettings.php:384
+#. TRANS: Success message for having updated a user avatar.
+#: actions/avatarsettings.php:385
 msgid "Avatar updated."
 msgstr "Actualizouse o avatar."
 
 #. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
-#: actions/avatarsettings.php:388
+#: actions/avatarsettings.php:389
 msgid "Failed updating avatar."
 msgstr "Non se puido actualizar o avatar."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:412
+#: actions/avatarsettings.php:413
 msgid "Avatar deleted."
 msgstr "Borrouse o avatar."
 
@@ -1227,8 +1240,8 @@ msgstr ""
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:154 actions/deleteapplication.php:154
-#: actions/deletegroup.php:220 actions/deletenotice.php:150
+#: actions/block.php:154 actions/deleteapplication.php:157
+#: actions/deletegroup.php:220 actions/deletenotice.php:155
 #: actions/deleteuser.php:152 actions/groupblock.php:178
 msgctxt "BUTTON"
 msgid "No"
@@ -1246,8 +1259,8 @@ msgstr "Non bloquear este usuario"
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:161 actions/deleteapplication.php:161
-#: actions/deletegroup.php:227 actions/deletenotice.php:157
+#: actions/block.php:161 actions/deleteapplication.php:164
+#: actions/deletegroup.php:227 actions/deletenotice.php:162
 #: actions/deleteuser.php:159 actions/groupblock.php:185
 msgctxt "BUTTON"
 msgid "Yes"
@@ -1364,12 +1377,13 @@ msgstr "Ese enderezo xa se confirmou."
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
 #. TRANS: Server error thrown on database error updating IM preferences.
 #. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
 #. TRANS: Server error thrown when user profile settings could not be updated.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #: actions/confirmaddress.php:118 actions/emailsettings.php:331
 #: actions/emailsettings.php:477 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:174
+#: actions/imsettings.php:442 actions/othersettings.php:184
 #: actions/profilesettings.php:326 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
@@ -1405,16 +1419,19 @@ msgstr "Conversa"
 msgid "Notices"
 msgstr "Notas"
 
-#: actions/deleteapplication.php:63
+#. TRANS: Client error displayed trying to delete an application while not logged in.
+#: actions/deleteapplication.php:62
 msgid "You must be logged in to delete an application."
 msgstr "Ten que iniciar sesión para borrar unha aplicación."
 
+#. TRANS: Client error displayed trying to delete an application that does not exist.
 #: actions/deleteapplication.php:71
 msgid "Application not found."
 msgstr "Non se atopou a aplicación."
 
+#. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
-#: actions/deleteapplication.php:78 actions/editapplication.php:78
+#: actions/deleteapplication.php:79 actions/editapplication.php:78
 #: actions/showapplication.php:94
 msgid "You are not the owner of this application."
 msgstr "Non é o dono desa aplicación."
@@ -1422,15 +1439,18 @@ msgstr "Non é o dono desa aplicación."
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
 #: actions/newapplication.php:114 actions/showapplication.php:118
-#: lib/action.php:1354
+#: lib/action.php:1404
 msgid "There was a problem with your session token."
 msgstr "Houbo un problema co seu pase."
 
-#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+#. TRANS: Title for delete application page.
+#. TRANS: Fieldset legend on delete application page.
+#: actions/deleteapplication.php:124 actions/deleteapplication.php:149
 msgid "Delete application"
 msgstr "Borrar a aplicación"
 
-#: actions/deleteapplication.php:149
+#. TRANS: Confirmation text on delete application page.
+#: actions/deleteapplication.php:152
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
 "about the application from the database, including all existing user "
@@ -1441,12 +1461,12 @@ msgstr ""
 "usuario existentes."
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:158
+#: actions/deleteapplication.php:161
 msgid "Do not delete this application"
 msgstr "Non borrar a aplicación"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:164
+#: actions/deleteapplication.php:167
 msgid "Delete this application"
 msgstr "Borrar a aplicación"
 
@@ -1482,13 +1502,14 @@ msgstr "Non se puido actualizar o grupo."
 msgid "Deleted group %s"
 msgstr "%1$s deixou o grupo %2$s"
 
-#. TRANS: Title.
+#. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
 #: actions/deletegroup.php:176 actions/deletegroup.php:202
 #, fuzzy
 msgid "Delete group"
 msgstr "Borrar o usuario"
 
+#. TRANS: Warning in form for deleleting a group.
 #: actions/deletegroup.php:206
 #, fuzzy
 msgid ""
@@ -1511,10 +1532,11 @@ msgstr "Non borrar esta nota"
 msgid "Delete this group"
 msgstr "Borrar o usuario"
 
+#. TRANS: Error message displayed trying to delete a notice while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1524,11 +1546,13 @@ msgstr "Borrar o usuario"
 msgid "Not logged in."
 msgstr "Non iniciou sesión."
 
-#: actions/deletenotice.php:74
+#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
+#: actions/deletenotice.php:78
 msgid "Can't delete this notice."
 msgstr "Non se pode borrar esta nota."
 
-#: actions/deletenotice.php:106
+#. TRANS: Instructions for deleting a notice.
+#: actions/deletenotice.php:110
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
@@ -1536,21 +1560,24 @@ msgstr ""
 "Está a piques de borrar unha nota definitivamente. Unha vez feito, non se "
 "poderá recuperar."
 
-#: actions/deletenotice.php:112 actions/deletenotice.php:144
+#. TRANS: Page title when deleting a notice.
+#. TRANS: Fieldset legend for the delete notice form.
+#: actions/deletenotice.php:117 actions/deletenotice.php:148
 msgid "Delete notice"
 msgstr "Borrar a nota"
 
-#: actions/deletenotice.php:147
+#. TRANS: Message for the delete notice form.
+#: actions/deletenotice.php:152
 msgid "Are you sure you want to delete this notice?"
 msgstr "Está seguro de querer borrar esta nota?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:154
+#: actions/deletenotice.php:159
 msgid "Do not delete this notice"
 msgstr "Non borrar esta nota"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:161 lib/noticelist.php:667
+#: actions/deletenotice.php:166 lib/noticelist.php:667
 msgid "Delete this notice"
 msgstr "Borrar esta nota"
 
@@ -1715,11 +1742,9 @@ msgstr "Volver ao deseño por defecto"
 
 #. TRANS: Submit button title.
 #: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
-#: actions/othersettings.php:126 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: actions/useradminpanel.php:295 lib/applicationeditform.php:357
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: lib/applicationeditform.php:357 lib/designsettings.php:256
 msgid "Save"
 msgstr "Gardar"
 
@@ -1767,9 +1792,9 @@ msgid "Name is required."
 msgstr "Fai falla un nome."
 
 #. TRANS: Validation error shown when providing too long a name in the "Edit application" form.
-#: actions/editapplication.php:188
+#: actions/editapplication.php:188 actions/newapplication.php:169
 #, fuzzy
-msgid "Name is too long (max 255 characters)."
+msgid "Name is too long (maximum 255 characters)."
 msgstr "O nome é longo de máis (o límite é de 255 caracteres)."
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
@@ -1798,7 +1823,7 @@ msgid "Organization is required."
 msgstr "Fai falla unha organización."
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#: actions/editapplication.php:223
+#: actions/editapplication.php:223 actions/newapplication.php:199
 #, fuzzy
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "A organización é longa de máis (o límite é de 255 caracteres)."
@@ -2601,7 +2626,7 @@ msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Publicar unha MicroID para o meu enderezo de Jabber ou GTalk."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:180
+#: actions/imsettings.php:290 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "Gardáronse as preferencias."
 
@@ -2725,10 +2750,9 @@ msgstr[1] "Xa está subscrito aos seguintes usuarios:"
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#. TRANS: Whois output.
-#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:145 actions/invite.php:159 lib/command.php:426
-#, php-format
+#: actions/invite.php:145 actions/invite.php:159
+#, fuzzy, php-format
+msgctxt "INVITE"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
@@ -2914,7 +2938,8 @@ msgstr ""
 "os dereitos reservados\"."
 
 #: actions/licenseadminpanel.php:156
-msgid "Invalid license title. Max length is 255 characters."
+#, fuzzy
+msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "Título de licenza incorrecto. A extensión máxima é de 255 caracteres."
 
 #: actions/licenseadminpanel.php:168
@@ -3092,20 +3117,10 @@ msgstr "Ten que identificarse para rexistrar unha aplicación."
 msgid "Use this form to register a new application."
 msgstr "Utilice o seguinte formulario para rexistrar unha aplicación nova."
 
-#: actions/newapplication.php:169
-#, fuzzy
-msgid "Name is too long (maximum 255 chars)."
-msgstr "O nome é longo de máis (o límite é de 255 caracteres)."
-
 #: actions/newapplication.php:184
 msgid "Source URL is required."
 msgstr "Necesítase o URL de orixe."
 
-#: actions/newapplication.php:199
-#, fuzzy
-msgid "Organization is too long (maximum 255 chars)."
-msgstr "A organización é longa de máis (o límite é de 255 caracteres)."
-
 #: actions/newapplication.php:266 actions/newapplication.php:275
 msgid "Could not create application."
 msgstr "Non se puido crear a aplicación."
@@ -3125,14 +3140,14 @@ msgid "New message"
 msgstr "Mensaxe nova"
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:499
+#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501
 msgid "You can't send a message to this user."
 msgstr "Non pode enviarlle unha mensaxe a este usuario."
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
 #: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
-#: lib/command.php:579
+#: lib/command.php:581
 msgid "No content!"
 msgstr "Non hai contido ningún!"
 
@@ -3141,7 +3156,7 @@ msgid "No recipient specified."
 msgstr "Non se especificou ningún destinatario."
 
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:503
+#: actions/newmessage.php:167 lib/command.php:505
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "Non se envíe unha mensaxe, limítese a pensar nela."
@@ -3152,12 +3167,12 @@ msgstr "Enviouse a mensaxe"
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:511
+#: actions/newmessage.php:188 lib/command.php:513
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Enviouse a mensaxe directa a %s."
 
-#: actions/newmessage.php:213 actions/newnotice.php:263
+#: actions/newmessage.php:213 actions/newnotice.php:264
 msgid "Ajax Error"
 msgstr "Houbo un erro de AJAX"
 
@@ -3165,19 +3180,7 @@ msgstr "Houbo un erro de AJAX"
 msgid "New notice"
 msgstr "Nova nota"
 
-#: actions/newnotice.php:159 lib/mailhandler.php:60
-#, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr "Iso é longo de máis. A nota non pode exceder os %d caracteres."
-
-#: actions/newnotice.php:183
-#, php-format
-msgid "Max notice size is %d chars, including attachment URL."
-msgstr ""
-"A lonxitude máxima das notas é de %d caracteres, incluído o URL do dato "
-"adxunto."
-
-#: actions/newnotice.php:229
+#: actions/newnotice.php:230
 msgid "Notice posted"
 msgstr "Publicouse a nota"
 
@@ -3347,36 +3350,46 @@ msgstr "Busca de xente"
 msgid "Notice Search"
 msgstr "Busca de notas"
 
-#: actions/othersettings.php:60
+#: actions/othersettings.php:59
 msgid "Other settings"
 msgstr "Outras opcións"
 
+#. TRANS: Instructions for tab "Other" in user profile settings.
 #: actions/othersettings.php:71
 msgid "Manage various other options."
 msgstr "Configure outras tantas opcións."
 
-#: actions/othersettings.php:108
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/othersettings.php:111
 msgid " (free service)"
 msgstr " (servizo gratuíto)"
 
-#: actions/othersettings.php:116
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/othersettings.php:120
 msgid "Shorten URLs with"
 msgstr "Abreviar os enderezos URL con"
 
-#: actions/othersettings.php:117
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/othersettings.php:122
 msgid "Automatic shortening service to use."
 msgstr "Servizo de abreviación automática a usar."
 
-#: actions/othersettings.php:122
+#. TRANS: Label for checkbox.
+#: actions/othersettings.php:128
 msgid "View profile designs"
 msgstr "Deseños visuais do perfil"
 
-#: actions/othersettings.php:123
+#. TRANS: Tooltip for checkbox.
+#: actions/othersettings.php:130
 msgid "Show or hide profile designs."
 msgstr "Amosar ou agochar os deseños do perfil."
 
-#: actions/othersettings.php:153
-msgid "URL shortening service is too long (max 50 chars)."
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/othersettings.php:162
+#, fuzzy
+msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr ""
 "O servizo de abreviación de enderezos URL é longo de máis (o límite está en "
 "50 caracteres)."
@@ -3870,7 +3883,7 @@ msgstr "Biografía"
 #. TRANS: Label for group location (dt). Text hidden by default.
 #: actions/profilesettings.php:149 actions/register.php:485
 #: actions/showgroup.php:267 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:177
+#: actions/userauthorization.php:166 lib/groupeditform.php:180
 #: lib/userprofile.php:165
 msgid "Location"
 msgstr "Lugar"
@@ -4218,7 +4231,8 @@ msgid "Unexpected password reset."
 msgstr "Restablecemento de contrasinal inesperado."
 
 #: actions/recoverpassword.php:365
-msgid "Password must be 6 chars or more."
+#, fuzzy
+msgid "Password must be 6 characters or more."
 msgstr "O contrasinal debe ter seis ou máis caracteres."
 
 #: actions/recoverpassword.php:369
@@ -4599,7 +4613,7 @@ msgstr "Organización"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:172
+#: lib/applicationeditform.php:208 lib/groupeditform.php:175
 msgid "Description"
 msgstr "Descrición"
 
@@ -4752,7 +4766,7 @@ msgid "Note"
 msgstr "Nota"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:298 lib/groupeditform.php:184
+#: actions/showgroup.php:298 lib/groupeditform.php:187
 msgid "Aliases"
 msgstr "Pseudónimos"
 
@@ -4885,47 +4899,67 @@ msgstr "Mensaxe de %1$s en %2$s"
 msgid "Notice deleted."
 msgstr "Borrouse a nota."
 
-#: actions/showstream.php:72
-#, php-format
-msgid " tagged %s"
-msgstr " etiquetouse %s"
+#. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
+#: actions/showstream.php:70
+#, fuzzy, php-format
+msgid "%1$s tagged %2$s"
+msgstr "%1$s, páxina %2$d"
 
-#: actions/showstream.php:78
+#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#: actions/showstream.php:74
+#, fuzzy, php-format
+msgid "%1$s tagged %2$s, page %3$d"
+msgstr "Notas etiquetadas con %1$s, páxina %2$d"
+
+#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$d is the page number.
+#: actions/showstream.php:82
 #, php-format
 msgid "%1$s, page %2$d"
 msgstr "%1$s, páxina %2$d"
 
-#: actions/showstream.php:120
+#. TRANS: Title for link to notice feed.
+#. TRANS: %1$s is a user nickname, %2$s is a hashtag.
+#: actions/showstream.php:127
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Fonte de novas das notas para %1$s etiquetadas con %2$s (RSS 1.0)"
 
-#: actions/showstream.php:127
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:136
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "Fonte de novas das notas para %s (RSS 1.0)"
 
-#: actions/showstream.php:134
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:145
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "Fonte de novas das notas para %s (RSS 2.0)"
 
-#: actions/showstream.php:141
+#: actions/showstream.php:152
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "Fonte de novas das notas para %s (Atom)"
 
-#: actions/showstream.php:146
+#. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
+#. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
+#: actions/showstream.php:159
 #, php-format
 msgid "FOAF for %s"
 msgstr "Amigo dun amigo para %s"
 
-#: actions/showstream.php:197
-#, php-format
-msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
+#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
+#: actions/showstream.php:211
+#, fuzzy, php-format
+msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr "Esta é a liña do tempo para %1$s pero %2$s aínda non publicou nada."
 
-#: actions/showstream.php:202
+#. TRANS: Second sentence of empty list message for a stream for the user themselves.
+#: actions/showstream.php:217
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -4933,7 +4967,9 @@ msgstr ""
 "Viu algo interesante hoxe? Aínda non publicou ningunha nota, este sería un "
 "bo momento para comezar :)"
 
-#: actions/showstream.php:204
+#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:221
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -4942,7 +4978,9 @@ msgstr ""
 "Pode probar a facerlle un aceno a %1$s ou [publicar algo dirixido a el ou "
 "ela](%%%%action.newnotice%%%%?status_textarea=%2$s)."
 
-#: actions/showstream.php:243
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:264
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4956,7 +4994,9 @@ msgstr ""
 "[Únase agora](%%%%action.register%%%%) para seguir as notas de **%s** e de "
 "moita máis xente! ([Máis información](%%%%doc.help%%%%))"
 
-#: actions/showstream.php:248
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:271
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4967,7 +5007,8 @@ msgstr ""
 "blogue curtas](http://en.wikipedia.org/wiki/Microblogging) (en inglés) "
 "baseado na ferramenta de software libre [StatusNet](http://status.net/). "
 
-#: actions/showstream.php:305
+#. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
+#: actions/showstream.php:328
 #, php-format
 msgid "Repeat of %s"
 msgstr "Repeticións de %s"
@@ -5083,32 +5124,41 @@ msgstr ""
 "Tempo (en segundos) que teñen que agardar os usuarios para publicar unha "
 "nota de novo."
 
-#: actions/sitenoticeadminpanel.php:56
+#. TRANS: Page title for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:55
 msgid "Site Notice"
 msgstr "Nota do sitio"
 
-#: actions/sitenoticeadminpanel.php:67
+#. TRANS: Instructions for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:66
 msgid "Edit site-wide message"
 msgstr "Editar a mensaxe global do sitio"
 
-#: actions/sitenoticeadminpanel.php:103
+#. TRANS: Server error displayed when saving a site-wide notice was impossible.
+#: actions/sitenoticeadminpanel.php:101
 msgid "Unable to save site notice."
 msgstr "Non se puido gardar a nota do sitio."
 
-#: actions/sitenoticeadminpanel.php:113
-msgid "Max length for the site-wide notice is 255 chars."
+#. TRANS: Client error displayed when a site-wide notice was longer than allowed.
+#: actions/sitenoticeadminpanel.php:112
+#, fuzzy
+msgid "Maximum length for the site-wide notice is 255 characters."
 msgstr "O tamaño máximo da nota global do sitio é de 255 caracteres."
 
+#. TRANS: Label for site-wide notice text field in admin panel.
 #: actions/sitenoticeadminpanel.php:176
 msgid "Site notice text"
 msgstr "Texto da nota do sitio"
 
-#: actions/sitenoticeadminpanel.php:178
-msgid "Site-wide notice text (255 chars max; HTML okay)"
+#. TRANS: Tooltip for site-wide notice text field in admin panel.
+#: actions/sitenoticeadminpanel.php:179
+#, fuzzy
+msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr ""
 "Texto da nota global do sitio (255 caracteres como máximo, pode conter HTML)"
 
-#: actions/sitenoticeadminpanel.php:198
+#. TRANS: Title for button to save site notice in admin panel.
+#: actions/sitenoticeadminpanel.php:201
 msgid "Save site notice"
 msgstr "Gardar a nota do sitio"
 
@@ -5576,75 +5626,93 @@ msgstr ""
 "licenza deste sitio: \"%2$s\"."
 
 #. TRANS: User admin panel title
-#: actions/useradminpanel.php:60
+#: actions/useradminpanel.php:58
 msgctxt "TITLE"
 msgid "User"
 msgstr "Usuario"
 
-#: actions/useradminpanel.php:71
+#. TRANS: Instruction for user admin panel.
+#: actions/useradminpanel.php:69
 msgid "User settings for this StatusNet site"
 msgstr "Configuración de usuario para este sitio StatusNet"
 
-#: actions/useradminpanel.php:150
+#. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
+#: actions/useradminpanel.php:147
 msgid "Invalid bio limit. Must be numeric."
 msgstr "Límite da biografía incorrecto. Debe ser numérico."
 
-#: actions/useradminpanel.php:156
-msgid "Invalid welcome text. Max length is 255 characters."
+#. TRANS: Form validation error in user admin panel when welcome text is too long.
+#: actions/useradminpanel.php:154
+#, fuzzy
+msgid "Invalid welcome text. Maximum length is 255 characters."
 msgstr "Texto de benvida incorrecto. A extensión máxima é de 255 caracteres."
 
+#. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
+#. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
-#, php-format
-msgid "Invalid default subscripton: '%1$s' is not user."
+#, fuzzy, php-format
+msgid "Invalid default subscripton: '%1$s' is not a user."
 msgstr "Subscrición por defecto incorrecta. \"%1$s\" non é un usuario."
 
 #. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:106
+#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
 #: lib/personalgroupnav.php:109
 msgid "Profile"
 msgstr "Perfil"
 
-#: actions/useradminpanel.php:223
+#. TRANS: Field label in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:220
 msgid "Bio Limit"
 msgstr "Límite da biografía"
 
-#: actions/useradminpanel.php:224
+#. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:222
 msgid "Maximum length of a profile bio in characters."
 msgstr "Extensión máxima da biografía dun perfil en caracteres."
 
-#: actions/useradminpanel.php:232
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:231
 msgid "New users"
 msgstr "Novos usuarios"
 
+#. TRANS: Field label in user admin panel for setting new user welcome text.
 #: actions/useradminpanel.php:236
 msgid "New user welcome"
 msgstr "Nova benvida para os usuarios"
 
-#: actions/useradminpanel.php:237
-msgid "Welcome text for new users (Max 255 chars)."
+#. TRANS: Tooltip in user admin panel for setting new user welcome text.
+#: actions/useradminpanel.php:238
+#, fuzzy
+msgid "Welcome text for new users (maximum 255 characters)."
 msgstr "Texto de benvida para os novos usuarios (255 caracteres como máximo)."
 
-#: actions/useradminpanel.php:242
+#. TRANS: Field label in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:244
 msgid "Default subscription"
 msgstr "Subscrición por defecto"
 
-#: actions/useradminpanel.php:243
+#. TRANS: Tooltip in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:246
 msgid "Automatically subscribe new users to this user."
 msgstr "Subscribir automaticamente aos novos usuarios a este usuario."
 
-#: actions/useradminpanel.php:252
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:256
 msgid "Invitations"
 msgstr "Invitacións"
 
-#: actions/useradminpanel.php:257
+#. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:262
 msgid "Invitations enabled"
 msgstr "Activáronse as invitacións"
 
-#: actions/useradminpanel.php:259
+#. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:265
 msgid "Whether to allow users to invite new users."
 msgstr "Permitir ou non que os usuarios poidan invitar a novos usuarios."
 
-#: actions/useradminpanel.php:295
+#. TRANS: Title for button to save user settings in user admin panel.
+#: actions/useradminpanel.php:302
 msgid "Save user settings"
 msgstr "Gardar a configuración do usuario"
 
@@ -5855,7 +5923,7 @@ msgid "Plugins"
 msgstr "Complementos"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:831
+#: actions/version.php:198 lib/action.php:880
 msgid "Version"
 msgstr "Versión"
 
@@ -6065,9 +6133,16 @@ msgstr "Non se puido gardar a resposta a %1$d, %2$d."
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
+#. TRANS: Full name of a profile or group followed by nickname in parens
+#: classes/Profile.php:164
+#, fuzzy, php-format
+msgctxt "FANCYNAME"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:791
+#: classes/Profile.php:812
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
@@ -6075,7 +6150,7 @@ msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:800
+#: classes/Profile.php:821
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6221,194 +6296,201 @@ msgstr "%1$s - %2$s"
 msgid "Untitled page"
 msgstr "Páxina sen título"
 
+#. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
+#: lib/action.php:310
+msgctxt "TOOLTIP"
+msgid "Show more"
+msgstr ""
+
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:477
+#: lib/action.php:526
 msgid "Primary site navigation"
 msgstr "Navegación principal do sitio"
 
 #. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:483
+#: lib/action.php:532
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "Liña do tempo do perfil persoal e os amigos"
 
 #. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:486
+#: lib/action.php:535
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Persoal"
 
 #. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:488
+#: lib/action.php:537
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
 msgstr "Cambie o seu correo electrónico, avatar, contrasinal ou perfil"
 
 #. TRANS: Main menu option when logged in for access to user settings
-#: lib/action.php:491
+#: lib/action.php:540
 msgid "Account"
 msgstr "Conta"
 
 #. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:493
+#: lib/action.php:542
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "Conectarse aos servizos"
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:496
+#: lib/action.php:545
 msgid "Connect"
 msgstr "Conectarse"
 
 #. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:499
+#: lib/action.php:548
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "Cambiar a configuración do sitio"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:502 lib/groupnav.php:117
+#: lib/action.php:551 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Administrador"
 
 #. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:506
+#: lib/action.php:555
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Convide a amigos e compañeiros a unírselle en %s"
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:509
+#: lib/action.php:558
 msgctxt "MENU"
 msgid "Invite"
 msgstr "Convidar"
 
 #. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:515
+#: lib/action.php:564
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "Saír ao anonimato"
 
 #. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:518
+#: lib/action.php:567
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Saír"
 
 #. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:523
+#: lib/action.php:572
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "Crear unha conta"
 
 #. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:526
+#: lib/action.php:575
 msgctxt "MENU"
 msgid "Register"
 msgstr "Rexistrarse"
 
 #. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:529
+#: lib/action.php:578
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "Identificarse no sitio"
 
 #. TRANS: Main menu option when not logged in to log in
-#: lib/action.php:532
+#: lib/action.php:581
 msgctxt "MENU"
 msgid "Login"
 msgstr "Identificarse"
 
 #. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:535
+#: lib/action.php:584
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Axuda!"
 
 #. TRANS: Main menu option for help on the StatusNet site
-#: lib/action.php:538
+#: lib/action.php:587
 msgctxt "MENU"
 msgid "Help"
 msgstr "Axuda"
 
 #. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:541
+#: lib/action.php:590
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr "Buscar persoas ou palabras"
 
 #. TRANS: Main menu option when logged in or when the StatusNet instance is not private
-#: lib/action.php:544
+#: lib/action.php:593
 msgctxt "MENU"
 msgid "Search"
 msgstr "Buscar"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:566 lib/adminpanelaction.php:387
+#: lib/action.php:615 lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "Nota do sitio"
 
 #. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:633
+#: lib/action.php:682
 msgid "Local views"
 msgstr "Vistas locais"
 
 #. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:703
+#: lib/action.php:752
 msgid "Page notice"
 msgstr "Nota da páxina"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:804
+#: lib/action.php:853
 msgid "Secondary site navigation"
 msgstr "Navegación secundaria do sitio"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:810
+#: lib/action.php:859
 msgid "Help"
 msgstr "Axuda"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:813
+#: lib/action.php:862
 msgid "About"
 msgstr "Acerca de"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:816
+#: lib/action.php:865
 msgid "FAQ"
 msgstr "Preguntas máis frecuentes"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:821
+#: lib/action.php:870
 msgid "TOS"
 msgstr "Condicións do servicio"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:825
+#: lib/action.php:874
 msgid "Privacy"
 msgstr "Protección de datos"
 
-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:828
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+#: lib/action.php:877
 msgid "Source"
 msgstr "Código fonte"
 
-#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:834
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+#: lib/action.php:884
 msgid "Contact"
 msgstr "Contacto"
 
-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:837
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+#: lib/action.php:887
 msgid "Badge"
 msgstr "Insignia"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:866
+#: lib/action.php:916
 msgid "StatusNet software license"
 msgstr "Licenza do software StatusNet"
 
@@ -6416,7 +6498,7 @@ msgstr "Licenza do software StatusNet"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:873
+#: lib/action.php:923
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -6426,7 +6508,7 @@ msgstr ""
 "site.broughtby%%](%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:876
+#: lib/action.php:926
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** é un servizo de mensaxes de blogue curtas."
@@ -6435,7 +6517,7 @@ msgstr "**%%site.name%%** é un servizo de mensaxes de blogue curtas."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:883
+#: lib/action.php:933
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -6447,20 +6529,20 @@ msgstr ""
 "GNU](http://www.fsf.org/licensing/licenses/agpl-3.0.html) (en inglés)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:899
+#: lib/action.php:949
 msgid "Site content license"
 msgstr "Licenza dos contidos do sitio"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:906
+#: lib/action.php:956
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "O contido e os datos de %1$s son privados e confidenciais."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:913
+#: lib/action.php:963
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
@@ -6468,7 +6550,7 @@ msgstr ""
 "todos os dereitos."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:917
+#: lib/action.php:967
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "Os contidos e datos son propiedade intelectual dos colaboradores. Quedan "
@@ -6476,26 +6558,26 @@ msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:949
+#: lib/action.php:999
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 "Todos os contidos e datos de %1$s están dispoñibles baixo a licenza %2$s."
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1285
+#: lib/action.php:1335
 msgid "Pagination"
 msgstr "Paxinación"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1296
+#: lib/action.php:1346
 msgid "After"
 msgstr "Posteriores"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1306
+#: lib/action.php:1356
 msgid "Before"
 msgstr "Anteriores"
 
@@ -6844,7 +6926,7 @@ msgid "AJAX error"
 msgstr "Houbo un erro de AJAX"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:233 lib/mailhandler.php:142
+#: lib/channel.php:233 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "Completouse a orde"
 
@@ -6860,7 +6942,7 @@ msgstr "Non hai ningunha nota con esa id."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:626
+#: lib/command.php:99 lib/command.php:630
 msgid "User has no last notice."
 msgstr "O usuario non ten ningunha última nota."
 
@@ -6929,6 +7011,14 @@ msgstr "%1$s uniuse ao grupo %2$s."
 msgid "%1$s left group %2$s."
 msgstr "%1$s deixou o grupo %2$s."
 
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: lib/command.php:426
+#, fuzzy, php-format
+msgctxt "WHOIS"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
 #. TRANS: Whois output. %s is the full name of the queried user.
 #: lib/command.php:430
 #, php-format
@@ -6968,114 +7058,121 @@ msgstr ""
 "%s é un perfil remoto. Só pode enviarlle mensaxes persoais aos usuarios do "
 "mesmo servidor."
 
-#. TRANS: Message given if content is too long.
+#. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
 #: lib/command.php:488
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] ""
+"A mensaxe é longa de máis, o límite de caracteres é de %1$d, e enviou %2$d."
+msgstr[1] ""
 "A mensaxe é longa de máis, o límite de caracteres é de %1$d, e enviou %2$d."
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:514
+#: lib/command.php:516
 msgid "Error sending direct message."
 msgstr "Houbo un erro ao enviar a mensaxe directa."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:551
+#: lib/command.php:553
 #, php-format
 msgid "Notice from %s repeated."
 msgstr "Repetiuse a nota de %s."
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:554
+#: lib/command.php:556
 msgid "Error repeating notice."
 msgstr "Houbo un erro ao repetir a nota."
 
-#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:589
-#, php-format
-msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
-msgstr "A nota é longa de máis. O límite son %1$d caracteres, e enviou %2$d."
+#: lib/command.php:591
+#, fuzzy, php-format
+msgid "Notice too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] ""
+"A nota é longa de máis. O límite son %1$d caracteres, e enviou %2$d."
+msgstr[1] ""
+"A nota é longa de máis. O límite son %1$d caracteres, e enviou %2$d."
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:600
+#: lib/command.php:604
 #, php-format
 msgid "Reply to %s sent."
 msgstr "Enviouse a resposta a %s."
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:603
+#: lib/command.php:607
 msgid "Error saving notice."
 msgstr "Houbo un erro ao gardar a nota."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:650
+#: lib/command.php:654
 msgid "Specify the name of the user to subscribe to."
 msgstr "Introduza o nome do usuario ao que quere subscribirse."
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:659
+#: lib/command.php:663
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Non se pode subscribir aos perfís OMB cunha orde."
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:667
+#: lib/command.php:671
 #, php-format
 msgid "Subscribed to %s."
 msgstr "Subscribiuse a %s."
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:688 lib/command.php:799
+#: lib/command.php:692 lib/command.php:803
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "Introduza o nome do usuario ao que quer deixar de estar subscrito."
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:699
+#: lib/command.php:703
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr "Cancelou a subscrición a %s."
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:719 lib/command.php:745
+#: lib/command.php:723 lib/command.php:749
 msgid "Command not yet implemented."
 msgstr "Aínda non se integrou esa orde."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:723
+#: lib/command.php:727
 msgid "Notification off."
 msgstr "Desactivar a notificación."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:726
+#: lib/command.php:730
 msgid "Can't turn off notification."
 msgstr "Non se pode desactivar a notificación."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:749
+#: lib/command.php:753
 msgid "Notification on."
 msgstr "Activar a notificación."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:752
+#: lib/command.php:756
 msgid "Can't turn on notification."
 msgstr "Non se pode activar a notificación."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:766
+#: lib/command.php:770
 msgid "Login command is disabled."
 msgstr "A orde de identificación está desactivada."
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:779
+#: lib/command.php:783
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
@@ -7084,20 +7181,20 @@ msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:808
+#: lib/command.php:812
 #, php-format
 msgid "Unsubscribed %s."
 msgstr "Cancelou a subscrición a %s."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:826
+#: lib/command.php:830
 msgid "You are not subscribed to anyone."
 msgstr "Non está subscrito a ninguén."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:831
+#: lib/command.php:835
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Vostede está subscrito a esta persoa:"
@@ -7105,14 +7202,14 @@ msgstr[1] "Vostede está subscrito a estas persoas:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:853
+#: lib/command.php:857
 msgid "No one is subscribed to you."
 msgstr "Non hai ninguén subscrito a vostede."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:858
+#: lib/command.php:862
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Esta persoa está subscrita a vostede:"
@@ -7120,21 +7217,21 @@ msgstr[1] "Estas persoas están subscritas a vostede:"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:880
+#: lib/command.php:884
 msgid "You are not a member of any groups."
 msgstr "Non forma parte de ningún grupo."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:885
+#: lib/command.php:889
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Vostede pertence a este grupo:"
 msgstr[1] "Vostede pertence a estes grupos:"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:900
+#: lib/command.php:904
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -7367,7 +7464,8 @@ msgstr ""
 "espazos, tiles ou eñes"
 
 #: lib/groupeditform.php:163
-msgid "URL of the homepage or blog of the group or topic"
+#, fuzzy
+msgid "URL of the homepage or blog of the group or topic."
 msgstr "URL do sitio web persoal ou blogue do grupo ou tema"
 
 #: lib/groupeditform.php:168
@@ -7375,21 +7473,32 @@ msgid "Describe the group or topic"
 msgstr "Describa o grupo ou o tema"
 
 #: lib/groupeditform.php:170
-#, php-format
-msgid "Describe the group or topic in %d characters"
-msgstr "Describa o grupo ou o tema en %d caracteres"
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d character or less"
+msgid_plural "Describe the group or topic in %d characters or less"
+msgstr[0] "Describa o grupo ou o tema en %d caracteres"
+msgstr[1] "Describa o grupo ou o tema en %d caracteres"
 
-#: lib/groupeditform.php:179
+#: lib/groupeditform.php:182
+#, fuzzy
 msgid ""
-"Location for the group, if any, like \"City, State (or Region), Country\""
+"Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr ""
 "Localidade do grupo, se a ten, como por exemplo \"Cidade, Provincia, "
 "Comunidade, País\""
 
-#: lib/groupeditform.php:187
-#, php-format
-msgid "Extra nicknames for the group, comma- or space- separated, max %d"
-msgstr ""
+#: lib/groupeditform.php:190
+#, fuzzy, php-format
+msgid ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"alias allowed."
+msgid_plural ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"aliases allowed."
+msgstr[0] ""
+"Alcumes adicionais para o grupo, separados por comas ou espazos, %d como "
+"máximo"
+msgstr[1] ""
 "Alcumes adicionais para o grupo, separados por comas ou espazos, %d como "
 "máximo"
 
@@ -7947,7 +8056,7 @@ msgstr "Ese non é o seu enderezo de correo electrónico para recibir correos."
 msgid "Sorry, no incoming email allowed."
 msgstr "Non se permite recibir correo electrónico."
 
-#: lib/mailhandler.php:228
+#: lib/mailhandler.php:229
 #, php-format
 msgid "Unsupported message type: %s"
 msgstr "Non se soporta o tipo de mensaxe: %s"
@@ -8295,16 +8404,17 @@ msgid "Sandbox this user"
 msgstr "Illar a este usuario"
 
 #. TRANS: Fieldset legend for the search form.
-#: lib/searchaction.php:121
+#: lib/searchaction.php:120
 msgid "Search site"
 msgstr "Buscar no sitio"
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
-#: lib/searchaction.php:129
+#: lib/searchaction.php:128
 msgid "Keyword(s)"
 msgstr "Termos de busca"
 
+#. TRANS: Button text for searching site.
 #: lib/searchaction.php:130
 msgctxt "BUTTON"
 msgid "Search"
@@ -8396,8 +8506,8 @@ msgid "The theme file is missing or the upload failed."
 msgstr "O ficheiro do tema visual non existe ou a subida fallou."
 
 #: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:278 lib/themeuploader.php:282
-#: lib/themeuploader.php:290 lib/themeuploader.php:297
+#: lib/themeuploader.php:279 lib/themeuploader.php:283
+#: lib/themeuploader.php:291 lib/themeuploader.php:298
 msgid "Failed saving theme."
 msgstr "Non se puido gardar o tema visual."
 
@@ -8406,17 +8516,22 @@ msgid "Invalid theme: bad directory structure."
 msgstr "Tema visual inválido: a estrutura do directorio é incorrecta"
 
 #: lib/themeuploader.php:166
-#, php-format
-msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
-msgstr ""
+#, fuzzy, php-format
+msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
+msgid_plural ""
+"Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr[0] ""
+"O tema visual cargado é grande de máis; o tamaño descomprimido non pode "
+"superar os %d bytes."
+msgstr[1] ""
 "O tema visual cargado é grande de máis; o tamaño descomprimido non pode "
 "superar os %d bytes."
 
-#: lib/themeuploader.php:178
+#: lib/themeuploader.php:179
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr "Arquivo de tema visual inválido: falta o ficheiro css/display.css"
 
-#: lib/themeuploader.php:218
+#: lib/themeuploader.php:219
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
@@ -8424,16 +8539,16 @@ msgstr ""
 "O tema visual contén un ficheiro inválido ou nome de cartafol incorrecto. "
 "Limíteo a letras ASCII, díxitos, barras baixas e signos menos."
 
-#: lib/themeuploader.php:224
+#: lib/themeuploader.php:225
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr "O tema visual contén nomes de extensión inseguros."
 
-#: lib/themeuploader.php:241
+#: lib/themeuploader.php:242
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr "O tema visual contén o tipo de ficheiro \".%s\". Non está permitido."
 
-#: lib/themeuploader.php:259
+#: lib/themeuploader.php:260
 msgid "Error opening theme archive."
 msgstr "Houbo un erro ao abrir o arquivo do tema visual."
 
@@ -8616,22 +8731,43 @@ msgstr[0] ""
 msgstr[1] ""
 "A mensaxe é longa de máis, o límite de caracteres é de %1$d, e enviou %2$d."
 
-#: scripts/restoreuser.php:82
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: scripts/restoreuser.php:61
 #, php-format
-msgid "Backup file for user %s (%s)"
-msgstr "Ficheiro de reserva para o usuario %s (%s)"
+msgid "Getting backup from file '%s'."
+msgstr ""
 
-#: scripts/restoreuser.php:88
+#. TRANS: Commandline script output.
+#: scripts/restoreuser.php:91
 msgid "No user specified; using backup user."
 msgstr "Non se especificou ningún usuario; emprégase o usuario de reserva."
 
-#: scripts/restoreuser.php:94
-#, php-format
-msgid "%d entries in backup."
-msgstr "%d entradas na reserva."
+#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
+#: scripts/restoreuser.php:98
+#, fuzzy, php-format
+msgid "%d entry in backup."
+msgid_plural "%d entries in backup."
+msgstr[0] "%d entradas na reserva."
+msgstr[1] "%d entradas na reserva."
+
+#, fuzzy
+#~ msgid "Name is too long (maximum 255 chars)."
+#~ msgstr "O nome é longo de máis (o límite é de 255 caracteres)."
+
+#, fuzzy
+#~ msgid "Organization is too long (maximum 255 chars)."
+#~ msgstr "A organización é longa de máis (o límite é de 255 caracteres)."
+
+#~ msgid "That's too long. Max notice size is %d chars."
+#~ msgstr "Iso é longo de máis. A nota non pode exceder os %d caracteres."
+
+#~ msgid "Max notice size is %d chars, including attachment URL."
+#~ msgstr ""
+#~ "A lonxitude máxima das notas é de %d caracteres, incluído o URL do dato "
+#~ "adxunto."
 
-#~ msgid "Description is too long (max %d chars)."
-#~ msgstr "A descrición é longa de máis (o máximo son %d caracteres)."
+#~ msgid " tagged %s"
+#~ msgstr " etiquetouse %s"
 
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "Demasiados pseudónimos! O número máximo é %d."
+#~ msgid "Backup file for user %s (%s)"
+#~ msgstr "Ficheiro de reserva para o usuario %s (%s)"
diff --git a/locale/hsb/LC_MESSAGES/statusnet.po b/locale/hsb/LC_MESSAGES/statusnet.po
index 89d8f334b..e801adbc6 100644
--- a/locale/hsb/LC_MESSAGES/statusnet.po
+++ b/locale/hsb/LC_MESSAGES/statusnet.po
@@ -11,18 +11,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-30 23:18+0000\n"
-"PO-Revision-Date: 2010-10-30 23:20:21+0000\n"
+"POT-Creation-Date: 2010-11-02 22:51+0000\n"
+"PO-Revision-Date: 2010-11-02 22:53:22+0000\n"
 "Language-Team: Upper Sorbian <http://translatewiki.net/wiki/Portal:hsb>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r75708); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r75875); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: hsb\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : (n%100==3 || "
 "n%100==4) ? 2 : 3)\n"
-"X-POT-Import-Date: 2010-10-30 09:48:40+0000\n"
+"X-POT-Import-Date: 2010-10-30 23:42:01+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -79,15 +79,20 @@ msgstr "Přistupne nastajenja składować"
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
+#. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
+#. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #: actions/accessadminpanel.php:193 actions/emailsettings.php:228
-#: actions/imsettings.php:187 actions/pathsadminpanel.php:512
-#: actions/profilesettings.php:201 actions/smssettings.php:209
-#: actions/subscriptions.php:246 lib/applicationeditform.php:355
+#: actions/imsettings.php:187 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: lib/applicationeditform.php:355 lib/groupeditform.php:207
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Składować"
@@ -138,7 +143,7 @@ msgstr "Strona njeeksistuje."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:495 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Wužiwar njeeksistuje"
@@ -205,7 +210,9 @@ msgstr ""
 
 #. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:208
+#. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -559,8 +566,11 @@ msgstr "Dospołne mjeno je předołho (maks. 255 znamješkow)."
 #. TRANS: Group edit form validation error.
 #. TRANS: Form validation error in New application form.
 #. TRANS: %d is the maximum number of characters for the description.
+#. TRANS: Group create form validation error.
+#. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:220 actions/editapplication.php:201
 #: actions/editgroup.php:216 actions/newapplication.php:178
+#: actions/newgroup.php:152
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -724,14 +734,14 @@ msgstr "Njejsy awtorizowany."
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:172 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:74
 #: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
 #: actions/groupunblock.php:65 actions/imsettings.php:230
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
-#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/othersettings.php:153 actions/passwordsettings.php:138
 #: actions/profilesettings.php:221 actions/recoverpassword.php:350
 #: actions/register.php:172 actions/remotesubscribe.php:77
 #: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
@@ -905,20 +915,21 @@ msgstr "Njemóžeš status druheho wužiwarja zničić."
 
 #. TRANS: Client error displayed trying to repeat a non-existing notice through the API.
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
+#. TRANS: Error message displayed trying to delete a non-existing notice.
 #: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/deletenotice.php:58 actions/shownotice.php:92
+#: actions/deletenotice.php:61 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "Zdźělenka njeeksistuje."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:535
+#: actions/apistatusesretweet.php:83 lib/command.php:537
 msgid "Cannot repeat your own notice."
 msgstr "Njemóžno twoju zdźělenku wospjetować."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:541
+#: actions/apistatusesretweet.php:92 lib/command.php:543
 msgid "Already repeated that notice."
 msgstr "Tuta zdźělenka bu hižo wospjetowana."
 
@@ -939,7 +950,8 @@ msgstr ""
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#: actions/apistatusesupdate.php:244
+#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
+#: lib/mailhandler.php:60
 #, fuzzy, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
@@ -956,7 +968,7 @@ msgstr "API-metoda njenamakana."
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
-#: actions/apistatusesupdate.php:308
+#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
 #, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
@@ -1171,17 +1183,18 @@ msgstr ""
 msgid "Lost our file data."
 msgstr "Naše datajowe daty su so zhubili."
 
-#: actions/avatarsettings.php:384
+#. TRANS: Success message for having updated a user avatar.
+#: actions/avatarsettings.php:385
 msgid "Avatar updated."
 msgstr "Awatar zaktualizowany."
 
 #. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
-#: actions/avatarsettings.php:388
+#: actions/avatarsettings.php:389
 msgid "Failed updating avatar."
 msgstr "Aktualizowanje awatara je so njeporadźiło."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:412
+#: actions/avatarsettings.php:413
 msgid "Avatar deleted."
 msgstr "Awatar zničeny."
 
@@ -1210,8 +1223,8 @@ msgstr ""
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:154 actions/deleteapplication.php:154
-#: actions/deletegroup.php:220 actions/deletenotice.php:150
+#: actions/block.php:154 actions/deleteapplication.php:157
+#: actions/deletegroup.php:220 actions/deletenotice.php:155
 #: actions/deleteuser.php:152 actions/groupblock.php:178
 msgctxt "BUTTON"
 msgid "No"
@@ -1229,8 +1242,8 @@ msgstr "Tutoho wužiwarja njeblokować"
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:161 actions/deleteapplication.php:161
-#: actions/deletegroup.php:227 actions/deletenotice.php:157
+#: actions/block.php:161 actions/deleteapplication.php:164
+#: actions/deletegroup.php:227 actions/deletenotice.php:162
 #: actions/deleteuser.php:159 actions/groupblock.php:185
 msgctxt "BUTTON"
 msgid "Yes"
@@ -1349,12 +1362,13 @@ msgstr "Tuta adresa bu hižo wobkrućena."
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
 #. TRANS: Server error thrown on database error updating IM preferences.
 #. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
 #. TRANS: Server error thrown when user profile settings could not be updated.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #: actions/confirmaddress.php:118 actions/emailsettings.php:331
 #: actions/emailsettings.php:477 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:174
+#: actions/imsettings.php:442 actions/othersettings.php:184
 #: actions/profilesettings.php:326 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
@@ -1390,16 +1404,19 @@ msgstr "Konwersacija"
 msgid "Notices"
 msgstr "Zdźělenki"
 
-#: actions/deleteapplication.php:63
+#. TRANS: Client error displayed trying to delete an application while not logged in.
+#: actions/deleteapplication.php:62
 msgid "You must be logged in to delete an application."
 msgstr "Dyrbiš přizjewjeny być, zo by aplikaciju zničił."
 
+#. TRANS: Client error displayed trying to delete an application that does not exist.
 #: actions/deleteapplication.php:71
 msgid "Application not found."
 msgstr "Aplikaciska njenamakana."
 
+#. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
-#: actions/deleteapplication.php:78 actions/editapplication.php:78
+#: actions/deleteapplication.php:79 actions/editapplication.php:78
 #: actions/showapplication.php:94
 msgid "You are not the owner of this application."
 msgstr "Njejsy wobsedźer tuteje aplikacije."
@@ -1407,15 +1424,18 @@ msgstr "Njejsy wobsedźer tuteje aplikacije."
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
 #: actions/newapplication.php:114 actions/showapplication.php:118
-#: lib/action.php:1354
+#: lib/action.php:1404
 msgid "There was a problem with your session token."
 msgstr ""
 
-#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+#. TRANS: Title for delete application page.
+#. TRANS: Fieldset legend on delete application page.
+#: actions/deleteapplication.php:124 actions/deleteapplication.php:149
 msgid "Delete application"
 msgstr "Aplikaciju zničić"
 
-#: actions/deleteapplication.php:149
+#. TRANS: Confirmation text on delete application page.
+#: actions/deleteapplication.php:152
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
 "about the application from the database, including all existing user "
@@ -1423,12 +1443,12 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:158
+#: actions/deleteapplication.php:161
 msgid "Do not delete this application"
 msgstr "Tutu aplikaciju njezničić"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:164
+#: actions/deleteapplication.php:167
 msgid "Delete this application"
 msgstr "Tutu aplikaciju zničić"
 
@@ -1464,13 +1484,14 @@ msgstr "Skupina njeje so dała aktualizować."
 msgid "Deleted group %s"
 msgstr "%1$s je skupinu %2$s wopušćił"
 
-#. TRANS: Title.
+#. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
 #: actions/deletegroup.php:176 actions/deletegroup.php:202
 #, fuzzy
 msgid "Delete group"
 msgstr "Wužiwarja wušmórnyć"
 
+#. TRANS: Warning in form for deleleting a group.
 #: actions/deletegroup.php:206
 msgid ""
 "Are you sure you want to delete this group? This will clear all data about "
@@ -1490,10 +1511,11 @@ msgstr "Tutu zdźělenku njewušmórnyć"
 msgid "Delete this group"
 msgstr "Tutoho wužiwarja wušmórnyć"
 
+#. TRANS: Error message displayed trying to delete a notice while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1503,31 +1525,36 @@ msgstr "Tutoho wužiwarja wušmórnyć"
 msgid "Not logged in."
 msgstr "Njepřizjewjeny."
 
-#: actions/deletenotice.php:74
+#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
+#: actions/deletenotice.php:78
 msgid "Can't delete this notice."
 msgstr "Tuta zdźělenka njeda so zničić."
 
-#: actions/deletenotice.php:106
+#. TRANS: Instructions for deleting a notice.
+#: actions/deletenotice.php:110
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
 msgstr ""
 
-#: actions/deletenotice.php:112 actions/deletenotice.php:144
+#. TRANS: Page title when deleting a notice.
+#. TRANS: Fieldset legend for the delete notice form.
+#: actions/deletenotice.php:117 actions/deletenotice.php:148
 msgid "Delete notice"
 msgstr "Zdźělenku wušmórnyć"
 
-#: actions/deletenotice.php:147
+#. TRANS: Message for the delete notice form.
+#: actions/deletenotice.php:152
 msgid "Are you sure you want to delete this notice?"
 msgstr "Chceš woprawdźe tutu zdźělenku wušmórnyć?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:154
+#: actions/deletenotice.php:159
 msgid "Do not delete this notice"
 msgstr "Tutu zdźělenku njewušmórnyć"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:161 lib/noticelist.php:667
+#: actions/deletenotice.php:166 lib/noticelist.php:667
 msgid "Delete this notice"
 msgstr "Tutu zdźělenku wušmórnyć"
 
@@ -1690,11 +1717,9 @@ msgstr "Na standard wróćo stajić"
 
 #. TRANS: Submit button title.
 #: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
-#: actions/othersettings.php:126 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: actions/useradminpanel.php:295 lib/applicationeditform.php:357
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: lib/applicationeditform.php:357 lib/designsettings.php:256
 msgid "Save"
 msgstr "Składować"
 
@@ -1742,9 +1767,9 @@ msgid "Name is required."
 msgstr "Mjeno je trěbne."
 
 #. TRANS: Validation error shown when providing too long a name in the "Edit application" form.
-#: actions/editapplication.php:188
+#: actions/editapplication.php:188 actions/newapplication.php:169
 #, fuzzy
-msgid "Name is too long (max 255 characters)."
+msgid "Name is too long (maximum 255 characters)."
 msgstr "Mjeno je předołho (maks. 255 znamješkow)."
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
@@ -1773,7 +1798,7 @@ msgid "Organization is required."
 msgstr "Organizacija je trěbna."
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#: actions/editapplication.php:223
+#: actions/editapplication.php:223 actions/newapplication.php:199
 #, fuzzy
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "Mjeno organizacije je předołho (maks. 255 znamješkow)."
@@ -2545,7 +2570,7 @@ msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "MicroID za moju e-mejlowu adresu publikować"
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:180
+#: actions/imsettings.php:290 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "Nastajenja składowane."
 
@@ -2673,10 +2698,9 @@ msgstr[3] "Sy tutych wužiwarjow hižo abonował:"
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#. TRANS: Whois output.
-#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:145 actions/invite.php:159 lib/command.php:426
-#, php-format
+#: actions/invite.php:145 actions/invite.php:159
+#, fuzzy, php-format
+msgctxt "INVITE"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
@@ -2835,8 +2859,9 @@ msgid ""
 msgstr ""
 
 #: actions/licenseadminpanel.php:156
-msgid "Invalid license title. Max length is 255 characters."
-msgstr ""
+#, fuzzy
+msgid "Invalid license title. Maximum length is 255 characters."
+msgstr "Městno je předołho (maks. 255 znamješkow)."
 
 #: actions/licenseadminpanel.php:168
 msgid "Invalid license URL."
@@ -3007,20 +3032,10 @@ msgstr "Dyrbiš přizjewjeny być, zo by aplikaciju registrował."
 msgid "Use this form to register a new application."
 msgstr "Wužij tutón formular, zo by nowu aplikaciju registrował."
 
-#: actions/newapplication.php:169
-#, fuzzy
-msgid "Name is too long (maximum 255 chars)."
-msgstr "Mjeno je předołho (maks. 255 znamješkow)."
-
 #: actions/newapplication.php:184
 msgid "Source URL is required."
 msgstr "Žórłowy URL je trěbny."
 
-#: actions/newapplication.php:199
-#, fuzzy
-msgid "Organization is too long (maximum 255 chars)."
-msgstr "Mjeno organizacije je předołho (maks. 255 znamješkow)."
-
 #: actions/newapplication.php:266 actions/newapplication.php:275
 msgid "Could not create application."
 msgstr "Aplikacija njeda so wutworić."
@@ -3040,14 +3055,14 @@ msgid "New message"
 msgstr "Nowa powěsć"
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:499
+#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501
 msgid "You can't send a message to this user."
 msgstr "Njemóžeš tutomu wužiwarju powěsć pósłać."
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
 #: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
-#: lib/command.php:579
+#: lib/command.php:581
 msgid "No content!"
 msgstr "Žadyn wobsah!"
 
@@ -3056,7 +3071,7 @@ msgid "No recipient specified."
 msgstr "Žadyn přijimowar podaty."
 
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:503
+#: actions/newmessage.php:167 lib/command.php:505
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -3067,12 +3082,12 @@ msgstr "Powěsć pósłana"
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:511
+#: actions/newmessage.php:188 lib/command.php:513
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Direktna powěsć do %s pósłana."
 
-#: actions/newmessage.php:213 actions/newnotice.php:263
+#: actions/newmessage.php:213 actions/newnotice.php:264
 msgid "Ajax Error"
 msgstr "Zmylk Ajax"
 
@@ -3080,17 +3095,7 @@ msgstr "Zmylk Ajax"
 msgid "New notice"
 msgstr "Nowa zdźělenka"
 
-#: actions/newnotice.php:159 lib/mailhandler.php:60
-#, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr "To je předołho. Maksimalna wulkosć zdźělenki je %d znamješkow."
-
-#: actions/newnotice.php:183
-#, php-format
-msgid "Max notice size is %d chars, including attachment URL."
-msgstr ""
-
-#: actions/newnotice.php:229
+#: actions/newnotice.php:230
 msgid "Notice posted"
 msgstr "Zdźělenka wotpósłana"
 
@@ -3253,38 +3258,47 @@ msgstr "Ludźi pytać"
 msgid "Notice Search"
 msgstr "Zdźělenku pytać"
 
-#: actions/othersettings.php:60
+#: actions/othersettings.php:59
 msgid "Other settings"
 msgstr "Druhe nastajenja"
 
+#. TRANS: Instructions for tab "Other" in user profile settings.
 #: actions/othersettings.php:71
 msgid "Manage various other options."
 msgstr "Wšelake druhe opcije zrjadować."
 
-#: actions/othersettings.php:108
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/othersettings.php:111
 msgid " (free service)"
 msgstr " (swobodna słužba)"
 
-#: actions/othersettings.php:116
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/othersettings.php:120
 msgid "Shorten URLs with"
 msgstr "URL skrótšić z"
 
-#: actions/othersettings.php:117
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/othersettings.php:122
 msgid "Automatic shortening service to use."
 msgstr ""
 
-#: actions/othersettings.php:122
+#. TRANS: Label for checkbox.
+#: actions/othersettings.php:128
 #, fuzzy
 msgid "View profile designs"
 msgstr "Profilowe nastajenja wobdźěłać"
 
-#: actions/othersettings.php:123
+#. TRANS: Tooltip for checkbox.
+#: actions/othersettings.php:130
 msgid "Show or hide profile designs."
 msgstr ""
 
-#: actions/othersettings.php:153
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/othersettings.php:162
 #, fuzzy
-msgid "URL shortening service is too long (max 50 chars)."
+msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "Mjeno rěče je předołhe (maks. 50 znamješkow)."
 
 #: actions/otp.php:69
@@ -3774,7 +3788,7 @@ msgstr "Biografija"
 #. TRANS: Label for group location (dt). Text hidden by default.
 #: actions/profilesettings.php:149 actions/register.php:485
 #: actions/showgroup.php:267 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:177
+#: actions/userauthorization.php:166 lib/groupeditform.php:180
 #: lib/userprofile.php:165
 msgid "Location"
 msgstr "Městno"
@@ -4106,7 +4120,8 @@ msgid "Unexpected password reset."
 msgstr "Njewočakowane wotpósłanje formulara."
 
 #: actions/recoverpassword.php:365
-msgid "Password must be 6 chars or more."
+#, fuzzy
+msgid "Password must be 6 characters or more."
 msgstr "Hesło dyrbi 6 znamješkow abo wjace měć."
 
 #: actions/recoverpassword.php:369
@@ -4451,7 +4466,7 @@ msgstr "Organizacija"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:172
+#: lib/applicationeditform.php:208 lib/groupeditform.php:175
 msgid "Description"
 msgstr "Wopisanje"
 
@@ -4595,7 +4610,7 @@ msgid "Note"
 msgstr "Žadyn"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:298 lib/groupeditform.php:184
+#: actions/showgroup.php:298 lib/groupeditform.php:187
 msgid "Aliases"
 msgstr "Aliasy"
 
@@ -4719,60 +4734,84 @@ msgstr "Powěsć wot %1$s na %2$s"
 msgid "Notice deleted."
 msgstr "Zdźělenka zničena."
 
-#: actions/showstream.php:72
-#, php-format
-msgid " tagged %s"
-msgstr ""
+#. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
+#: actions/showstream.php:70
+#, fuzzy, php-format
+msgid "%1$s tagged %2$s"
+msgstr "%1$s, strona %2$d"
+
+#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#: actions/showstream.php:74
+#, fuzzy, php-format
+msgid "%1$s tagged %2$s, page %3$d"
+msgstr "%1$s, strona %2$d"
 
-#: actions/showstream.php:78
+#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$d is the page number.
+#: actions/showstream.php:82
 #, php-format
 msgid "%1$s, page %2$d"
 msgstr "%1$s, strona %2$d"
 
-#: actions/showstream.php:120
+#. TRANS: Title for link to notice feed.
+#. TRANS: %1$s is a user nickname, %2$s is a hashtag.
+#: actions/showstream.php:127
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Powěsćowy kanal za %1$s je %2$s (RSS 1.0) markěrował"
 
-#: actions/showstream.php:127
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:136
 #, fuzzy, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "Powěsćowy kanal za %1$s je %2$s (RSS 1.0) markěrował"
 
-#: actions/showstream.php:134
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:145
 #, fuzzy, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "Powěsćowy kanal za %1$s je %2$s (RSS 1.0) markěrował"
 
-#: actions/showstream.php:141
+#: actions/showstream.php:152
 #, fuzzy, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "Kanal za přećelow wužiwarja %s (Atom)"
 
-#: actions/showstream.php:146
+#. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
+#. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
+#: actions/showstream.php:159
 #, php-format
 msgid "FOAF for %s"
 msgstr "FOAF za %s"
 
-#: actions/showstream.php:197
+#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
+#: actions/showstream.php:211
 #, php-format
-msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
+msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr ""
 
-#: actions/showstream.php:202
+#. TRANS: Second sentence of empty list message for a stream for the user themselves.
+#: actions/showstream.php:217
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
 msgstr ""
 
-#: actions/showstream.php:204
+#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:221
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
 "%?status_textarea=%2$s)."
 msgstr ""
 
-#: actions/showstream.php:243
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:264
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4781,7 +4820,9 @@ msgid ""
 "follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
 
-#: actions/showstream.php:248
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:271
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4789,7 +4830,8 @@ msgid ""
 "[StatusNet](http://status.net/) tool. "
 msgstr ""
 
-#: actions/showstream.php:305
+#. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
+#: actions/showstream.php:328
 #, fuzzy, php-format
 msgid "Repeat of %s"
 msgstr "Wospjetowany wot"
@@ -4904,31 +4946,38 @@ msgstr "Tekstowy limit"
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:56
+#. TRANS: Page title for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:55
 msgid "Site Notice"
 msgstr "Sydłowa zdźělenka"
 
-#: actions/sitenoticeadminpanel.php:67
+#. TRANS: Instructions for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:66
 msgid "Edit site-wide message"
 msgstr "Sydłodaloku powěsć wobdźěłać"
 
-#: actions/sitenoticeadminpanel.php:103
+#. TRANS: Server error displayed when saving a site-wide notice was impossible.
+#: actions/sitenoticeadminpanel.php:101
 msgid "Unable to save site notice."
 msgstr "Njeje móžno, sydłowu zdźělenku składować."
 
-#: actions/sitenoticeadminpanel.php:113
-msgid "Max length for the site-wide notice is 255 chars."
+#. TRANS: Client error displayed when a site-wide notice was longer than allowed.
+#: actions/sitenoticeadminpanel.php:112
+msgid "Maximum length for the site-wide notice is 255 characters."
 msgstr ""
 
+#. TRANS: Label for site-wide notice text field in admin panel.
 #: actions/sitenoticeadminpanel.php:176
 msgid "Site notice text"
 msgstr "Tekst sydłoweje zdźělenki"
 
-#: actions/sitenoticeadminpanel.php:178
-msgid "Site-wide notice text (255 chars max; HTML okay)"
+#. TRANS: Tooltip for site-wide notice text field in admin panel.
+#: actions/sitenoticeadminpanel.php:179
+msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:198
+#. TRANS: Title for button to save site notice in admin panel.
+#: actions/sitenoticeadminpanel.php:201
 msgid "Save site notice"
 msgstr "Sydłowu zdźělenku składować"
 
@@ -5381,77 +5430,94 @@ msgid ""
 msgstr ""
 
 #. TRANS: User admin panel title
-#: actions/useradminpanel.php:60
+#: actions/useradminpanel.php:58
 msgctxt "TITLE"
 msgid "User"
 msgstr "Wužiwar"
 
-#: actions/useradminpanel.php:71
+#. TRANS: Instruction for user admin panel.
+#: actions/useradminpanel.php:69
 msgid "User settings for this StatusNet site"
 msgstr ""
 
-#: actions/useradminpanel.php:150
+#. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
+#: actions/useradminpanel.php:147
 msgid "Invalid bio limit. Must be numeric."
 msgstr ""
 
-#: actions/useradminpanel.php:156
-msgid "Invalid welcome text. Max length is 255 characters."
+#. TRANS: Form validation error in user admin panel when welcome text is too long.
+#: actions/useradminpanel.php:154
+msgid "Invalid welcome text. Maximum length is 255 characters."
 msgstr ""
 
+#. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
+#. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
-#, php-format
-msgid "Invalid default subscripton: '%1$s' is not user."
+#, fuzzy, php-format
+msgid "Invalid default subscripton: '%1$s' is not a user."
 msgstr "Njepłaćiwy standardny abonement: '%1$s' wužiwar njeje."
 
 #. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:106
+#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
 #: lib/personalgroupnav.php:109
 msgid "Profile"
 msgstr "Profil"
 
-#: actions/useradminpanel.php:223
+#. TRANS: Field label in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:220
 #, fuzzy
 msgid "Bio Limit"
 msgstr "Limity"
 
-#: actions/useradminpanel.php:224
+#. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:222
 msgid "Maximum length of a profile bio in characters."
 msgstr ""
 
-#: actions/useradminpanel.php:232
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:231
 msgid "New users"
 msgstr "Nowi wužiwarjo"
 
+#. TRANS: Field label in user admin panel for setting new user welcome text.
 #: actions/useradminpanel.php:236
 msgid "New user welcome"
 msgstr "Powitanje noweho wužiwarja"
 
-#: actions/useradminpanel.php:237
-msgid "Welcome text for new users (Max 255 chars)."
+#. TRANS: Tooltip in user admin panel for setting new user welcome text.
+#: actions/useradminpanel.php:238
+#, fuzzy
+msgid "Welcome text for new users (maximum 255 characters)."
 msgstr "Powitanski tekst za nowych wužiwarjow (maks. 255 znamješkow)."
 
-#: actions/useradminpanel.php:242
+#. TRANS: Field label in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:244
 msgid "Default subscription"
 msgstr "Standardny abonement"
 
-#: actions/useradminpanel.php:243
+#. TRANS: Tooltip in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:246
 #, fuzzy
 msgid "Automatically subscribe new users to this user."
 msgstr "Tutoho wužiwarja abonować"
 
-#: actions/useradminpanel.php:252
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:256
 msgid "Invitations"
 msgstr "Přeprošenja"
 
-#: actions/useradminpanel.php:257
+#. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:262
 msgid "Invitations enabled"
 msgstr "Přeprošenja zmóžnjene"
 
-#: actions/useradminpanel.php:259
+#. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:265
 msgid "Whether to allow users to invite new users."
 msgstr ""
 
-#: actions/useradminpanel.php:295
+#. TRANS: Title for button to save user settings in user admin panel.
+#: actions/useradminpanel.php:302
 msgid "Save user settings"
 msgstr ""
 
@@ -5640,7 +5706,7 @@ msgid "Plugins"
 msgstr "Tykače"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:831
+#: actions/version.php:198 lib/action.php:880
 msgid "Version"
 msgstr "Wersija"
 
@@ -5850,16 +5916,23 @@ msgstr "Informacije wo lokalnej skupinje njedachu so składować."
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
+#. TRANS: Full name of a profile or group followed by nickname in parens
+#: classes/Profile.php:164
+#, fuzzy, php-format
+msgctxt "FANCYNAME"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:791
+#: classes/Profile.php:812
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:800
+#: classes/Profile.php:821
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6006,199 +6079,206 @@ msgstr "%1$s - %2$s"
 msgid "Untitled page"
 msgstr "Strona bjez titula"
 
+#. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
+#: lib/action.php:310
+msgctxt "TOOLTIP"
+msgid "Show more"
+msgstr ""
+
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:477
+#: lib/action.php:526
 #, fuzzy
 msgid "Primary site navigation"
 msgstr "Zakładna sydłowa konfiguracija"
 
 #. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:483
+#: lib/action.php:532
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr ""
 
 #. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:486
+#: lib/action.php:535
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Wosobinski"
 
 #. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:488
+#: lib/action.php:537
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
 msgstr "Wašu e-mejl, waš awatar, waše hesło, waš profil změnić"
 
 #. TRANS: Main menu option when logged in for access to user settings
-#: lib/action.php:491
+#: lib/action.php:540
 msgid "Account"
 msgstr "Konto"
 
 #. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:493
+#: lib/action.php:542
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "Ze słužbami zwjazać"
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:496
+#: lib/action.php:545
 msgid "Connect"
 msgstr "Zwjazać"
 
 #. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:499
+#: lib/action.php:548
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "Sydłowu konfiguraciju změnić"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:502 lib/groupnav.php:117
+#: lib/action.php:551 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Administrator"
 
 #. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:506
+#: lib/action.php:555
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Přećelow a kolegow přeprosyć, so tebi na %s  přidružić"
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:509
+#: lib/action.php:558
 msgctxt "MENU"
 msgid "Invite"
 msgstr "Přeprosyć"
 
 #. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:515
+#: lib/action.php:564
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "Ze sydła wotzjewić"
 
 #. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:518
+#: lib/action.php:567
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Wotzjewić"
 
 #. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:523
+#: lib/action.php:572
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "Konto załožić"
 
 #. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:526
+#: lib/action.php:575
 msgctxt "MENU"
 msgid "Register"
 msgstr "Registrować"
 
 #. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:529
+#: lib/action.php:578
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "Při sydle přizjewić"
 
 #. TRANS: Main menu option when not logged in to log in
-#: lib/action.php:532
+#: lib/action.php:581
 msgctxt "MENU"
 msgid "Login"
 msgstr "Přizjewjenje"
 
 #. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:535
+#: lib/action.php:584
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Pomhaj!"
 
 #. TRANS: Main menu option for help on the StatusNet site
-#: lib/action.php:538
+#: lib/action.php:587
 msgctxt "MENU"
 msgid "Help"
 msgstr "Pomoc"
 
 #. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:541
+#: lib/action.php:590
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr "Za ludźimi abo tekstom pytać"
 
 #. TRANS: Main menu option when logged in or when the StatusNet instance is not private
-#: lib/action.php:544
+#: lib/action.php:593
 msgctxt "MENU"
 msgid "Search"
 msgstr "Pytać"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:566 lib/adminpanelaction.php:387
+#: lib/action.php:615 lib/adminpanelaction.php:387
 #, fuzzy
 msgid "Site notice"
 msgstr "Sydłowa zdźělenka"
 
 #. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:633
+#: lib/action.php:682
 #, fuzzy
 msgid "Local views"
 msgstr "Lokalny"
 
 #. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:703
+#: lib/action.php:752
 #, fuzzy
 msgid "Page notice"
 msgstr "Nowa zdźělenka"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:804
+#: lib/action.php:853
 #, fuzzy
 msgid "Secondary site navigation"
 msgstr "Zakładna sydłowa konfiguracija"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:810
+#: lib/action.php:859
 msgid "Help"
 msgstr "Pomoc"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:813
+#: lib/action.php:862
 msgid "About"
 msgstr "Wo"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:816
+#: lib/action.php:865
 msgid "FAQ"
 msgstr "Huste prašenja"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:821
+#: lib/action.php:870
 msgid "TOS"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:825
+#: lib/action.php:874
 msgid "Privacy"
 msgstr "Priwatnosć"
 
-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:828
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+#: lib/action.php:877
 msgid "Source"
 msgstr "Žórło"
 
-#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:834
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+#: lib/action.php:884
 msgid "Contact"
 msgstr "Kontakt"
 
-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:837
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+#: lib/action.php:887
 msgid "Badge"
 msgstr ""
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:866
+#: lib/action.php:916
 msgid "StatusNet software license"
 msgstr ""
 
@@ -6206,7 +6286,7 @@ msgstr ""
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:873
+#: lib/action.php:923
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -6214,7 +6294,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:876
+#: lib/action.php:926
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr ""
@@ -6223,7 +6303,7 @@ msgstr ""
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:883
+#: lib/action.php:933
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -6232,52 +6312,52 @@ msgid ""
 msgstr ""
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:899
+#: lib/action.php:949
 #, fuzzy
 msgid "Site content license"
 msgstr "Wobsah zdźělenkow přepytać"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:906
+#: lib/action.php:956
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:913
+#: lib/action.php:963
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:917
+#: lib/action.php:967
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:949
+#: lib/action.php:999
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1285
+#: lib/action.php:1335
 #, fuzzy
 msgid "Pagination"
 msgstr "Registrowanje"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1296
+#: lib/action.php:1346
 msgid "After"
 msgstr "Po"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1306
+#: lib/action.php:1356
 msgid "Before"
 msgstr "Před"
 
@@ -6627,7 +6707,7 @@ msgid "AJAX error"
 msgstr "Zmylk Ajax"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:233 lib/mailhandler.php:142
+#: lib/channel.php:233 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "Přikaz wuwjedźeny"
 
@@ -6643,7 +6723,7 @@ msgstr "Zdźělenka z tym ID njeeksistuje."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:626
+#: lib/command.php:99 lib/command.php:630
 msgid "User has no last notice."
 msgstr "Wužiwar nima poslednju powěsć."
 
@@ -6710,6 +6790,14 @@ msgstr ""
 msgid "%1$s left group %2$s."
 msgstr ""
 
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: lib/command.php:426
+#, fuzzy, php-format
+msgctxt "WHOIS"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
 #. TRANS: Whois output. %s is the full name of the queried user.
 #: lib/command.php:430
 #, php-format
@@ -6747,135 +6835,157 @@ msgid ""
 "same server."
 msgstr ""
 
-#. TRANS: Message given if content is too long.
+#. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
 #: lib/command.php:488
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] ""
+"Powěsć je předołho - maksimalna wulkosć je %1$d znamješkow, ty sy %2$d "
+"pósłał."
+msgstr[1] ""
+"Powěsć je předołho - maksimalna wulkosć je %1$d znamješkow, ty sy %2$d "
+"pósłał."
+msgstr[2] ""
+"Powěsć je předołho - maksimalna wulkosć je %1$d znamješkow, ty sy %2$d "
+"pósłał."
+msgstr[3] ""
 "Powěsć je předołho - maksimalna wulkosć je %1$d znamješkow, ty sy %2$d "
 "pósłał."
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:514
+#: lib/command.php:516
 msgid "Error sending direct message."
 msgstr "Zmylk při słanju direktneje powěsće,"
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:551
+#: lib/command.php:553
 #, php-format
 msgid "Notice from %s repeated."
 msgstr "Powěsć wot %s wospjetowana."
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:554
+#: lib/command.php:556
 msgid "Error repeating notice."
 msgstr "Zmylk při wospjetowanju zdźělenki"
 
-#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:589
-#, php-format
-msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
+#: lib/command.php:591
+#, fuzzy, php-format
+msgid "Notice too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] ""
+"Powěsć je předołho - maksimalna wulkosć je %1$d znamješkow, ty sy %2$d "
+"pósłał."
+msgstr[1] ""
+"Powěsć je předołho - maksimalna wulkosć je %1$d znamješkow, ty sy %2$d "
+"pósłał."
+msgstr[2] ""
+"Powěsć je předołho - maksimalna wulkosć je %1$d znamješkow, ty sy %2$d "
+"pósłał."
+msgstr[3] ""
+"Powěsć je předołho - maksimalna wulkosć je %1$d znamješkow, ty sy %2$d "
+"pósłał."
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:600
+#: lib/command.php:604
 #, php-format
 msgid "Reply to %s sent."
 msgstr "Wotmołwa na %s pósłana."
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:603
+#: lib/command.php:607
 msgid "Error saving notice."
 msgstr "Zmylk při składowanju powěsće"
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:650
+#: lib/command.php:654
 msgid "Specify the name of the user to subscribe to."
 msgstr ""
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:659
+#: lib/command.php:663
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "OMB-profile njedadźa so přez přikaz abonować."
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:667
+#: lib/command.php:671
 #, php-format
 msgid "Subscribed to %s."
 msgstr ""
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:688 lib/command.php:799
+#: lib/command.php:692 lib/command.php:803
 msgid "Specify the name of the user to unsubscribe from."
 msgstr ""
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:699
+#: lib/command.php:703
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:719 lib/command.php:745
+#: lib/command.php:723 lib/command.php:749
 msgid "Command not yet implemented."
 msgstr "Přikaz hišće njeimplementowany."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:723
+#: lib/command.php:727
 msgid "Notification off."
 msgstr "Zdźělenje znjemóžnjene."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:726
+#: lib/command.php:730
 msgid "Can't turn off notification."
 msgstr "Zdźělenje njeda so znjemóžnić."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:749
+#: lib/command.php:753
 msgid "Notification on."
 msgstr "Zdźělenje zmóžnjene."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:752
+#: lib/command.php:756
 msgid "Can't turn on notification."
 msgstr "Zdźělenje njeda so zmóžnić."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:766
+#: lib/command.php:770
 msgid "Login command is disabled."
 msgstr ""
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:779
+#: lib/command.php:783
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:808
+#: lib/command.php:812
 #, php-format
 msgid "Unsubscribed %s."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:826
+#: lib/command.php:830
 msgid "You are not subscribed to anyone."
 msgstr "Njejsy nikoho abonował."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:831
+#: lib/command.php:835
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Sy tutu wosobu abonował:"
@@ -6885,14 +6995,14 @@ msgstr[3] "Sy tute wosoby abonował:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:853
+#: lib/command.php:857
 msgid "No one is subscribed to you."
 msgstr "Nichtó njeje će abonował."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:858
+#: lib/command.php:862
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Tuta wosoba je će abonowała:"
@@ -6902,14 +7012,14 @@ msgstr[3] "Tute wosoby su će abonowali:"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:880
+#: lib/command.php:884
 msgid "You are not a member of any groups."
 msgstr "Njejsy čłon w žanej skupinje."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:885
+#: lib/command.php:889
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Sy čłon tuteje skupiny:"
@@ -6918,7 +7028,7 @@ msgstr[2] "Sy čłon tutych skupinow:"
 msgstr[3] "Sy čłon tutych skupinow:"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:900
+#: lib/command.php:904
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -7115,7 +7225,7 @@ msgstr ""
 
 #: lib/groupeditform.php:163
 #, fuzzy
-msgid "URL of the homepage or blog of the group or topic"
+msgid "URL of the homepage or blog of the group or topic."
 msgstr "URL za startowu stronu organizacije"
 
 #: lib/groupeditform.php:168
@@ -7123,21 +7233,34 @@ msgid "Describe the group or topic"
 msgstr "Skupinu abo temu wopisać"
 
 #: lib/groupeditform.php:170
-#, php-format
-msgid "Describe the group or topic in %d characters"
-msgstr "Skupinu abo temu w %d znamješkach wopisać"
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d character or less"
+msgid_plural "Describe the group or topic in %d characters or less"
+msgstr[0] "Skupinu abo temu w %d znamješkach wopisać"
+msgstr[1] "Skupinu abo temu w %d znamješkach wopisać"
+msgstr[2] "Skupinu abo temu w %d znamješkach wopisać"
+msgstr[3] "Skupinu abo temu w %d znamješkach wopisać"
 
-#: lib/groupeditform.php:179
+#: lib/groupeditform.php:182
+#, fuzzy
 msgid ""
-"Location for the group, if any, like \"City, State (or Region), Country\""
+"Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr ""
 "Městno za skupinu, jeli eksistuje, na př. \"město, zwjazkowy kraj (abo "
 "region), kraj\""
 
-#: lib/groupeditform.php:187
+#: lib/groupeditform.php:190
 #, php-format
-msgid "Extra nicknames for the group, comma- or space- separated, max %d"
-msgstr ""
+msgid ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"alias allowed."
+msgid_plural ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"aliases allowed."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
 #. TRANS: Menu item in the group navigation page.
 #: lib/groupnav.php:86
@@ -7600,7 +7723,7 @@ msgstr "Wodaj, to twoja adresa za dochadźace e-mejle njeje."
 msgid "Sorry, no incoming email allowed."
 msgstr "Wodaj, dochadźaće e-mejle njejsu dowolene."
 
-#: lib/mailhandler.php:228
+#: lib/mailhandler.php:229
 #, php-format
 msgid "Unsupported message type: %s"
 msgstr "Njepodpěrany powěsćowy typ: %s"
@@ -7948,16 +8071,17 @@ msgid "Sandbox this user"
 msgstr "Tutoho wužiwarja wotblokować"
 
 #. TRANS: Fieldset legend for the search form.
-#: lib/searchaction.php:121
+#: lib/searchaction.php:120
 msgid "Search site"
 msgstr "Pytanske sydło"
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
-#: lib/searchaction.php:129
+#: lib/searchaction.php:128
 msgid "Keyword(s)"
 msgstr "Klučowe hesła"
 
+#. TRANS: Button text for searching site.
 #: lib/searchaction.php:130
 msgctxt "BUTTON"
 msgid "Search"
@@ -8049,8 +8173,8 @@ msgid "The theme file is missing or the upload failed."
 msgstr ""
 
 #: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:278 lib/themeuploader.php:282
-#: lib/themeuploader.php:290 lib/themeuploader.php:297
+#: lib/themeuploader.php:279 lib/themeuploader.php:283
+#: lib/themeuploader.php:291 lib/themeuploader.php:298
 msgid "Failed saving theme."
 msgstr "Składowanje šata je so njeporadźiło."
 
@@ -8060,29 +8184,34 @@ msgstr ""
 
 #: lib/themeuploader.php:166
 #, php-format
-msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
-msgstr ""
+msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
+msgid_plural ""
+"Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
-#: lib/themeuploader.php:178
+#: lib/themeuploader.php:179
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr ""
 
-#: lib/themeuploader.php:218
+#: lib/themeuploader.php:219
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
 msgstr ""
 
-#: lib/themeuploader.php:224
+#: lib/themeuploader.php:225
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr ""
 
-#: lib/themeuploader.php:241
+#: lib/themeuploader.php:242
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr ""
 
-#: lib/themeuploader.php:259
+#: lib/themeuploader.php:260
 msgid "Error opening theme archive."
 msgstr "Zmylk při wočinjenju šatoweho archiwa."
 
@@ -8285,23 +8414,35 @@ msgstr[3] ""
 "Powěsć je předołho - maksimalna wulkosć je %1$d znamješkow, ty sy %2$d "
 "pósłał."
 
-#: scripts/restoreuser.php:82
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: scripts/restoreuser.php:61
 #, php-format
-msgid "Backup file for user %s (%s)"
+msgid "Getting backup from file '%s'."
 msgstr ""
 
-#: scripts/restoreuser.php:88
+#. TRANS: Commandline script output.
+#: scripts/restoreuser.php:91
 #, fuzzy
 msgid "No user specified; using backup user."
 msgstr "Žadyn wužiwarski ID podaty."
 
-#: scripts/restoreuser.php:94
+#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
+#: scripts/restoreuser.php:98
 #, php-format
-msgid "%d entries in backup."
-msgstr ""
+msgid "%d entry in backup."
+msgid_plural "%d entries in backup."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
-#~ msgid "Description is too long (max %d chars)."
-#~ msgstr "Wopisanje je předołho (maks. %d znamješkow)."
+#, fuzzy
+#~ msgid "Name is too long (maximum 255 chars)."
+#~ msgstr "Mjeno je předołho (maks. 255 znamješkow)."
+
+#, fuzzy
+#~ msgid "Organization is too long (maximum 255 chars)."
+#~ msgstr "Mjeno organizacije je předołho (maks. 255 znamješkow)."
 
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "Přewjele aliasow! Maksimum: %d."
+#~ msgid "That's too long. Max notice size is %d chars."
+#~ msgstr "To je předołho. Maksimalna wulkosć zdźělenki je %d znamješkow."
diff --git a/locale/hu/LC_MESSAGES/statusnet.po b/locale/hu/LC_MESSAGES/statusnet.po
index acf0eaf40..6cdd324c7 100644
--- a/locale/hu/LC_MESSAGES/statusnet.po
+++ b/locale/hu/LC_MESSAGES/statusnet.po
@@ -12,13 +12,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-30 23:18+0000\n"
-"PO-Revision-Date: 2010-10-30 23:20:22+0000\n"
+"POT-Creation-Date: 2010-11-02 22:51+0000\n"
+"PO-Revision-Date: 2010-11-02 22:53:22+0000\n"
 "Language-Team: Hungarian <http://translatewiki.net/wiki/Portal:hu>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-10-30 09:48:40+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r75708); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-30 23:42:01+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r75875); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: hu\n"
 "X-Message-Group: #out-statusnet-core\n"
@@ -81,15 +81,20 @@ msgstr "Hozzáférések beállításainak mentése"
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
+#. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
+#. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #: actions/accessadminpanel.php:193 actions/emailsettings.php:228
-#: actions/imsettings.php:187 actions/pathsadminpanel.php:512
-#: actions/profilesettings.php:201 actions/smssettings.php:209
-#: actions/subscriptions.php:246 lib/applicationeditform.php:355
+#: actions/imsettings.php:187 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: lib/applicationeditform.php:355 lib/groupeditform.php:207
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Mentés"
@@ -140,7 +145,7 @@ msgstr "Nincs ilyen lap."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:495 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Nincs ilyen felhasználó."
@@ -211,7 +216,9 @@ msgstr ""
 
 #. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:208
+#. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -562,8 +569,11 @@ msgstr "A teljes név túl hosszú (legfeljebb 255 karakter lehet)."
 #. TRANS: Group edit form validation error.
 #. TRANS: Form validation error in New application form.
 #. TRANS: %d is the maximum number of characters for the description.
+#. TRANS: Group create form validation error.
+#. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:220 actions/editapplication.php:201
 #: actions/editgroup.php:216 actions/newapplication.php:178
+#: actions/newgroup.php:152
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -722,14 +732,14 @@ msgstr "Nincs jogosultságod."
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:172 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:74
 #: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
 #: actions/groupunblock.php:65 actions/imsettings.php:230
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
-#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/othersettings.php:153 actions/passwordsettings.php:138
 #: actions/profilesettings.php:221 actions/recoverpassword.php:350
 #: actions/register.php:172 actions/remotesubscribe.php:77
 #: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
@@ -901,20 +911,21 @@ msgstr "Nem törölheted más felhasználók állapotait."
 
 #. TRANS: Client error displayed trying to repeat a non-existing notice through the API.
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
+#. TRANS: Error message displayed trying to delete a non-existing notice.
 #: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/deletenotice.php:58 actions/shownotice.php:92
+#: actions/deletenotice.php:61 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "Nincs ilyen hír."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:535
+#: actions/apistatusesretweet.php:83 lib/command.php:537
 msgid "Cannot repeat your own notice."
 msgstr "Nem ismételheted meg a saját híredet."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:541
+#: actions/apistatusesretweet.php:92 lib/command.php:543
 msgid "Already repeated that notice."
 msgstr "Már megismételted azt a hírt."
 
@@ -935,7 +946,8 @@ msgstr ""
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#: actions/apistatusesupdate.php:244
+#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
+#: lib/mailhandler.php:60
 #, fuzzy, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
@@ -950,7 +962,7 @@ msgstr "Az API-metódus nem található."
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
-#: actions/apistatusesupdate.php:308
+#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
 #, fuzzy, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
@@ -1162,17 +1174,18 @@ msgstr "Válassz ki egy négyzet alakú területet a képből, ami az avatarod l
 msgid "Lost our file data."
 msgstr "Elvesztettük az adatainkat."
 
-#: actions/avatarsettings.php:384
+#. TRANS: Success message for having updated a user avatar.
+#: actions/avatarsettings.php:385
 msgid "Avatar updated."
 msgstr "Avatar frissítve."
 
 #. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
-#: actions/avatarsettings.php:388
+#: actions/avatarsettings.php:389
 msgid "Failed updating avatar."
 msgstr "Nem sikerült felölteni az avatart."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:412
+#: actions/avatarsettings.php:413
 msgid "Avatar deleted."
 msgstr "Avatar törölve."
 
@@ -1201,8 +1214,8 @@ msgstr ""
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:154 actions/deleteapplication.php:154
-#: actions/deletegroup.php:220 actions/deletenotice.php:150
+#: actions/block.php:154 actions/deleteapplication.php:157
+#: actions/deletegroup.php:220 actions/deletenotice.php:155
 #: actions/deleteuser.php:152 actions/groupblock.php:178
 msgctxt "BUTTON"
 msgid "No"
@@ -1220,8 +1233,8 @@ msgstr "Ne blokkoljuk ezt a felhasználót"
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:161 actions/deleteapplication.php:161
-#: actions/deletegroup.php:227 actions/deletenotice.php:157
+#: actions/block.php:161 actions/deleteapplication.php:164
+#: actions/deletegroup.php:227 actions/deletenotice.php:162
 #: actions/deleteuser.php:159 actions/groupblock.php:185
 msgctxt "BUTTON"
 msgid "Yes"
@@ -1338,12 +1351,13 @@ msgstr "Ez a cím már meg van erősítve."
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
 #. TRANS: Server error thrown on database error updating IM preferences.
 #. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
 #. TRANS: Server error thrown when user profile settings could not be updated.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #: actions/confirmaddress.php:118 actions/emailsettings.php:331
 #: actions/emailsettings.php:477 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:174
+#: actions/imsettings.php:442 actions/othersettings.php:184
 #: actions/profilesettings.php:326 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
@@ -1379,16 +1393,19 @@ msgstr "Beszélgetés"
 msgid "Notices"
 msgstr "Hírek"
 
-#: actions/deleteapplication.php:63
+#. TRANS: Client error displayed trying to delete an application while not logged in.
+#: actions/deleteapplication.php:62
 msgid "You must be logged in to delete an application."
 msgstr ""
 
+#. TRANS: Client error displayed trying to delete an application that does not exist.
 #: actions/deleteapplication.php:71
 msgid "Application not found."
 msgstr ""
 
+#. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
-#: actions/deleteapplication.php:78 actions/editapplication.php:78
+#: actions/deleteapplication.php:79 actions/editapplication.php:78
 #: actions/showapplication.php:94
 msgid "You are not the owner of this application."
 msgstr ""
@@ -1396,15 +1413,18 @@ msgstr ""
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
 #: actions/newapplication.php:114 actions/showapplication.php:118
-#: lib/action.php:1354
+#: lib/action.php:1404
 msgid "There was a problem with your session token."
 msgstr ""
 
-#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+#. TRANS: Title for delete application page.
+#. TRANS: Fieldset legend on delete application page.
+#: actions/deleteapplication.php:124 actions/deleteapplication.php:149
 msgid "Delete application"
 msgstr "Alkalmazás törlése"
 
-#: actions/deleteapplication.php:149
+#. TRANS: Confirmation text on delete application page.
+#: actions/deleteapplication.php:152
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
 "about the application from the database, including all existing user "
@@ -1412,12 +1432,12 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:158
+#: actions/deleteapplication.php:161
 msgid "Do not delete this application"
 msgstr ""
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:164
+#: actions/deleteapplication.php:167
 msgid "Delete this application"
 msgstr ""
 
@@ -1453,13 +1473,14 @@ msgstr "Nem sikerült a csoport frissítése."
 msgid "Deleted group %s"
 msgstr "%1$s csatlakozott a(z) %2$s csoporthoz"
 
-#. TRANS: Title.
+#. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
 #: actions/deletegroup.php:176 actions/deletegroup.php:202
 #, fuzzy
 msgid "Delete group"
 msgstr "Felhasználó törlése"
 
+#. TRANS: Warning in form for deleleting a group.
 #: actions/deletegroup.php:206
 #, fuzzy
 msgid ""
@@ -1482,10 +1503,11 @@ msgstr "Ne töröljük ezt a hírt"
 msgid "Delete this group"
 msgstr "Töröljük ezt a felhasználót"
 
+#. TRANS: Error message displayed trying to delete a notice while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1495,31 +1517,36 @@ msgstr "Töröljük ezt a felhasználót"
 msgid "Not logged in."
 msgstr "Nem vagy bejelentkezve."
 
-#: actions/deletenotice.php:74
+#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
+#: actions/deletenotice.php:78
 msgid "Can't delete this notice."
 msgstr ""
 
-#: actions/deletenotice.php:106
+#. TRANS: Instructions for deleting a notice.
+#: actions/deletenotice.php:110
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
 msgstr ""
 
-#: actions/deletenotice.php:112 actions/deletenotice.php:144
+#. TRANS: Page title when deleting a notice.
+#. TRANS: Fieldset legend for the delete notice form.
+#: actions/deletenotice.php:117 actions/deletenotice.php:148
 msgid "Delete notice"
 msgstr "Hír törlése"
 
-#: actions/deletenotice.php:147
+#. TRANS: Message for the delete notice form.
+#: actions/deletenotice.php:152
 msgid "Are you sure you want to delete this notice?"
 msgstr "Biztosan törölni szeretnéd ezt a hírt?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:154
+#: actions/deletenotice.php:159
 msgid "Do not delete this notice"
 msgstr "Ne töröljük ezt a hírt"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:161 lib/noticelist.php:667
+#: actions/deletenotice.php:166 lib/noticelist.php:667
 msgid "Delete this notice"
 msgstr "Töröljük ezt a hírt"
 
@@ -1681,11 +1708,9 @@ msgstr "Visszaállítás az alapértelmezettre"
 
 #. TRANS: Submit button title.
 #: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
-#: actions/othersettings.php:126 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: actions/useradminpanel.php:295 lib/applicationeditform.php:357
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: lib/applicationeditform.php:357 lib/designsettings.php:256
 msgid "Save"
 msgstr "Mentés"
 
@@ -1733,9 +1758,9 @@ msgid "Name is required."
 msgstr "A név szükséges."
 
 #. TRANS: Validation error shown when providing too long a name in the "Edit application" form.
-#: actions/editapplication.php:188
+#: actions/editapplication.php:188 actions/newapplication.php:169
 #, fuzzy
-msgid "Name is too long (max 255 characters)."
+msgid "Name is too long (maximum 255 characters)."
 msgstr "A név túl hosszú (max 255 karakter lehet)."
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
@@ -1764,7 +1789,7 @@ msgid "Organization is required."
 msgstr "A szervezet szükséges."
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#: actions/editapplication.php:223
+#: actions/editapplication.php:223 actions/newapplication.php:199
 #, fuzzy
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "A szervezet túl hosszú (255 karakter lehet)."
@@ -2543,7 +2568,7 @@ msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr ""
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:180
+#: actions/imsettings.php:290 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "Beállítások elmentve."
 
@@ -2664,12 +2689,11 @@ msgstr[1] "Ezen felhasználók híreire már feliratkoztál:"
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#. TRANS: Whois output.
-#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:145 actions/invite.php:159 lib/command.php:426
-#, php-format
+#: actions/invite.php:145 actions/invite.php:159
+#, fuzzy, php-format
+msgctxt "INVITE"
 msgid "%1$s (%2$s)"
-msgstr ""
+msgstr "%1$s - %2$s"
 
 #. TRANS: Message displayed inviting users to use a StatusNet site while the invited user
 #. TRANS: already uses a this StatusNet site. Plural form is based on the number of
@@ -2824,8 +2848,9 @@ msgid ""
 msgstr ""
 
 #: actions/licenseadminpanel.php:156
-msgid "Invalid license title. Max length is 255 characters."
-msgstr ""
+#, fuzzy
+msgid "Invalid license title. Maximum length is 255 characters."
+msgstr "Érvénytelen SSL szerver. A maximális hossz 255 karakter."
 
 #: actions/licenseadminpanel.php:168
 msgid "Invalid license URL."
@@ -2995,20 +3020,10 @@ msgstr ""
 msgid "Use this form to register a new application."
 msgstr ""
 
-#: actions/newapplication.php:169
-#, fuzzy
-msgid "Name is too long (maximum 255 chars)."
-msgstr "A név túl hosszú (max 255 karakter lehet)."
-
 #: actions/newapplication.php:184
 msgid "Source URL is required."
 msgstr "Meg kell adnod forrás URL-t."
 
-#: actions/newapplication.php:199
-#, fuzzy
-msgid "Organization is too long (maximum 255 chars)."
-msgstr "A szervezet túl hosszú (255 karakter lehet)."
-
 #: actions/newapplication.php:266 actions/newapplication.php:275
 msgid "Could not create application."
 msgstr "Nem sikerült létrehozni az alkalmazást."
@@ -3028,14 +3043,14 @@ msgid "New message"
 msgstr "Új üzenet"
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:499
+#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501
 msgid "You can't send a message to this user."
 msgstr "Ennek a felhasználónak nem küldhetsz üzenetet."
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
 #: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
-#: lib/command.php:579
+#: lib/command.php:581
 msgid "No content!"
 msgstr "Nincs tartalom!"
 
@@ -3044,7 +3059,7 @@ msgid "No recipient specified."
 msgstr "Nincs címzett megadva."
 
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:503
+#: actions/newmessage.php:167 lib/command.php:505
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "Ne küldj üzenetet magadnak, helyette mondd el halkan."
@@ -3055,12 +3070,12 @@ msgstr "Üzenet elküldve"
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:511
+#: actions/newmessage.php:188 lib/command.php:513
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Közvetlen üzenet ment %s részére."
 
-#: actions/newmessage.php:213 actions/newnotice.php:263
+#: actions/newmessage.php:213 actions/newnotice.php:264
 msgid "Ajax Error"
 msgstr "Ajax-hiba"
 
@@ -3068,18 +3083,7 @@ msgstr "Ajax-hiba"
 msgid "New notice"
 msgstr "Új hír"
 
-#: actions/newnotice.php:159 lib/mailhandler.php:60
-#, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr "Az túl hosszú. Egy hír legfeljebb %d karakterből állhat."
-
-#: actions/newnotice.php:183
-#, php-format
-msgid "Max notice size is %d chars, including attachment URL."
-msgstr ""
-"Egy hír legfeljebb %d karakterből állhat, a melléklet URL-jét is beleértve."
-
-#: actions/newnotice.php:229
+#: actions/newnotice.php:230
 msgid "Notice posted"
 msgstr "Hír elküldve"
 
@@ -3239,37 +3243,47 @@ msgstr "Emberek keresése"
 msgid "Notice Search"
 msgstr "Hírek keresése"
 
-#: actions/othersettings.php:60
+#: actions/othersettings.php:59
 msgid "Other settings"
 msgstr "Egyéb beállítások"
 
+#. TRANS: Instructions for tab "Other" in user profile settings.
 #: actions/othersettings.php:71
 msgid "Manage various other options."
 msgstr "Számos egyéb beállítás kezelése."
 
-#: actions/othersettings.php:108
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/othersettings.php:111
 msgid " (free service)"
 msgstr " (ingyenes szolgáltatás)"
 
-#: actions/othersettings.php:116
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/othersettings.php:120
 msgid "Shorten URLs with"
 msgstr ""
 
-#: actions/othersettings.php:117
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/othersettings.php:122
 msgid "Automatic shortening service to use."
 msgstr ""
 
-#: actions/othersettings.php:122
+#. TRANS: Label for checkbox.
+#: actions/othersettings.php:128
 msgid "View profile designs"
 msgstr ""
 
-#: actions/othersettings.php:123
+#. TRANS: Tooltip for checkbox.
+#: actions/othersettings.php:130
 msgid "Show or hide profile designs."
 msgstr ""
 
-#: actions/othersettings.php:153
-msgid "URL shortening service is too long (max 50 chars)."
-msgstr ""
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/othersettings.php:162
+#, fuzzy
+msgid "URL shortening service is too long (maximum 50 characters)."
+msgstr "A nyelv túl hosszú (legfeljebb 50 karakter lehet)."
 
 #: actions/otp.php:69
 msgid "No user ID specified."
@@ -3758,7 +3772,7 @@ msgstr "Életrajz"
 #. TRANS: Label for group location (dt). Text hidden by default.
 #: actions/profilesettings.php:149 actions/register.php:485
 #: actions/showgroup.php:267 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:177
+#: actions/userauthorization.php:166 lib/groupeditform.php:180
 #: lib/userprofile.php:165
 msgid "Location"
 msgstr "Helyszín"
@@ -4087,7 +4101,8 @@ msgid "Unexpected password reset."
 msgstr ""
 
 #: actions/recoverpassword.php:365
-msgid "Password must be 6 chars or more."
+#, fuzzy
+msgid "Password must be 6 characters or more."
 msgstr "A jelszónak legalább 6 karakterből kell állnia."
 
 #: actions/recoverpassword.php:369
@@ -4436,7 +4451,7 @@ msgstr "Szervezet"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:172
+#: lib/applicationeditform.php:208 lib/groupeditform.php:175
 msgid "Description"
 msgstr "Leírás"
 
@@ -4578,7 +4593,7 @@ msgid "Note"
 msgstr "Megjegyzés"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:298 lib/groupeditform.php:184
+#: actions/showgroup.php:298 lib/groupeditform.php:187
 msgid "Aliases"
 msgstr "Álnevek"
 
@@ -4707,60 +4722,84 @@ msgstr ""
 msgid "Notice deleted."
 msgstr "A hírt töröltük."
 
-#: actions/showstream.php:72
-#, php-format
-msgid " tagged %s"
+#. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
+#: actions/showstream.php:70
+#, fuzzy, php-format
+msgid "%1$s tagged %2$s"
 msgstr "  %s megcímkézve"
 
-#: actions/showstream.php:78
+#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#: actions/showstream.php:74
+#, fuzzy, php-format
+msgid "%1$s tagged %2$s, page %3$d"
+msgstr "%1$s és barátai, %2$d oldal"
+
+#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$d is the page number.
+#: actions/showstream.php:82
 #, php-format
 msgid "%1$s, page %2$d"
 msgstr ""
 
-#: actions/showstream.php:120
+#. TRANS: Title for link to notice feed.
+#. TRANS: %1$s is a user nickname, %2$s is a hashtag.
+#: actions/showstream.php:127
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "RSS 1.0 csatorna %1$s %2$s címkéjű híreiből"
 
-#: actions/showstream.php:127
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:136
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "%s RSS 1.0 hírcsatornája"
 
-#: actions/showstream.php:134
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:145
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "%s RSS 2.0 hírcsatornája"
 
-#: actions/showstream.php:141
+#: actions/showstream.php:152
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "%s Atom hírcsatornája"
 
-#: actions/showstream.php:146
+#. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
+#. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
+#: actions/showstream.php:159
 #, php-format
 msgid "FOAF for %s"
 msgstr ""
 
-#: actions/showstream.php:197
-#, php-format
-msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
+#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
+#: actions/showstream.php:211
+#, fuzzy, php-format
+msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr "Ez %1$s története, de %2$s még nem tett közzé hírt."
 
-#: actions/showstream.php:202
+#. TRANS: Second sentence of empty list message for a stream for the user themselves.
+#: actions/showstream.php:217
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
 msgstr ""
 
-#: actions/showstream.php:204
+#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:221
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
 "%?status_textarea=%2$s)."
 msgstr ""
 
-#: actions/showstream.php:243
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:264
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4774,7 +4813,9 @@ msgstr ""
 "register%%%%) és kövesd nyomon **%s** pletykáit - és még rengeteg mást! "
 "([Tudj meg többet](%%%%doc.help%%%%))"
 
-#: actions/showstream.php:248
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:271
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4785,7 +4826,8 @@ msgstr ""
 "wiki/Mikroblog#Mikroblog) ír egy webhelyen, ami a szabad [StatusNet](http://"
 "status.net/) szoftverre épült. "
 
-#: actions/showstream.php:305
+#. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
+#: actions/showstream.php:328
 #, php-format
 msgid "Repeat of %s"
 msgstr "%s ismétlése"
@@ -4895,31 +4937,38 @@ msgstr "Duplázások korlátja"
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:56
+#. TRANS: Page title for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:55
 msgid "Site Notice"
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:67
+#. TRANS: Instructions for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:66
 msgid "Edit site-wide message"
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:103
+#. TRANS: Server error displayed when saving a site-wide notice was impossible.
+#: actions/sitenoticeadminpanel.php:101
 msgid "Unable to save site notice."
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:113
-msgid "Max length for the site-wide notice is 255 chars."
+#. TRANS: Client error displayed when a site-wide notice was longer than allowed.
+#: actions/sitenoticeadminpanel.php:112
+msgid "Maximum length for the site-wide notice is 255 characters."
 msgstr ""
 
+#. TRANS: Label for site-wide notice text field in admin panel.
 #: actions/sitenoticeadminpanel.php:176
 msgid "Site notice text"
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:178
-msgid "Site-wide notice text (255 chars max; HTML okay)"
+#. TRANS: Tooltip for site-wide notice text field in admin panel.
+#: actions/sitenoticeadminpanel.php:179
+msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:198
+#. TRANS: Title for button to save site notice in admin panel.
+#: actions/sitenoticeadminpanel.php:201
 msgid "Save site notice"
 msgstr ""
 
@@ -5360,75 +5409,93 @@ msgid ""
 msgstr ""
 
 #. TRANS: User admin panel title
-#: actions/useradminpanel.php:60
+#: actions/useradminpanel.php:58
 msgctxt "TITLE"
 msgid "User"
 msgstr ""
 
-#: actions/useradminpanel.php:71
+#. TRANS: Instruction for user admin panel.
+#: actions/useradminpanel.php:69
 msgid "User settings for this StatusNet site"
 msgstr ""
 
-#: actions/useradminpanel.php:150
+#. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
+#: actions/useradminpanel.php:147
 msgid "Invalid bio limit. Must be numeric."
 msgstr ""
 
-#: actions/useradminpanel.php:156
-msgid "Invalid welcome text. Max length is 255 characters."
-msgstr ""
+#. TRANS: Form validation error in user admin panel when welcome text is too long.
+#: actions/useradminpanel.php:154
+#, fuzzy
+msgid "Invalid welcome text. Maximum length is 255 characters."
+msgstr "Érvénytelen SSL szerver. A maximális hossz 255 karakter."
 
+#. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
+#. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
 #, php-format
-msgid "Invalid default subscripton: '%1$s' is not user."
+msgid "Invalid default subscripton: '%1$s' is not a user."
 msgstr ""
 
 #. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:106
+#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
 #: lib/personalgroupnav.php:109
 msgid "Profile"
 msgstr "Profil"
 
-#: actions/useradminpanel.php:223
+#. TRANS: Field label in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:220
 msgid "Bio Limit"
 msgstr "Bemutatkozás méretkorlátja"
 
-#: actions/useradminpanel.php:224
+#. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:222
 msgid "Maximum length of a profile bio in characters."
 msgstr ""
 
-#: actions/useradminpanel.php:232
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:231
 msgid "New users"
 msgstr "Új felhasználók"
 
+#. TRANS: Field label in user admin panel for setting new user welcome text.
 #: actions/useradminpanel.php:236
 msgid "New user welcome"
 msgstr ""
 
-#: actions/useradminpanel.php:237
-msgid "Welcome text for new users (Max 255 chars)."
-msgstr ""
+#. TRANS: Tooltip in user admin panel for setting new user welcome text.
+#: actions/useradminpanel.php:238
+#, fuzzy
+msgid "Welcome text for new users (maximum 255 characters)."
+msgstr "A teljes név túl hosszú (legfeljebb 255 karakter lehet)."
 
-#: actions/useradminpanel.php:242
+#. TRANS: Field label in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:244
 msgid "Default subscription"
 msgstr ""
 
-#: actions/useradminpanel.php:243
+#. TRANS: Tooltip in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:246
 msgid "Automatically subscribe new users to this user."
 msgstr ""
 
-#: actions/useradminpanel.php:252
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:256
 msgid "Invitations"
 msgstr "Meghívások"
 
-#: actions/useradminpanel.php:257
+#. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:262
 msgid "Invitations enabled"
 msgstr "A meghívások engedélyezve vannak"
 
-#: actions/useradminpanel.php:259
+#. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:265
 msgid "Whether to allow users to invite new users."
 msgstr ""
 
-#: actions/useradminpanel.php:295
+#. TRANS: Title for button to save user settings in user admin panel.
+#: actions/useradminpanel.php:302
 msgid "Save user settings"
 msgstr ""
 
@@ -5616,7 +5683,7 @@ msgid "Plugins"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:831
+#: actions/version.php:198 lib/action.php:880
 msgid "Version"
 msgstr ""
 
@@ -5819,16 +5886,23 @@ msgstr "Nem sikerült menteni a profilt."
 msgid "RT @%1$s %2$s"
 msgstr ""
 
+#. TRANS: Full name of a profile or group followed by nickname in parens
+#: classes/Profile.php:164
+#, fuzzy, php-format
+msgctxt "FANCYNAME"
+msgid "%1$s (%2$s)"
+msgstr "%1$s - %2$s"
+
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:791
+#: classes/Profile.php:812
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:800
+#: classes/Profile.php:821
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -5973,194 +6047,201 @@ msgstr "%1$s - %2$s"
 msgid "Untitled page"
 msgstr "Név nélküli oldal"
 
+#. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
+#: lib/action.php:310
+msgctxt "TOOLTIP"
+msgid "Show more"
+msgstr ""
+
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:477
+#: lib/action.php:526
 msgid "Primary site navigation"
 msgstr "Elsődleges navigáció"
 
 #. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:483
+#: lib/action.php:532
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr ""
 
 #. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:486
+#: lib/action.php:535
 msgctxt "MENU"
 msgid "Personal"
 msgstr ""
 
 #. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:488
+#: lib/action.php:537
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
 msgstr ""
 
 #. TRANS: Main menu option when logged in for access to user settings
-#: lib/action.php:491
+#: lib/action.php:540
 msgid "Account"
 msgstr "Kontó"
 
 #. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:493
+#: lib/action.php:542
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr ""
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:496
+#: lib/action.php:545
 msgid "Connect"
 msgstr "Kapcsolódás"
 
 #. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:499
+#: lib/action.php:548
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr ""
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:502 lib/groupnav.php:117
+#: lib/action.php:551 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr ""
 
 #. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:506
+#: lib/action.php:555
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr ""
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:509
+#: lib/action.php:558
 msgctxt "MENU"
 msgid "Invite"
 msgstr ""
 
 #. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:515
+#: lib/action.php:564
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr ""
 
 #. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:518
+#: lib/action.php:567
 msgctxt "MENU"
 msgid "Logout"
 msgstr ""
 
 #. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:523
+#: lib/action.php:572
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr ""
 
 #. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:526
+#: lib/action.php:575
 msgctxt "MENU"
 msgid "Register"
 msgstr ""
 
 #. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:529
+#: lib/action.php:578
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr ""
 
 #. TRANS: Main menu option when not logged in to log in
-#: lib/action.php:532
+#: lib/action.php:581
 msgctxt "MENU"
 msgid "Login"
 msgstr ""
 
 #. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:535
+#: lib/action.php:584
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr ""
 
 #. TRANS: Main menu option for help on the StatusNet site
-#: lib/action.php:538
+#: lib/action.php:587
 msgctxt "MENU"
 msgid "Help"
 msgstr ""
 
 #. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:541
+#: lib/action.php:590
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr ""
 
 #. TRANS: Main menu option when logged in or when the StatusNet instance is not private
-#: lib/action.php:544
+#: lib/action.php:593
 msgctxt "MENU"
 msgid "Search"
 msgstr ""
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:566 lib/adminpanelaction.php:387
+#: lib/action.php:615 lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "A webhely híre"
 
 #. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:633
+#: lib/action.php:682
 msgid "Local views"
 msgstr ""
 
 #. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:703
+#: lib/action.php:752
 msgid "Page notice"
 msgstr ""
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:804
+#: lib/action.php:853
 msgid "Secondary site navigation"
 msgstr "Másodlagos navigáció"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:810
+#: lib/action.php:859
 msgid "Help"
 msgstr "Súgó"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:813
+#: lib/action.php:862
 msgid "About"
 msgstr "Névjegy"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:816
+#: lib/action.php:865
 msgid "FAQ"
 msgstr "GyIK"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:821
+#: lib/action.php:870
 msgid "TOS"
 msgstr "Felhasználási feltételek"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:825
+#: lib/action.php:874
 msgid "Privacy"
 msgstr ""
 
-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:828
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+#: lib/action.php:877
 msgid "Source"
 msgstr "Forrás"
 
-#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:834
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+#: lib/action.php:884
 msgid "Contact"
 msgstr "Kapcsolat"
 
-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:837
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+#: lib/action.php:887
 msgid "Badge"
 msgstr ""
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:866
+#: lib/action.php:916
 msgid "StatusNet software license"
 msgstr "A StatusNet szoftver licence"
 
@@ -6168,7 +6249,7 @@ msgstr "A StatusNet szoftver licence"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:873
+#: lib/action.php:923
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -6176,7 +6257,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:876
+#: lib/action.php:926
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr ""
@@ -6185,7 +6266,7 @@ msgstr ""
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:883
+#: lib/action.php:933
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -6194,50 +6275,50 @@ msgid ""
 msgstr ""
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:899
+#: lib/action.php:949
 msgid "Site content license"
 msgstr "A webhely tartalmára vonatkozó licenc"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:906
+#: lib/action.php:956
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:913
+#: lib/action.php:963
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:917
+#: lib/action.php:967
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:949
+#: lib/action.php:999
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1285
+#: lib/action.php:1335
 msgid "Pagination"
 msgstr ""
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1296
+#: lib/action.php:1346
 msgid "After"
 msgstr "Utána"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1306
+#: lib/action.php:1356
 msgid "Before"
 msgstr "Előtte"
 
@@ -6580,7 +6661,7 @@ msgid "AJAX error"
 msgstr "Ajax-hiba"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:233 lib/mailhandler.php:142
+#: lib/channel.php:233 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr ""
 
@@ -6596,7 +6677,7 @@ msgstr ""
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:626
+#: lib/command.php:99 lib/command.php:630
 msgid "User has no last notice."
 msgstr ""
 
@@ -6665,6 +6746,14 @@ msgstr ""
 msgid "%1$s left group %2$s."
 msgstr ""
 
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: lib/command.php:426
+#, fuzzy, php-format
+msgctxt "WHOIS"
+msgid "%1$s (%2$s)"
+msgstr "%1$s - %2$s"
+
 #. TRANS: Whois output. %s is the full name of the queried user.
 #: lib/command.php:430
 #, php-format
@@ -6702,133 +6791,137 @@ msgid ""
 "same server."
 msgstr ""
 
-#. TRANS: Message given if content is too long.
+#. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
 #: lib/command.php:488
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] "Az túl hosszú. Egy hír legfeljebb %d karakterből állhat."
+msgstr[1] "Az túl hosszú. Egy hír legfeljebb %d karakterből állhat."
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:514
+#: lib/command.php:516
 msgid "Error sending direct message."
 msgstr "Hiba a közvetlen üzenet küldése közben."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:551
+#: lib/command.php:553
 #, php-format
 msgid "Notice from %s repeated."
 msgstr ""
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:554
+#: lib/command.php:556
 msgid "Error repeating notice."
 msgstr "Hiba a hír ismétlésekor."
 
-#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:589
-#, php-format
-msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
+#: lib/command.php:591
+#, fuzzy, php-format
+msgid "Notice too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] "Az túl hosszú. Egy hír legfeljebb %d karakterből állhat."
+msgstr[1] "Az túl hosszú. Egy hír legfeljebb %d karakterből állhat."
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:600
+#: lib/command.php:604
 #, php-format
 msgid "Reply to %s sent."
 msgstr ""
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:603
+#: lib/command.php:607
 msgid "Error saving notice."
 msgstr "Hiba a hír elmentésekor."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:650
+#: lib/command.php:654
 msgid "Specify the name of the user to subscribe to."
 msgstr ""
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:659
+#: lib/command.php:663
 msgid "Can't subscribe to OMB profiles by command."
 msgstr ""
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:667
+#: lib/command.php:671
 #, php-format
 msgid "Subscribed to %s."
 msgstr ""
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:688 lib/command.php:799
+#: lib/command.php:692 lib/command.php:803
 msgid "Specify the name of the user to unsubscribe from."
 msgstr ""
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:699
+#: lib/command.php:703
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:719 lib/command.php:745
+#: lib/command.php:723 lib/command.php:749
 msgid "Command not yet implemented."
 msgstr ""
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:723
+#: lib/command.php:727
 msgid "Notification off."
 msgstr "Ne legyenek értesítések."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:726
+#: lib/command.php:730
 msgid "Can't turn off notification."
 msgstr ""
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:749
+#: lib/command.php:753
 msgid "Notification on."
 msgstr "Legyenek értesítések."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:752
+#: lib/command.php:756
 msgid "Can't turn on notification."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:766
+#: lib/command.php:770
 msgid "Login command is disabled."
 msgstr ""
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:779
+#: lib/command.php:783
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:808
+#: lib/command.php:812
 #, php-format
 msgid "Unsubscribed %s."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:826
+#: lib/command.php:830
 msgid "You are not subscribed to anyone."
 msgstr "Senkinek sem iratkoztál fel a híreire."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:831
+#: lib/command.php:835
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Ezen személy híreire iratkoztál fel:"
@@ -6836,14 +6929,14 @@ msgstr[1] "Ezen emberek híreire iratkoztál fel:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:853
+#: lib/command.php:857
 msgid "No one is subscribed to you."
 msgstr "Senki sem követ figyelemmel."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:858
+#: lib/command.php:862
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Ez a személy iratkozott fel a híreidre:"
@@ -6851,21 +6944,21 @@ msgstr[1] "Ezek az emberek iratkoztak fel a híreidre:"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:880
+#: lib/command.php:884
 msgid "You are not a member of any groups."
 msgstr "Nem vagy tagja semmilyen csoportnak."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:885
+#: lib/command.php:889
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Ennek a csoportnak vagy tagja:"
 msgstr[1] "Ezeknek a csoportoknak vagy tagja:"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:900
+#: lib/command.php:904
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -7055,7 +7148,8 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 kisbetű vagy számjegy, nem lehet benne írásjel vagy szóköz"
 
 #: lib/groupeditform.php:163
-msgid "URL of the homepage or blog of the group or topic"
+#, fuzzy
+msgid "URL of the homepage or blog of the group or topic."
 msgstr "A csoporthoz vagy témához tartozó honlap illetve blog URL-je"
 
 #: lib/groupeditform.php:168
@@ -7063,21 +7157,32 @@ msgid "Describe the group or topic"
 msgstr "Jellemezd a csoportot vagy a témát"
 
 #: lib/groupeditform.php:170
-#, php-format
-msgid "Describe the group or topic in %d characters"
-msgstr "Jellemezd a csoportot vagy a témát %d karakterben"
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d character or less"
+msgid_plural "Describe the group or topic in %d characters or less"
+msgstr[0] "Jellemezd a csoportot vagy a témát %d karakterben"
+msgstr[1] "Jellemezd a csoportot vagy a témát %d karakterben"
 
-#: lib/groupeditform.php:179
+#: lib/groupeditform.php:182
+#, fuzzy
 msgid ""
-"Location for the group, if any, like \"City, State (or Region), Country\""
+"Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr ""
 "A csoport földrajzi elhelyezkedése, ha van ilyen, pl. \"Város, Megye, Ország"
 "\""
 
-#: lib/groupeditform.php:187
-#, php-format
-msgid "Extra nicknames for the group, comma- or space- separated, max %d"
-msgstr ""
+#: lib/groupeditform.php:190
+#, fuzzy, php-format
+msgid ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"alias allowed."
+msgid_plural ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"aliases allowed."
+msgstr[0] ""
+"Extra becenevek a csoport számára, vesszővel vagy szóközökkel elválasztva, "
+"legfeljebb %d"
+msgstr[1] ""
 "Extra becenevek a csoport számára, vesszővel vagy szóközökkel elválasztva, "
 "legfeljebb %d"
 
@@ -7599,7 +7704,7 @@ msgstr "Sajnos az nem a te bejövő email-címed."
 msgid "Sorry, no incoming email allowed."
 msgstr "Sajnos a bejövő email nincs engedélyezve."
 
-#: lib/mailhandler.php:228
+#: lib/mailhandler.php:229
 #, php-format
 msgid "Unsupported message type: %s"
 msgstr "Nem támogatott üzenet-típus: %s"
@@ -7940,16 +8045,17 @@ msgid "Sandbox this user"
 msgstr ""
 
 #. TRANS: Fieldset legend for the search form.
-#: lib/searchaction.php:121
+#: lib/searchaction.php:120
 msgid "Search site"
 msgstr ""
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
-#: lib/searchaction.php:129
+#: lib/searchaction.php:128
 msgid "Keyword(s)"
 msgstr ""
 
+#. TRANS: Button text for searching site.
 #: lib/searchaction.php:130
 msgctxt "BUTTON"
 msgid "Search"
@@ -8039,8 +8145,8 @@ msgid "The theme file is missing or the upload failed."
 msgstr ""
 
 #: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:278 lib/themeuploader.php:282
-#: lib/themeuploader.php:290 lib/themeuploader.php:297
+#: lib/themeuploader.php:279 lib/themeuploader.php:283
+#: lib/themeuploader.php:291 lib/themeuploader.php:298
 msgid "Failed saving theme."
 msgstr ""
 
@@ -8050,29 +8156,32 @@ msgstr ""
 
 #: lib/themeuploader.php:166
 #, php-format
-msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
-msgstr ""
+msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
+msgid_plural ""
+"Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr[0] ""
+msgstr[1] ""
 
-#: lib/themeuploader.php:178
+#: lib/themeuploader.php:179
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr ""
 
-#: lib/themeuploader.php:218
+#: lib/themeuploader.php:219
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
 msgstr ""
 
-#: lib/themeuploader.php:224
+#: lib/themeuploader.php:225
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr ""
 
-#: lib/themeuploader.php:241
+#: lib/themeuploader.php:242
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr ""
 
-#: lib/themeuploader.php:259
+#: lib/themeuploader.php:260
 msgid "Error opening theme archive."
 msgstr ""
 
@@ -8253,22 +8362,37 @@ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
 msgstr[0] "Az túl hosszú. Egy hír legfeljebb %d karakterből állhat."
 msgstr[1] "Az túl hosszú. Egy hír legfeljebb %d karakterből állhat."
 
-#: scripts/restoreuser.php:82
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: scripts/restoreuser.php:61
 #, php-format
-msgid "Backup file for user %s (%s)"
+msgid "Getting backup from file '%s'."
 msgstr ""
 
-#: scripts/restoreuser.php:88
+#. TRANS: Commandline script output.
+#: scripts/restoreuser.php:91
 msgid "No user specified; using backup user."
 msgstr ""
 
-#: scripts/restoreuser.php:94
+#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
+#: scripts/restoreuser.php:98
 #, php-format
-msgid "%d entries in backup."
-msgstr ""
+msgid "%d entry in backup."
+msgid_plural "%d entries in backup."
+msgstr[0] ""
+msgstr[1] ""
+
+#, fuzzy
+#~ msgid "Name is too long (maximum 255 chars)."
+#~ msgstr "A név túl hosszú (max 255 karakter lehet)."
+
+#, fuzzy
+#~ msgid "Organization is too long (maximum 255 chars)."
+#~ msgstr "A szervezet túl hosszú (255 karakter lehet)."
 
-#~ msgid "Description is too long (max %d chars)."
-#~ msgstr "A leírás túl hosszú (legfeljebb %d karakter lehet)."
+#~ msgid "That's too long. Max notice size is %d chars."
+#~ msgstr "Az túl hosszú. Egy hír legfeljebb %d karakterből állhat."
 
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "Túl sok álnév! Legfeljebb %d lehet."
+#~ msgid "Max notice size is %d chars, including attachment URL."
+#~ msgstr ""
+#~ "Egy hír legfeljebb %d karakterből állhat, a melléklet URL-jét is "
+#~ "beleértve."
diff --git a/locale/ia/LC_MESSAGES/statusnet.po b/locale/ia/LC_MESSAGES/statusnet.po
index e78db5e5b..73afea5a8 100644
--- a/locale/ia/LC_MESSAGES/statusnet.po
+++ b/locale/ia/LC_MESSAGES/statusnet.po
@@ -9,17 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-30 23:18+0000\n"
-"PO-Revision-Date: 2010-10-30 23:20:23+0000\n"
+"POT-Creation-Date: 2010-11-02 22:51+0000\n"
+"PO-Revision-Date: 2010-11-02 22:53:24+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r75708); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r75875); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2010-10-30 09:48:40+0000\n"
+"X-POT-Import-Date: 2010-10-30 23:42:01+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -76,15 +76,20 @@ msgstr "Salveguardar configurationes de accesso"
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
+#. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
+#. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #: actions/accessadminpanel.php:193 actions/emailsettings.php:228
-#: actions/imsettings.php:187 actions/pathsadminpanel.php:512
-#: actions/profilesettings.php:201 actions/smssettings.php:209
-#: actions/subscriptions.php:246 lib/applicationeditform.php:355
+#: actions/imsettings.php:187 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: lib/applicationeditform.php:355 lib/groupeditform.php:207
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Salveguardar"
@@ -135,7 +140,7 @@ msgstr "Pagina non existe."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:495 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Iste usator non existe."
@@ -208,7 +213,9 @@ msgstr ""
 
 #. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:208
+#. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -562,8 +569,11 @@ msgstr "Le nomine complete es troppo longe (maximo 255 characteres)."
 #. TRANS: Group edit form validation error.
 #. TRANS: Form validation error in New application form.
 #. TRANS: %d is the maximum number of characters for the description.
+#. TRANS: Group create form validation error.
+#. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:220 actions/editapplication.php:201
 #: actions/editgroup.php:216 actions/newapplication.php:178
+#: actions/newgroup.php:152
 #, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -719,14 +729,14 @@ msgstr "Indicio de requesta jam autorisate."
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:172 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:74
 #: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
 #: actions/groupunblock.php:65 actions/imsettings.php:230
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
-#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/othersettings.php:153 actions/passwordsettings.php:138
 #: actions/profilesettings.php:221 actions/recoverpassword.php:350
 #: actions/register.php:172 actions/remotesubscribe.php:77
 #: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
@@ -905,20 +915,21 @@ msgstr "Tu non pote deler le stato de un altere usator."
 
 #. TRANS: Client error displayed trying to repeat a non-existing notice through the API.
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
+#. TRANS: Error message displayed trying to delete a non-existing notice.
 #: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/deletenotice.php:58 actions/shownotice.php:92
+#: actions/deletenotice.php:61 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "Nota non trovate."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:535
+#: actions/apistatusesretweet.php:83 lib/command.php:537
 msgid "Cannot repeat your own notice."
 msgstr "Non pote repeter tu proprie nota."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:541
+#: actions/apistatusesretweet.php:92 lib/command.php:543
 msgid "Already repeated that notice."
 msgstr "Iste nota ha ja essite repetite."
 
@@ -939,7 +950,8 @@ msgstr "Le cliente debe fornir un parametro 'status' con un valor."
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#: actions/apistatusesupdate.php:244
+#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
+#: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
@@ -955,7 +967,7 @@ msgstr "Nota genitor non trovate."
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
-#: actions/apistatusesupdate.php:308
+#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
 #, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
@@ -1134,21 +1146,18 @@ msgstr "Previsualisation"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
 #: actions/avatarsettings.php:155
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "Deler"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
 #: actions/avatarsettings.php:173
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Incargar"
 
 #. TRANS: Button on avatar upload crop form to confirm a selected crop as avatar.
 #: actions/avatarsettings.php:243
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Crop"
 msgstr "Taliar"
@@ -1168,17 +1177,18 @@ msgstr "Selige un area quadrate del imagine pro facer lo tu avatar"
 msgid "Lost our file data."
 msgstr "Datos del file perdite."
 
-#: actions/avatarsettings.php:384
+#. TRANS: Success message for having updated a user avatar.
+#: actions/avatarsettings.php:385
 msgid "Avatar updated."
 msgstr "Avatar actualisate."
 
 #. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
-#: actions/avatarsettings.php:388
+#: actions/avatarsettings.php:389
 msgid "Failed updating avatar."
 msgstr "Actualisation del avatar fallite."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:412
+#: actions/avatarsettings.php:413
 msgid "Avatar deleted."
 msgstr "Avatar delite."
 
@@ -1210,8 +1220,8 @@ msgstr ""
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:154 actions/deleteapplication.php:154
-#: actions/deletegroup.php:220 actions/deletenotice.php:150
+#: actions/block.php:154 actions/deleteapplication.php:157
+#: actions/deletegroup.php:220 actions/deletenotice.php:155
 #: actions/deleteuser.php:152 actions/groupblock.php:178
 msgctxt "BUTTON"
 msgid "No"
@@ -1229,8 +1239,8 @@ msgstr "Non blocar iste usator"
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:161 actions/deleteapplication.php:161
-#: actions/deletegroup.php:227 actions/deletenotice.php:157
+#: actions/block.php:161 actions/deleteapplication.php:164
+#: actions/deletegroup.php:227 actions/deletenotice.php:162
 #: actions/deleteuser.php:159 actions/groupblock.php:185
 msgctxt "BUTTON"
 msgid "Yes"
@@ -1298,7 +1308,6 @@ msgstr "Disblocar le usator del gruppo"
 
 #. TRANS: Button text for unblocking a user from a group.
 #: actions/blockedfromgroup.php:323
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Unblock"
 msgstr "Disblocar"
@@ -1347,12 +1356,13 @@ msgstr "Iste adresse ha ja essite confirmate."
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
 #. TRANS: Server error thrown on database error updating IM preferences.
 #. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
 #. TRANS: Server error thrown when user profile settings could not be updated.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #: actions/confirmaddress.php:118 actions/emailsettings.php:331
 #: actions/emailsettings.php:477 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:174
+#: actions/imsettings.php:442 actions/othersettings.php:184
 #: actions/profilesettings.php:326 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
@@ -1361,9 +1371,8 @@ msgstr "Non poteva actualisar usator."
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
 #: actions/confirmaddress.php:132
-#, fuzzy
 msgid "Could not delete address confirmation."
-msgstr "Non poteva deler confirmation de messageria instantanee."
+msgstr "Non poteva deler le confirmation de adresse."
 
 #. TRANS: Title for the contact address confirmation action.
 #: actions/confirmaddress.php:150
@@ -1388,16 +1397,19 @@ msgstr "Conversation"
 msgid "Notices"
 msgstr "Notas"
 
-#: actions/deleteapplication.php:63
+#. TRANS: Client error displayed trying to delete an application while not logged in.
+#: actions/deleteapplication.php:62
 msgid "You must be logged in to delete an application."
 msgstr "Tu debe aperir un session pro deler un application."
 
+#. TRANS: Client error displayed trying to delete an application that does not exist.
 #: actions/deleteapplication.php:71
 msgid "Application not found."
 msgstr "Application non trovate."
 
+#. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
-#: actions/deleteapplication.php:78 actions/editapplication.php:78
+#: actions/deleteapplication.php:79 actions/editapplication.php:78
 #: actions/showapplication.php:94
 msgid "You are not the owner of this application."
 msgstr "Tu non es le proprietario de iste application."
@@ -1405,15 +1417,18 @@ msgstr "Tu non es le proprietario de iste application."
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
 #: actions/newapplication.php:114 actions/showapplication.php:118
-#: lib/action.php:1354
+#: lib/action.php:1404
 msgid "There was a problem with your session token."
 msgstr "Il habeva un problema con tu indicio de session."
 
-#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+#. TRANS: Title for delete application page.
+#. TRANS: Fieldset legend on delete application page.
+#: actions/deleteapplication.php:124 actions/deleteapplication.php:149
 msgid "Delete application"
 msgstr "Deler application"
 
-#: actions/deleteapplication.php:149
+#. TRANS: Confirmation text on delete application page.
+#: actions/deleteapplication.php:152
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
 "about the application from the database, including all existing user "
@@ -1424,12 +1439,12 @@ msgstr ""
 "de usator."
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:158
+#: actions/deleteapplication.php:161
 msgid "Do not delete this application"
 msgstr "Non deler iste application"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:164
+#: actions/deleteapplication.php:167
 msgid "Delete this application"
 msgstr "Deler iste application"
 
@@ -1463,12 +1478,13 @@ msgstr "Non poteva deler le gruppo %s."
 msgid "Deleted group %s"
 msgstr "Deleva gruppo %s"
 
-#. TRANS: Title.
+#. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
 #: actions/deletegroup.php:176 actions/deletegroup.php:202
 msgid "Delete group"
 msgstr "Deler gruppo"
 
+#. TRANS: Warning in form for deleleting a group.
 #: actions/deletegroup.php:206
 msgid ""
 "Are you sure you want to delete this group? This will clear all data about "
@@ -1489,10 +1505,11 @@ msgstr "Non deler iste gruppo"
 msgid "Delete this group"
 msgstr "Deler iste gruppo"
 
+#. TRANS: Error message displayed trying to delete a notice while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1502,11 +1519,13 @@ msgstr "Deler iste gruppo"
 msgid "Not logged in."
 msgstr "Tu non ha aperite un session."
 
-#: actions/deletenotice.php:74
+#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
+#: actions/deletenotice.php:78
 msgid "Can't delete this notice."
 msgstr "Non pote deler iste nota."
 
-#: actions/deletenotice.php:106
+#. TRANS: Instructions for deleting a notice.
+#: actions/deletenotice.php:110
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
@@ -1514,21 +1533,24 @@ msgstr ""
 "Tu es super le puncto de deler permanentemente un nota. Un vice facite, isto "
 "non pote esser disfacite."
 
-#: actions/deletenotice.php:112 actions/deletenotice.php:144
+#. TRANS: Page title when deleting a notice.
+#. TRANS: Fieldset legend for the delete notice form.
+#: actions/deletenotice.php:117 actions/deletenotice.php:148
 msgid "Delete notice"
 msgstr "Deler nota"
 
-#: actions/deletenotice.php:147
+#. TRANS: Message for the delete notice form.
+#: actions/deletenotice.php:152
 msgid "Are you sure you want to delete this notice?"
 msgstr "Es tu secur de voler deler iste nota?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:154
+#: actions/deletenotice.php:159
 msgid "Do not delete this notice"
 msgstr "Non deler iste nota"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:161 lib/noticelist.php:667
+#: actions/deletenotice.php:166 lib/noticelist.php:667
 msgid "Delete this notice"
 msgstr "Deler iste nota"
 
@@ -1692,11 +1714,9 @@ msgstr "Revenir al predefinitiones"
 
 #. TRANS: Submit button title.
 #: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
-#: actions/othersettings.php:126 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: actions/useradminpanel.php:295 lib/applicationeditform.php:357
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: lib/applicationeditform.php:357 lib/designsettings.php:256
 msgid "Save"
 msgstr "Salveguardar"
 
@@ -1744,8 +1764,9 @@ msgid "Name is required."
 msgstr "Le nomine es requirite."
 
 #. TRANS: Validation error shown when providing too long a name in the "Edit application" form.
-#: actions/editapplication.php:188
-msgid "Name is too long (max 255 characters)."
+#: actions/editapplication.php:188 actions/newapplication.php:169
+#, fuzzy
+msgid "Name is too long (maximum 255 characters)."
 msgstr "Le nomine es troppo longe (max. 255 characteres)."
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
@@ -1774,7 +1795,7 @@ msgid "Organization is required."
 msgstr "Le organisation es requirite."
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#: actions/editapplication.php:223
+#: actions/editapplication.php:223 actions/newapplication.php:199
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "Le organisation es troppo longe (maximo 255 characteres)."
 
@@ -2571,7 +2592,7 @@ msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Publicar un MicroID pro mi adresse Jabber/GTalk."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:180
+#: actions/imsettings.php:290 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "Preferentias confirmate."
 
@@ -2694,10 +2715,9 @@ msgstr[1] "Tu es ja subscribite a iste usatores:"
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#. TRANS: Whois output.
-#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:145 actions/invite.php:159 lib/command.php:426
-#, php-format
+#: actions/invite.php:145 actions/invite.php:159
+#, fuzzy, php-format
+msgctxt "INVITE"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
@@ -2882,7 +2902,8 @@ msgstr ""
 "derectos reservate\"."
 
 #: actions/licenseadminpanel.php:156
-msgid "Invalid license title. Max length is 255 characters."
+#, fuzzy
+msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "Titulo de licentia invalide. Longitude maximal es 255 characteres."
 
 #: actions/licenseadminpanel.php:168
@@ -3056,18 +3077,10 @@ msgstr "Tu debe aperir un session pro registrar un application."
 msgid "Use this form to register a new application."
 msgstr "Usa iste formulario pro registrar un nove application."
 
-#: actions/newapplication.php:169
-msgid "Name is too long (maximum 255 chars)."
-msgstr "Le nomine es troppo longe (maximo 255 characteres)."
-
 #: actions/newapplication.php:184
 msgid "Source URL is required."
 msgstr "Le URL de origine es requirite."
 
-#: actions/newapplication.php:199
-msgid "Organization is too long (maximum 255 chars)."
-msgstr "Le organisation es troppo longe (maximo 255 characteres)."
-
 #: actions/newapplication.php:266 actions/newapplication.php:275
 msgid "Could not create application."
 msgstr "Non poteva crear application."
@@ -3087,14 +3100,14 @@ msgid "New message"
 msgstr "Nove message"
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:499
+#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501
 msgid "You can't send a message to this user."
 msgstr "Tu non pote inviar un message a iste usator."
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
 #: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
-#: lib/command.php:579
+#: lib/command.php:581
 msgid "No content!"
 msgstr "Nulle contento!"
 
@@ -3103,7 +3116,7 @@ msgid "No recipient specified."
 msgstr "Nulle destinatario specificate."
 
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:503
+#: actions/newmessage.php:167 lib/command.php:505
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "Non invia un message a te mesme; il suffice susurrar lo discretemente."
@@ -3114,12 +3127,12 @@ msgstr "Message inviate"
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:511
+#: actions/newmessage.php:188 lib/command.php:513
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Message directe a %s inviate."
 
-#: actions/newmessage.php:213 actions/newnotice.php:263
+#: actions/newmessage.php:213 actions/newnotice.php:264
 msgid "Ajax Error"
 msgstr "Error de Ajax"
 
@@ -3127,20 +3140,7 @@ msgstr "Error de Ajax"
 msgid "New notice"
 msgstr "Nove nota"
 
-#: actions/newnotice.php:159 lib/mailhandler.php:60
-#, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr ""
-"Isto es troppo longe. Le longitude maximal del notas es %d characteres."
-
-#: actions/newnotice.php:183
-#, php-format
-msgid "Max notice size is %d chars, including attachment URL."
-msgstr ""
-"Le longitude maximal del notas es %d characteres, includente le URL "
-"adjungite."
-
-#: actions/newnotice.php:229
+#: actions/newnotice.php:230
 msgid "Notice posted"
 msgstr "Nota publicate"
 
@@ -3313,36 +3313,46 @@ msgstr "Recerca de personas"
 msgid "Notice Search"
 msgstr "Rercerca de notas"
 
-#: actions/othersettings.php:60
+#: actions/othersettings.php:59
 msgid "Other settings"
 msgstr "Altere configurationes"
 
+#. TRANS: Instructions for tab "Other" in user profile settings.
 #: actions/othersettings.php:71
 msgid "Manage various other options."
 msgstr "Gestion de varie altere optiones."
 
-#: actions/othersettings.php:108
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/othersettings.php:111
 msgid " (free service)"
 msgstr "  (servicio gratuite)"
 
-#: actions/othersettings.php:116
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/othersettings.php:120
 msgid "Shorten URLs with"
 msgstr "Accurtar URLs con"
 
-#: actions/othersettings.php:117
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/othersettings.php:122
 msgid "Automatic shortening service to use."
 msgstr "Le servicio de accurtamento automatic a usar."
 
-#: actions/othersettings.php:122
+#. TRANS: Label for checkbox.
+#: actions/othersettings.php:128
 msgid "View profile designs"
 msgstr "Vider apparentias de profilo"
 
-#: actions/othersettings.php:123
+#. TRANS: Tooltip for checkbox.
+#: actions/othersettings.php:130
 msgid "Show or hide profile designs."
 msgstr "Monstrar o celar apparentias de profilo."
 
-#: actions/othersettings.php:153
-msgid "URL shortening service is too long (max 50 chars)."
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/othersettings.php:162
+#, fuzzy
+msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "Le servicio de accurtamento de URL es troppo longe (max 50 chars)."
 
 #: actions/otp.php:69
@@ -3813,7 +3823,7 @@ msgstr "Bio"
 #. TRANS: Label for group location (dt). Text hidden by default.
 #: actions/profilesettings.php:149 actions/register.php:485
 #: actions/showgroup.php:267 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:177
+#: actions/userauthorization.php:166 lib/groupeditform.php:180
 #: lib/userprofile.php:165
 msgid "Location"
 msgstr "Loco"
@@ -4152,7 +4162,8 @@ msgid "Unexpected password reset."
 msgstr "Reinitialisation inexpectate del contrasigno."
 
 #: actions/recoverpassword.php:365
-msgid "Password must be 6 chars or more."
+#, fuzzy
+msgid "Password must be 6 characters or more."
 msgstr "Le contrasigno debe haber 6 characteres o plus."
 
 #: actions/recoverpassword.php:369
@@ -4529,7 +4540,7 @@ msgstr "Organisation"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:172
+#: lib/applicationeditform.php:208 lib/groupeditform.php:175
 msgid "Description"
 msgstr "Description"
 
@@ -4681,7 +4692,7 @@ msgid "Note"
 msgstr "Nota"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:298 lib/groupeditform.php:184
+#: actions/showgroup.php:298 lib/groupeditform.php:187
 msgid "Aliases"
 msgstr "Aliases"
 
@@ -4733,14 +4744,12 @@ msgstr "Tote le membros"
 
 #. TRANS: Label for creation date in statistics on group page.
 #: actions/showgroup.php:458
-#, fuzzy
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Create"
 
 #. TRANS: Label for member count in statistics on group page.
 #: actions/showgroup.php:466
-#, fuzzy
 msgctxt "LABEL"
 msgid "Members"
 msgstr "Membros"
@@ -4813,48 +4822,68 @@ msgstr "Message de %1$s in %2$s"
 msgid "Notice deleted."
 msgstr "Nota delite."
 
-#: actions/showstream.php:72
-#, php-format
-msgid " tagged %s"
-msgstr "  con etiquetta %s"
+#. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
+#: actions/showstream.php:70
+#, fuzzy, php-format
+msgid "%1$s tagged %2$s"
+msgstr "%1$s, pagina %2$d"
 
-#: actions/showstream.php:78
+#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#: actions/showstream.php:74
+#, fuzzy, php-format
+msgid "%1$s tagged %2$s, page %3$d"
+msgstr "Notas etiquettate con %1$s, pagina %2$d"
+
+#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$d is the page number.
+#: actions/showstream.php:82
 #, php-format
 msgid "%1$s, page %2$d"
 msgstr "%1$s, pagina %2$d"
 
-#: actions/showstream.php:120
+#. TRANS: Title for link to notice feed.
+#. TRANS: %1$s is a user nickname, %2$s is a hashtag.
+#: actions/showstream.php:127
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Syndication de notas pro %1$s con etiquetta %2$s (RSS 1.0)"
 
-#: actions/showstream.php:127
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:136
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "Syndication de notas pro %s (RSS 1.0)"
 
-#: actions/showstream.php:134
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:145
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "Syndication de notas pro %s (RSS 2.0)"
 
-#: actions/showstream.php:141
+#: actions/showstream.php:152
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "Syndication de notas pro %s (Atom)"
 
-#: actions/showstream.php:146
+#. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
+#. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
+#: actions/showstream.php:159
 #, php-format
 msgid "FOAF for %s"
 msgstr "Amico de un amico pro %s"
 
-#: actions/showstream.php:197
-#, php-format
-msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
+#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
+#: actions/showstream.php:211
+#, fuzzy, php-format
+msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr ""
 "Isto es le chronologia pro %1$s, ma %2$s non ha ancora publicate alique."
 
-#: actions/showstream.php:202
+#. TRANS: Second sentence of empty list message for a stream for the user themselves.
+#: actions/showstream.php:217
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -4862,7 +4891,9 @@ msgstr ""
 "Videva tu qualcosa de interessante recentemente? Tu non ha ancora publicate "
 "alcun nota, dunque iste es un bon momento pro comenciar :)"
 
-#: actions/showstream.php:204
+#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:221
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -4871,7 +4902,9 @@ msgstr ""
 "Tu pote tentar dar un pulsata a %1$s o [publicar un nota a su attention](%%%%"
 "action.newnotice%%%%?status_textarea=%2$s)."
 
-#: actions/showstream.php:243
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:264
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4885,7 +4918,9 @@ msgstr ""
 "pro sequer le notas de **%s** e multe alteres! ([Lege plus](%%%%doc.help%%%"
 "%))"
 
-#: actions/showstream.php:248
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:271
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4896,7 +4931,8 @@ msgstr ""
 "(http://en.wikipedia.org/wiki/Microblog) a base del software libere "
 "[StatusNet](http://status.net/). "
 
-#: actions/showstream.php:305
+#. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
+#: actions/showstream.php:328
 #, php-format
 msgid "Repeat of %s"
 msgstr "Repetition de %s"
@@ -5010,32 +5046,41 @@ msgstr ""
 "Quante tempore (in secundas) le usatores debe attender ante de poter "
 "publicar le mesme cosa de novo."
 
-#: actions/sitenoticeadminpanel.php:56
+#. TRANS: Page title for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:55
 msgid "Site Notice"
 msgstr "Aviso del sito"
 
-#: actions/sitenoticeadminpanel.php:67
+#. TRANS: Instructions for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:66
 msgid "Edit site-wide message"
 msgstr "Modificar message a tote le sito"
 
-#: actions/sitenoticeadminpanel.php:103
+#. TRANS: Server error displayed when saving a site-wide notice was impossible.
+#: actions/sitenoticeadminpanel.php:101
 msgid "Unable to save site notice."
 msgstr "Impossibile salveguardar le aviso del sito."
 
-#: actions/sitenoticeadminpanel.php:113
-msgid "Max length for the site-wide notice is 255 chars."
+#. TRANS: Client error displayed when a site-wide notice was longer than allowed.
+#: actions/sitenoticeadminpanel.php:112
+#, fuzzy
+msgid "Maximum length for the site-wide notice is 255 characters."
 msgstr "Le longitude maxime del aviso a tote le sito es 255 characteres."
 
+#. TRANS: Label for site-wide notice text field in admin panel.
 #: actions/sitenoticeadminpanel.php:176
 msgid "Site notice text"
 msgstr "Texto del aviso del sito"
 
-#: actions/sitenoticeadminpanel.php:178
-msgid "Site-wide notice text (255 chars max; HTML okay)"
+#. TRANS: Tooltip for site-wide notice text field in admin panel.
+#: actions/sitenoticeadminpanel.php:179
+#, fuzzy
+msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr ""
 "Le texto del aviso a tote le sito (max. 255 characteres; HTML permittite)"
 
-#: actions/sitenoticeadminpanel.php:198
+#. TRANS: Title for button to save site notice in admin panel.
+#: actions/sitenoticeadminpanel.php:201
 msgid "Save site notice"
 msgstr "Salveguardar aviso del sito"
 
@@ -5500,75 +5545,93 @@ msgstr ""
 "licentia del sito ‘%2$s’."
 
 #. TRANS: User admin panel title
-#: actions/useradminpanel.php:60
+#: actions/useradminpanel.php:58
 msgctxt "TITLE"
 msgid "User"
 msgstr "Usator"
 
-#: actions/useradminpanel.php:71
+#. TRANS: Instruction for user admin panel.
+#: actions/useradminpanel.php:69
 msgid "User settings for this StatusNet site"
 msgstr "Configurationes de usator pro iste sito de StatusNet"
 
-#: actions/useradminpanel.php:150
+#. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
+#: actions/useradminpanel.php:147
 msgid "Invalid bio limit. Must be numeric."
 msgstr "Limite de biographia invalide. Debe esser un numero."
 
-#: actions/useradminpanel.php:156
-msgid "Invalid welcome text. Max length is 255 characters."
+#. TRANS: Form validation error in user admin panel when welcome text is too long.
+#: actions/useradminpanel.php:154
+#, fuzzy
+msgid "Invalid welcome text. Maximum length is 255 characters."
 msgstr "Texto de benvenita invalide. Longitude maximal es 255 characteres."
 
+#. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
+#. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
-#, php-format
-msgid "Invalid default subscripton: '%1$s' is not user."
+#, fuzzy, php-format
+msgid "Invalid default subscripton: '%1$s' is not a user."
 msgstr "Subscription predefinite invalide: '%1$s' non es usator."
 
 #. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:106
+#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
 #: lib/personalgroupnav.php:109
 msgid "Profile"
 msgstr "Profilo"
 
-#: actions/useradminpanel.php:223
+#. TRANS: Field label in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:220
 msgid "Bio Limit"
 msgstr "Limite de biographia"
 
-#: actions/useradminpanel.php:224
+#. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:222
 msgid "Maximum length of a profile bio in characters."
 msgstr "Le longitude maximal del biographia de un profilo in characteres."
 
-#: actions/useradminpanel.php:232
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:231
 msgid "New users"
 msgstr "Nove usatores"
 
+#. TRANS: Field label in user admin panel for setting new user welcome text.
 #: actions/useradminpanel.php:236
 msgid "New user welcome"
 msgstr "Message de benvenita a nove usatores"
 
-#: actions/useradminpanel.php:237
-msgid "Welcome text for new users (Max 255 chars)."
+#. TRANS: Tooltip in user admin panel for setting new user welcome text.
+#: actions/useradminpanel.php:238
+#, fuzzy
+msgid "Welcome text for new users (maximum 255 characters)."
 msgstr "Texto de benvenita pro nove usatores (max. 255 characteres)"
 
-#: actions/useradminpanel.php:242
+#. TRANS: Field label in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:244
 msgid "Default subscription"
 msgstr "Subscription predefinite"
 
-#: actions/useradminpanel.php:243
+#. TRANS: Tooltip in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:246
 msgid "Automatically subscribe new users to this user."
 msgstr "Subscriber automaticamente le nove usatores a iste usator."
 
-#: actions/useradminpanel.php:252
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:256
 msgid "Invitations"
 msgstr "Invitationes"
 
-#: actions/useradminpanel.php:257
+#. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:262
 msgid "Invitations enabled"
 msgstr "Invitationes activate"
 
-#: actions/useradminpanel.php:259
+#. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:265
 msgid "Whether to allow users to invite new users."
 msgstr "Si le usatores pote invitar nove usatores."
 
-#: actions/useradminpanel.php:295
+#. TRANS: Title for button to save user settings in user admin panel.
+#: actions/useradminpanel.php:302
 msgid "Save user settings"
 msgstr "Salveguardar configurationes de usator"
 
@@ -5779,7 +5842,7 @@ msgid "Plugins"
 msgstr "Plug-ins"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:831
+#: actions/version.php:198 lib/action.php:880
 msgid "Version"
 msgstr "Version"
 
@@ -5988,16 +6051,23 @@ msgstr "Non poteva salveguardar le responsa pro %1$d, %2$d."
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
+#. TRANS: Full name of a profile or group followed by nickname in parens
+#: classes/Profile.php:164
+#, fuzzy, php-format
+msgctxt "FANCYNAME"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:791
+#: classes/Profile.php:812
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr "Non pote revocar le rolo \"%1$s\" del usator #%2$d; non existe."
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:800
+#: classes/Profile.php:821
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6144,194 +6214,201 @@ msgstr "%1$s - %2$s"
 msgid "Untitled page"
 msgstr "Pagina sin titulo"
 
+#. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
+#: lib/action.php:310
+msgctxt "TOOLTIP"
+msgid "Show more"
+msgstr ""
+
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:477
+#: lib/action.php:526
 msgid "Primary site navigation"
 msgstr "Navigation primari del sito"
 
 #. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:483
+#: lib/action.php:532
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "Profilo personal e chronologia de amicos"
 
 #. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:486
+#: lib/action.php:535
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Personal"
 
 #. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:488
+#: lib/action.php:537
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
 msgstr "Cambiar tu e-mail, avatar, contrasigno, profilo"
 
 #. TRANS: Main menu option when logged in for access to user settings
-#: lib/action.php:491
+#: lib/action.php:540
 msgid "Account"
 msgstr "Conto"
 
 #. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:493
+#: lib/action.php:542
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "Connecter a servicios"
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:496
+#: lib/action.php:545
 msgid "Connect"
 msgstr "Connecter"
 
 #. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:499
+#: lib/action.php:548
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "Modificar le configuration del sito"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:502 lib/groupnav.php:117
+#: lib/action.php:551 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Admin"
 
 #. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:506
+#: lib/action.php:555
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Invitar amicos e collegas a accompaniar te in %s"
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:509
+#: lib/action.php:558
 msgctxt "MENU"
 msgid "Invite"
 msgstr "Invitar"
 
 #. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:515
+#: lib/action.php:564
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "Terminar le session del sito"
 
 #. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:518
+#: lib/action.php:567
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Clauder session"
 
 #. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:523
+#: lib/action.php:572
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "Crear un conto"
 
 #. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:526
+#: lib/action.php:575
 msgctxt "MENU"
 msgid "Register"
 msgstr "Crear conto"
 
 #. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:529
+#: lib/action.php:578
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "Authenticar te a iste sito"
 
 #. TRANS: Main menu option when not logged in to log in
-#: lib/action.php:532
+#: lib/action.php:581
 msgctxt "MENU"
 msgid "Login"
 msgstr "Aperir session"
 
 #. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:535
+#: lib/action.php:584
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Adjuta me!"
 
 #. TRANS: Main menu option for help on the StatusNet site
-#: lib/action.php:538
+#: lib/action.php:587
 msgctxt "MENU"
 msgid "Help"
 msgstr "Adjuta"
 
 #. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:541
+#: lib/action.php:590
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr "Cercar personas o texto"
 
 #. TRANS: Main menu option when logged in or when the StatusNet instance is not private
-#: lib/action.php:544
+#: lib/action.php:593
 msgctxt "MENU"
 msgid "Search"
 msgstr "Cercar"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:566 lib/adminpanelaction.php:387
+#: lib/action.php:615 lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "Aviso del sito"
 
 #. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:633
+#: lib/action.php:682
 msgid "Local views"
 msgstr "Vistas local"
 
 #. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:703
+#: lib/action.php:752
 msgid "Page notice"
 msgstr "Aviso de pagina"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:804
+#: lib/action.php:853
 msgid "Secondary site navigation"
 msgstr "Navigation secundari del sito"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:810
+#: lib/action.php:859
 msgid "Help"
 msgstr "Adjuta"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:813
+#: lib/action.php:862
 msgid "About"
 msgstr "A proposito"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:816
+#: lib/action.php:865
 msgid "FAQ"
 msgstr "FAQ"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:821
+#: lib/action.php:870
 msgid "TOS"
 msgstr "CdS"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:825
+#: lib/action.php:874
 msgid "Privacy"
 msgstr "Confidentialitate"
 
-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:828
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+#: lib/action.php:877
 msgid "Source"
 msgstr "Fonte"
 
-#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:834
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+#: lib/action.php:884
 msgid "Contact"
 msgstr "Contacto"
 
-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:837
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+#: lib/action.php:887
 msgid "Badge"
 msgstr "Insignia"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:866
+#: lib/action.php:916
 msgid "StatusNet software license"
 msgstr "Licentia del software StatusNet"
 
@@ -6339,7 +6416,7 @@ msgstr "Licentia del software StatusNet"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:873
+#: lib/action.php:923
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -6349,7 +6426,7 @@ msgstr ""
 "%](%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:876
+#: lib/action.php:926
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** es un servicio de microblog."
@@ -6358,7 +6435,7 @@ msgstr "**%%site.name%%** es un servicio de microblog."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:883
+#: lib/action.php:933
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -6370,51 +6447,51 @@ msgstr ""
 "(http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:899
+#: lib/action.php:949
 msgid "Site content license"
 msgstr "Licentia del contento del sito"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:906
+#: lib/action.php:956
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "Le contento e datos de %1$s es private e confidential."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:913
+#: lib/action.php:963
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr "Contento e datos sub copyright de %1$s. Tote le derectos reservate."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:917
+#: lib/action.php:967
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "Contento e datos sub copyright del contributores. Tote le derectos reservate."
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:949
+#: lib/action.php:999
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr "Tote le contento e datos de %1$s es disponibile sub le licentia %2$s."
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1285
+#: lib/action.php:1335
 msgid "Pagination"
 msgstr "Pagination"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1296
+#: lib/action.php:1346
 msgid "After"
 msgstr "Post"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1306
+#: lib/action.php:1356
 msgid "Before"
 msgstr "Ante"
 
@@ -6764,7 +6841,7 @@ msgid "AJAX error"
 msgstr "Error de Ajax"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:233 lib/mailhandler.php:142
+#: lib/channel.php:233 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "Commando complete"
 
@@ -6780,7 +6857,7 @@ msgstr "Non existe un nota con iste ID."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:626
+#: lib/command.php:99 lib/command.php:630
 msgid "User has no last notice."
 msgstr "Le usator non ha un ultime nota."
 
@@ -6849,6 +6926,14 @@ msgstr "%1$s se jungeva al gruppo %2$s."
 msgid "%1$s left group %2$s."
 msgstr "%1$s quitava le gruppo %2$s."
 
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: lib/command.php:426
+#, fuzzy, php-format
+msgctxt "WHOIS"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
 #. TRANS: Whois output. %s is the full name of the queried user.
 #: lib/command.php:430
 #, php-format
@@ -6888,113 +6973,117 @@ msgstr ""
 "%s es un profilo remote; tu pote solmente inviar messages directe a usatores "
 "super le mesme servitor."
 
-#. TRANS: Message given if content is too long.
+#. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
 #: lib/command.php:488
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr "Message troppo longe - maximo es %1$d characteres, tu inviava %2$d."
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] "Message troppo longe - maximo es %1$d characteres, tu inviava %2$d."
+msgstr[1] "Message troppo longe - maximo es %1$d characteres, tu inviava %2$d."
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:514
+#: lib/command.php:516
 msgid "Error sending direct message."
 msgstr "Error durante le invio del message directe."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:551
+#: lib/command.php:553
 #, php-format
 msgid "Notice from %s repeated."
 msgstr "Nota de %s repetite."
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:554
+#: lib/command.php:556
 msgid "Error repeating notice."
 msgstr "Error durante le repetition del nota."
 
-#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:589
-#, php-format
-msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
-msgstr "Nota troppo longe - maximo es %d characteres, tu inviava %d."
+#: lib/command.php:591
+#, fuzzy, php-format
+msgid "Notice too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] "Nota troppo longe - maximo es %d characteres, tu inviava %d."
+msgstr[1] "Nota troppo longe - maximo es %d characteres, tu inviava %d."
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:600
+#: lib/command.php:604
 #, php-format
 msgid "Reply to %s sent."
 msgstr "Responsa a %s inviate."
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:603
+#: lib/command.php:607
 msgid "Error saving notice."
 msgstr "Errur durante le salveguarda del nota."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:650
+#: lib/command.php:654
 msgid "Specify the name of the user to subscribe to."
 msgstr "Specifica le nomine del usator al qual subscriber te."
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:659
+#: lib/command.php:663
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Impossibile subscriber se a profilos OMB per medio de un commando."
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:667
+#: lib/command.php:671
 #, php-format
 msgid "Subscribed to %s."
 msgstr "Subscribite a %s."
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:688 lib/command.php:799
+#: lib/command.php:692 lib/command.php:803
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "Specifica le nomine del usator al qual cancellar le subscription."
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:699
+#: lib/command.php:703
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr "Subscription a %s cancellate."
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:719 lib/command.php:745
+#: lib/command.php:723 lib/command.php:749
 msgid "Command not yet implemented."
 msgstr "Commando non ancora implementate."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:723
+#: lib/command.php:727
 msgid "Notification off."
 msgstr "Notification disactivate."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:726
+#: lib/command.php:730
 msgid "Can't turn off notification."
 msgstr "Non pote disactivar notification."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:749
+#: lib/command.php:753
 msgid "Notification on."
 msgstr "Notification activate."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:752
+#: lib/command.php:756
 msgid "Can't turn on notification."
 msgstr "Non pote activar notification."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:766
+#: lib/command.php:770
 msgid "Login command is disabled."
 msgstr "Le commando de apertura de session es disactivate."
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:779
+#: lib/command.php:783
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
@@ -7003,20 +7092,20 @@ msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:808
+#: lib/command.php:812
 #, php-format
 msgid "Unsubscribed %s."
 msgstr "Subscription de %s cancellate."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:826
+#: lib/command.php:830
 msgid "You are not subscribed to anyone."
 msgstr "Tu non es subscribite a alcuno."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:831
+#: lib/command.php:835
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Tu es subscribite a iste persona:"
@@ -7024,14 +7113,14 @@ msgstr[1] "Tu es subscribite a iste personas:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:853
+#: lib/command.php:857
 msgid "No one is subscribed to you."
 msgstr "Necuno es subscribite a te."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:858
+#: lib/command.php:862
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Iste persona es subscribite a te:"
@@ -7039,21 +7128,21 @@ msgstr[1] "Iste personas es subscribite a te:"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:880
+#: lib/command.php:884
 msgid "You are not a member of any groups."
 msgstr "Tu non es membro de alcun gruppo."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:885
+#: lib/command.php:889
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Tu es membro de iste gruppo:"
 msgstr[1] "Tu es membro de iste gruppos:"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:900
+#: lib/command.php:904
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -7282,7 +7371,8 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 minusculas o numeros, sin punctuation o spatios"
 
 #: lib/groupeditform.php:163
-msgid "URL of the homepage or blog of the group or topic"
+#, fuzzy
+msgid "URL of the homepage or blog of the group or topic."
 msgstr "URL del pagina initial o blog del gruppo o topico"
 
 #: lib/groupeditform.php:168
@@ -7290,20 +7380,30 @@ msgid "Describe the group or topic"
 msgstr "Describe le gruppo o topico"
 
 #: lib/groupeditform.php:170
-#, php-format
-msgid "Describe the group or topic in %d characters"
-msgstr "Describe le gruppo o topico in %d characteres"
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d character or less"
+msgid_plural "Describe the group or topic in %d characters or less"
+msgstr[0] "Describe le gruppo o topico in %d characteres"
+msgstr[1] "Describe le gruppo o topico in %d characteres"
 
-#: lib/groupeditform.php:179
+#: lib/groupeditform.php:182
+#, fuzzy
 msgid ""
-"Location for the group, if any, like \"City, State (or Region), Country\""
+"Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr ""
 "Loco del gruppo, si existe, como \"Citate, Provincia (o Region), Pais\""
 
-#: lib/groupeditform.php:187
-#, php-format
-msgid "Extra nicknames for the group, comma- or space- separated, max %d"
-msgstr ""
+#: lib/groupeditform.php:190
+#, fuzzy, php-format
+msgid ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"alias allowed."
+msgid_plural ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"aliases allowed."
+msgstr[0] ""
+"Pseudonymos additional pro le gruppo, separate per commas o spatios, max %d"
+msgstr[1] ""
 "Pseudonymos additional pro le gruppo, separate per commas o spatios, max %d"
 
 #. TRANS: Menu item in the group navigation page.
@@ -7434,27 +7534,27 @@ msgstr "Typo de file incognite"
 
 #. TRANS: Number of megabytes. %d is the number.
 #: lib/imagefile.php:248
-#, fuzzy, php-format
+#, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
-msgstr[0] "MB"
-msgstr[1] "MB"
+msgstr[0] "%dMB"
+msgstr[1] "%dMB"
 
 #. TRANS: Number of kilobytes. %d is the number.
 #: lib/imagefile.php:252
-#, fuzzy, php-format
+#, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
-msgstr[0] "KB"
-msgstr[1] "KB"
+msgstr[0] "%dKB"
+msgstr[1] "%dKB"
 
 #. TRANS: Number of bytes. %d is the number.
 #: lib/imagefile.php:255
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%dB"
+msgstr[1] "%dB"
 
 #: lib/jabber.php:387
 #, php-format
@@ -7859,7 +7959,7 @@ msgstr "Pardono, isto non es tu adresse de e-mail entrante."
 msgid "Sorry, no incoming email allowed."
 msgstr "Pardono, le reception de e-mail non es permittite."
 
-#: lib/mailhandler.php:228
+#: lib/mailhandler.php:229
 #, php-format
 msgid "Unsupported message type: %s"
 msgstr "Typo de message non supportate: %s"
@@ -8207,16 +8307,17 @@ msgid "Sandbox this user"
 msgstr "Mitter iste usator in le cassa de sablo"
 
 #. TRANS: Fieldset legend for the search form.
-#: lib/searchaction.php:121
+#: lib/searchaction.php:120
 msgid "Search site"
 msgstr "Cercar in sito"
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
-#: lib/searchaction.php:129
+#: lib/searchaction.php:128
 msgid "Keyword(s)"
 msgstr "Parola(s)-clave"
 
+#. TRANS: Button text for searching site.
 #: lib/searchaction.php:130
 msgctxt "BUTTON"
 msgid "Search"
@@ -8308,8 +8409,8 @@ msgid "The theme file is missing or the upload failed."
 msgstr "Le file del apparentia manca o le incargamento ha fallite."
 
 #: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:278 lib/themeuploader.php:282
-#: lib/themeuploader.php:290 lib/themeuploader.php:297
+#: lib/themeuploader.php:279 lib/themeuploader.php:283
+#: lib/themeuploader.php:291 lib/themeuploader.php:298
 msgid "Failed saving theme."
 msgstr "Salveguarda del apparentia fallite."
 
@@ -8318,17 +8419,22 @@ msgid "Invalid theme: bad directory structure."
 msgstr "Apparentia invalide: mal structura de directorios."
 
 #: lib/themeuploader.php:166
-#, php-format
-msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
-msgstr ""
+#, fuzzy, php-format
+msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
+msgid_plural ""
+"Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr[0] ""
+"Le apparentia incargate es troppo voluminose; debe occupar minus de %d bytes "
+"in forma non comprimite."
+msgstr[1] ""
 "Le apparentia incargate es troppo voluminose; debe occupar minus de %d bytes "
 "in forma non comprimite."
 
-#: lib/themeuploader.php:178
+#: lib/themeuploader.php:179
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr "Archivo de apparentia invalide: manca le file css/display.css"
 
-#: lib/themeuploader.php:218
+#: lib/themeuploader.php:219
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
@@ -8336,18 +8442,18 @@ msgstr ""
 "Le apparentia contine un nomine de file o dossier invalide. Limita te a "
 "litteras ASCII, digitos, sublineamento, e signo minus."
 
-#: lib/themeuploader.php:224
+#: lib/themeuploader.php:225
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr ""
 "Le thema contine nomines de extension de file insecur; pote esser insecur."
 
-#: lib/themeuploader.php:241
+#: lib/themeuploader.php:242
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr ""
 "Le apparentia contine un file del typo '.%s', le qual non es permittite."
 
-#: lib/themeuploader.php:259
+#: lib/themeuploader.php:260
 msgid "Error opening theme archive."
 msgstr "Error durante le apertura del archivo del apparentia."
 
@@ -8357,7 +8463,6 @@ msgstr "Qui scribe le plus"
 
 #. TRANS: Title for the form to unblock a user.
 #: lib/unblockform.php:67
-#, fuzzy
 msgctxt "TITLE"
 msgid "Unblock"
 msgstr "Disblocar"
@@ -8528,22 +8633,42 @@ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
 msgstr[0] "Message troppo longe. Maximo es %1$d character, tu inviava %2$d."
 msgstr[1] "Message troppo longe. Maximo es %1$d characteres, tu inviava %2$d."
 
-#: scripts/restoreuser.php:82
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: scripts/restoreuser.php:61
 #, php-format
-msgid "Backup file for user %s (%s)"
-msgstr "File de copia de reserva pro le usator %s (%s)"
+msgid "Getting backup from file '%s'."
+msgstr ""
 
-#: scripts/restoreuser.php:88
+#. TRANS: Commandline script output.
+#: scripts/restoreuser.php:91
 msgid "No user specified; using backup user."
 msgstr "Nulle usator specificate; le usator de reserva es usate."
 
-#: scripts/restoreuser.php:94
-#, php-format
-msgid "%d entries in backup."
-msgstr "%d entratas in copia de reserva."
+#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
+#: scripts/restoreuser.php:98
+#, fuzzy, php-format
+msgid "%d entry in backup."
+msgid_plural "%d entries in backup."
+msgstr[0] "%d entratas in copia de reserva."
+msgstr[1] "%d entratas in copia de reserva."
+
+#~ msgid "Name is too long (maximum 255 chars)."
+#~ msgstr "Le nomine es troppo longe (maximo 255 characteres)."
+
+#~ msgid "Organization is too long (maximum 255 chars)."
+#~ msgstr "Le organisation es troppo longe (maximo 255 characteres)."
+
+#~ msgid "That's too long. Max notice size is %d chars."
+#~ msgstr ""
+#~ "Isto es troppo longe. Le longitude maximal del notas es %d characteres."
+
+#~ msgid "Max notice size is %d chars, including attachment URL."
+#~ msgstr ""
+#~ "Le longitude maximal del notas es %d characteres, includente le URL "
+#~ "adjungite."
 
-#~ msgid "Description is too long (max %d chars)."
-#~ msgstr "Description es troppo longe (max %d charachteres)."
+#~ msgid " tagged %s"
+#~ msgstr "  con etiquetta %s"
 
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "Troppo de aliases! Maximo: %d."
+#~ msgid "Backup file for user %s (%s)"
+#~ msgstr "File de copia de reserva pro le usator %s (%s)"
diff --git a/locale/is/LC_MESSAGES/statusnet.po b/locale/is/LC_MESSAGES/statusnet.po
index d2255523d..d14759394 100644
--- a/locale/is/LC_MESSAGES/statusnet.po
+++ b/locale/is/LC_MESSAGES/statusnet.po
@@ -9,17 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-30 23:18+0000\n"
-"PO-Revision-Date: 2010-10-30 23:20:24+0000\n"
+"POT-Creation-Date: 2010-11-02 22:51+0000\n"
+"PO-Revision-Date: 2010-11-02 22:53:25+0000\n"
 "Language-Team: Icelandic <http://translatewiki.net/wiki/Portal:is>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r75708); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r75875); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: is\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2010-10-30 09:48:40+0000\n"
+"X-POT-Import-Date: 2010-10-30 23:42:01+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -82,15 +82,20 @@ msgstr "Stillingar fyrir mynd"
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
+#. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
+#. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #: actions/accessadminpanel.php:193 actions/emailsettings.php:228
-#: actions/imsettings.php:187 actions/pathsadminpanel.php:512
-#: actions/profilesettings.php:201 actions/smssettings.php:209
-#: actions/subscriptions.php:246 lib/applicationeditform.php:355
+#: actions/imsettings.php:187 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: lib/applicationeditform.php:355 lib/groupeditform.php:207
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Save"
@@ -143,7 +148,7 @@ msgstr "Ekkert þannig merki."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:495 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Enginn svoleiðis notandi."
@@ -210,7 +215,9 @@ msgstr ""
 
 #. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:208
+#. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -573,8 +580,11 @@ msgstr "Fullt nafn er of langt (í mesta lagi 255 stafir)."
 #. TRANS: Group edit form validation error.
 #. TRANS: Form validation error in New application form.
 #. TRANS: %d is the maximum number of characters for the description.
+#. TRANS: Group create form validation error.
+#. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:220 actions/editapplication.php:201
 #: actions/editgroup.php:216 actions/newapplication.php:178
+#: actions/newgroup.php:152
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -737,14 +747,14 @@ msgstr "Þú ert ekki áskrifandi."
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:172 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:74
 #: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
 #: actions/groupunblock.php:65 actions/imsettings.php:230
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
-#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/othersettings.php:153 actions/passwordsettings.php:138
 #: actions/profilesettings.php:221 actions/recoverpassword.php:350
 #: actions/register.php:172 actions/remotesubscribe.php:77
 #: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
@@ -919,21 +929,22 @@ msgstr "Þú getur ekki eytt stöðu annars notanda."
 
 #. TRANS: Client error displayed trying to repeat a non-existing notice through the API.
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
+#. TRANS: Error message displayed trying to delete a non-existing notice.
 #: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/deletenotice.php:58 actions/shownotice.php:92
+#: actions/deletenotice.php:61 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "Ekkert svoleiðis babl."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:535
+#: actions/apistatusesretweet.php:83 lib/command.php:537
 #, fuzzy
 msgid "Cannot repeat your own notice."
 msgstr "Get ekki kveikt á tilkynningum."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:541
+#: actions/apistatusesretweet.php:92 lib/command.php:543
 msgid "Already repeated that notice."
 msgstr "Get ekki eytt þessu babli."
 
@@ -954,7 +965,8 @@ msgstr ""
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#: actions/apistatusesupdate.php:244
+#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
+#: lib/mailhandler.php:60
 #, fuzzy, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
@@ -969,7 +981,7 @@ msgstr "Aðferð í forritsskilum fannst ekki!"
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
-#: actions/apistatusesupdate.php:308
+#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
 #, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
@@ -1183,17 +1195,18 @@ msgstr ""
 msgid "Lost our file data."
 msgstr "Týndum skráargögnunum okkar"
 
-#: actions/avatarsettings.php:384
+#. TRANS: Success message for having updated a user avatar.
+#: actions/avatarsettings.php:385
 msgid "Avatar updated."
 msgstr "Mynd hefur verið uppfærð."
 
 #. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
-#: actions/avatarsettings.php:388
+#: actions/avatarsettings.php:389
 msgid "Failed updating avatar."
 msgstr "Mistókst að uppfæra mynd"
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:412
+#: actions/avatarsettings.php:413
 #, fuzzy
 msgid "Avatar deleted."
 msgstr "Mynd hefur verið uppfærð."
@@ -1223,8 +1236,8 @@ msgstr ""
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:154 actions/deleteapplication.php:154
-#: actions/deletegroup.php:220 actions/deletenotice.php:150
+#: actions/block.php:154 actions/deleteapplication.php:157
+#: actions/deletegroup.php:220 actions/deletenotice.php:155
 #: actions/deleteuser.php:152 actions/groupblock.php:178
 msgctxt "BUTTON"
 msgid "No"
@@ -1243,8 +1256,8 @@ msgstr "Opna á þennan notanda"
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:161 actions/deleteapplication.php:161
-#: actions/deletegroup.php:227 actions/deletenotice.php:157
+#: actions/block.php:161 actions/deleteapplication.php:164
+#: actions/deletegroup.php:227 actions/deletenotice.php:162
 #: actions/deleteuser.php:159 actions/groupblock.php:185
 #, fuzzy
 msgctxt "BUTTON"
@@ -1364,12 +1377,13 @@ msgstr "Þetta tölvupóstfang hefur nú þegar verið staðfest."
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
 #. TRANS: Server error thrown on database error updating IM preferences.
 #. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
 #. TRANS: Server error thrown when user profile settings could not be updated.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #: actions/confirmaddress.php:118 actions/emailsettings.php:331
 #: actions/emailsettings.php:477 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:174
+#: actions/imsettings.php:442 actions/othersettings.php:184
 #: actions/profilesettings.php:326 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
@@ -1407,16 +1421,19 @@ msgstr "Staðfestingarlykill"
 msgid "Notices"
 msgstr "Babl"
 
-#: actions/deleteapplication.php:63
+#. TRANS: Client error displayed trying to delete an application while not logged in.
+#: actions/deleteapplication.php:62
 msgid "You must be logged in to delete an application."
 msgstr "Þú verður aða hafa skráð þig inn til að ganga úr hóp."
 
+#. TRANS: Client error displayed trying to delete an application that does not exist.
 #: actions/deleteapplication.php:71
 msgid "Application not found."
 msgstr "Staðfestingarlykill fannst ekki."
 
+#. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
-#: actions/deleteapplication.php:78 actions/editapplication.php:78
+#: actions/deleteapplication.php:79 actions/editapplication.php:78
 #: actions/showapplication.php:94
 #, fuzzy
 msgid "You are not the owner of this application."
@@ -1425,16 +1442,19 @@ msgstr "Þú ert ekki meðlimur í þessum hópi."
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
 #: actions/newapplication.php:114 actions/showapplication.php:118
-#: lib/action.php:1354
+#: lib/action.php:1404
 msgid "There was a problem with your session token."
 msgstr "Það komu upp vandamál varðandi setutókann þinn."
 
-#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+#. TRANS: Title for delete application page.
+#. TRANS: Fieldset legend on delete application page.
+#: actions/deleteapplication.php:124 actions/deleteapplication.php:149
 #, fuzzy
 msgid "Delete application"
 msgstr "Ekkert svoleiðis babl."
 
-#: actions/deleteapplication.php:149
+#. TRANS: Confirmation text on delete application page.
+#: actions/deleteapplication.php:152
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
 "about the application from the database, including all existing user "
@@ -1442,12 +1462,12 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:158
+#: actions/deleteapplication.php:161
 msgid "Do not delete this application"
 msgstr "Get ekki eytt þessu babli."
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:164
+#: actions/deleteapplication.php:167
 #, fuzzy
 msgid "Delete this application"
 msgstr "Eyða þessu babli"
@@ -1485,13 +1505,14 @@ msgstr "Gat ekki uppfært hóp."
 msgid "Deleted group %s"
 msgstr "Staða %1$s á %2$s"
 
-#. TRANS: Title.
+#. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
 #: actions/deletegroup.php:176 actions/deletegroup.php:202
 #, fuzzy
 msgid "Delete group"
 msgstr "Eyða"
 
+#. TRANS: Warning in form for deleleting a group.
 #: actions/deletegroup.php:206
 msgid ""
 "Are you sure you want to delete this group? This will clear all data about "
@@ -1511,10 +1532,11 @@ msgstr "Get ekki eytt þessu babli."
 msgid "Delete this group"
 msgstr "Eyða þessu babli"
 
+#. TRANS: Error message displayed trying to delete a notice while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1524,32 +1546,37 @@ msgstr "Eyða þessu babli"
 msgid "Not logged in."
 msgstr "Ekki innskráð(ur)."
 
-#: actions/deletenotice.php:74
+#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
+#: actions/deletenotice.php:78
 msgid "Can't delete this notice."
 msgstr "Get ekki eytt þessu babli."
 
-#: actions/deletenotice.php:106
+#. TRANS: Instructions for deleting a notice.
+#: actions/deletenotice.php:110
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
 msgstr ""
 
-#: actions/deletenotice.php:112 actions/deletenotice.php:144
+#. TRANS: Page title when deleting a notice.
+#. TRANS: Fieldset legend for the delete notice form.
+#: actions/deletenotice.php:117 actions/deletenotice.php:148
 msgid "Delete notice"
 msgstr "Eyða babli"
 
-#: actions/deletenotice.php:147
+#. TRANS: Message for the delete notice form.
+#: actions/deletenotice.php:152
 msgid "Are you sure you want to delete this notice?"
 msgstr "Ertu viss um að þú viljir eyða þessu babli?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:154
+#: actions/deletenotice.php:159
 #, fuzzy
 msgid "Do not delete this notice"
 msgstr "Get ekki eytt þessu babli."
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:161 lib/noticelist.php:667
+#: actions/deletenotice.php:166 lib/noticelist.php:667
 msgid "Delete this notice"
 msgstr "Eyða þessu babli"
 
@@ -1723,11 +1750,9 @@ msgstr ""
 
 #. TRANS: Submit button title.
 #: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
-#: actions/othersettings.php:126 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: actions/useradminpanel.php:295 lib/applicationeditform.php:357
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: lib/applicationeditform.php:357 lib/designsettings.php:256
 msgid "Save"
 msgstr "Vista"
 
@@ -1779,9 +1804,9 @@ msgid "Name is required."
 msgstr "Sama og lykilorðið hér fyrir ofan. Nauðsynlegt."
 
 #. TRANS: Validation error shown when providing too long a name in the "Edit application" form.
-#: actions/editapplication.php:188
+#: actions/editapplication.php:188 actions/newapplication.php:169
 #, fuzzy
-msgid "Name is too long (max 255 characters)."
+msgid "Name is too long (maximum 255 characters)."
 msgstr "Fullt nafn er of langt (í mesta lagi 255 stafir)."
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
@@ -1813,7 +1838,7 @@ msgid "Organization is required."
 msgstr ""
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#: actions/editapplication.php:223
+#: actions/editapplication.php:223 actions/newapplication.php:199
 #, fuzzy
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "Staðsetning er of löng (í mesta lagi 255 stafir)."
@@ -2624,7 +2649,7 @@ msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Birta MicroID fyrir Jabber/GTalk netfangið mitt."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:180
+#: actions/imsettings.php:290 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "Stillingar vistaðar."
 
@@ -2749,10 +2774,9 @@ msgstr[1] "Þú ert nú þegar í áskrift að þessum notendum:"
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#. TRANS: Whois output.
-#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:145 actions/invite.php:159 lib/command.php:426
-#, php-format
+#: actions/invite.php:145 actions/invite.php:159
+#, fuzzy, php-format
+msgctxt "INVITE"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
@@ -2938,8 +2962,9 @@ msgid ""
 msgstr ""
 
 #: actions/licenseadminpanel.php:156
-msgid "Invalid license title. Max length is 255 characters."
-msgstr ""
+#, fuzzy
+msgid "Invalid license title. Maximum length is 255 characters."
+msgstr "Staðsetning er of löng (í mesta lagi 255 stafir)."
 
 #: actions/licenseadminpanel.php:168
 msgid "Invalid license URL."
@@ -3120,20 +3145,10 @@ msgstr "Þú verður að hafa skráð þig inn til að búa til hóp."
 msgid "Use this form to register a new application."
 msgstr "Notaðu þetta eyðublað til að búa til nýjan hóp."
 
-#: actions/newapplication.php:169
-#, fuzzy
-msgid "Name is too long (maximum 255 chars)."
-msgstr "Fullt nafn er of langt (í mesta lagi 255 stafir)."
-
 #: actions/newapplication.php:184
 msgid "Source URL is required."
 msgstr ""
 
-#: actions/newapplication.php:199
-#, fuzzy
-msgid "Organization is too long (maximum 255 chars)."
-msgstr "Staðsetning er of löng (í mesta lagi 255 stafir)."
-
 #: actions/newapplication.php:266 actions/newapplication.php:275
 #, fuzzy
 msgid "Could not create application."
@@ -3154,14 +3169,14 @@ msgid "New message"
 msgstr "Ný skilaboð"
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:499
+#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501
 msgid "You can't send a message to this user."
 msgstr "Þú getur ekki sent þessum notanda skilaboð."
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
 #: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
-#: lib/command.php:579
+#: lib/command.php:581
 msgid "No content!"
 msgstr "Ekkert innihald!"
 
@@ -3170,7 +3185,7 @@ msgid "No recipient specified."
 msgstr "Enginn móttökuaðili tilgreindur."
 
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:503
+#: actions/newmessage.php:167 lib/command.php:505
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -3184,12 +3199,12 @@ msgstr "Skilaboð"
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:511
+#: actions/newmessage.php:188 lib/command.php:513
 #, fuzzy, php-format
 msgid "Direct message to %s sent."
 msgstr "Bein skilaboð send til %s"
 
-#: actions/newmessage.php:213 actions/newnotice.php:263
+#: actions/newmessage.php:213 actions/newnotice.php:264
 msgid "Ajax Error"
 msgstr "Ajax villa"
 
@@ -3197,17 +3212,7 @@ msgstr "Ajax villa"
 msgid "New notice"
 msgstr "Nýtt babl"
 
-#: actions/newnotice.php:159 lib/mailhandler.php:60
-#, fuzzy, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr "Þetta er of langt. Hámarkslengd babls er 140 tákn."
-
-#: actions/newnotice.php:183
-#, php-format
-msgid "Max notice size is %d chars, including attachment URL."
-msgstr ""
-
-#: actions/newnotice.php:229
+#: actions/newnotice.php:230
 msgid "Notice posted"
 msgstr "Babl sent inn"
 
@@ -3375,37 +3380,47 @@ msgstr "Leit að fólki"
 msgid "Notice Search"
 msgstr "Leit í babli"
 
-#: actions/othersettings.php:60
+#: actions/othersettings.php:59
 msgid "Other settings"
 msgstr "Stillingar fyrir mynd"
 
+#. TRANS: Instructions for tab "Other" in user profile settings.
 #: actions/othersettings.php:71
 msgid "Manage various other options."
 msgstr "Sjá um ýmsar aðrar stillingar."
 
-#: actions/othersettings.php:108
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/othersettings.php:111
 msgid " (free service)"
 msgstr ""
 
-#: actions/othersettings.php:116
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/othersettings.php:120
 msgid "Shorten URLs with"
 msgstr ""
 
-#: actions/othersettings.php:117
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/othersettings.php:122
 msgid "Automatic shortening service to use."
 msgstr "Þjónusta sem sér um sjálfkrafa styttingu."
 
-#: actions/othersettings.php:122
+#. TRANS: Label for checkbox.
+#: actions/othersettings.php:128
 #, fuzzy
 msgid "View profile designs"
 msgstr "Stillingar persónulegrar síðu"
 
-#: actions/othersettings.php:123
+#. TRANS: Tooltip for checkbox.
+#: actions/othersettings.php:130
 msgid "Show or hide profile designs."
 msgstr ""
 
-#: actions/othersettings.php:153
-msgid "URL shortening service is too long (max 50 chars)."
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/othersettings.php:162
+#, fuzzy
+msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr ""
 "Þjónusta sjálfvirkrar vefslóðastyttingar er of löng (í mesta lagi 50 stafir)."
 
@@ -3904,7 +3919,7 @@ msgstr "Lýsing"
 #. TRANS: Label for group location (dt). Text hidden by default.
 #: actions/profilesettings.php:149 actions/register.php:485
 #: actions/showgroup.php:267 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:177
+#: actions/userauthorization.php:166 lib/groupeditform.php:180
 #: lib/userprofile.php:165
 msgid "Location"
 msgstr "Staðsetning"
@@ -4238,7 +4253,8 @@ msgid "Unexpected password reset."
 msgstr "Bjóst ekki við endurstillingu lykilorðs."
 
 #: actions/recoverpassword.php:365
-msgid "Password must be 6 chars or more."
+#, fuzzy
+msgid "Password must be 6 characters or more."
 msgstr "Lykilorð verður að vera 6 tákn eða fleiri."
 
 #: actions/recoverpassword.php:369
@@ -4624,7 +4640,7 @@ msgstr "Uppröðun"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:172
+#: lib/applicationeditform.php:208 lib/groupeditform.php:175
 msgid "Description"
 msgstr "Lýsing"
 
@@ -4767,7 +4783,7 @@ msgid "Note"
 msgstr "Athugasemd"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:298 lib/groupeditform.php:184
+#: actions/showgroup.php:298 lib/groupeditform.php:187
 msgid "Aliases"
 msgstr ""
 
@@ -4892,60 +4908,84 @@ msgstr "Skilaboð frá %1$s á %2$s"
 msgid "Notice deleted."
 msgstr "Babl sent inn"
 
-#: actions/showstream.php:72
+#. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
+#: actions/showstream.php:70
 #, fuzzy, php-format
-msgid " tagged %s"
+msgid "%1$s tagged %2$s"
+msgstr "Hópar, síða %d"
+
+#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#: actions/showstream.php:74
+#, fuzzy, php-format
+msgid "%1$s tagged %2$s, page %3$d"
 msgstr "Babl merkt með %s"
 
-#: actions/showstream.php:78
+#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$d is the page number.
+#: actions/showstream.php:82
 #, php-format
 msgid "%1$s, page %2$d"
 msgstr "Hópar, síða %d"
 
-#: actions/showstream.php:120
+#. TRANS: Title for link to notice feed.
+#. TRANS: %1$s is a user nickname, %2$s is a hashtag.
+#: actions/showstream.php:127
 #, fuzzy, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Bablveita fyrir %s"
 
-#: actions/showstream.php:127
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:136
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr ""
 
-#: actions/showstream.php:134
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:145
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr ""
 
-#: actions/showstream.php:141
+#: actions/showstream.php:152
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr ""
 
-#: actions/showstream.php:146
+#. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
+#. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
+#: actions/showstream.php:159
 #, fuzzy, php-format
 msgid "FOAF for %s"
 msgstr "Úthólf %s"
 
-#: actions/showstream.php:197
+#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
+#: actions/showstream.php:211
 #, php-format
-msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
+msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr ""
 
-#: actions/showstream.php:202
+#. TRANS: Second sentence of empty list message for a stream for the user themselves.
+#: actions/showstream.php:217
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
 msgstr ""
 
-#: actions/showstream.php:204
+#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:221
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
 "%?status_textarea=%2$s)."
 msgstr ""
 
-#: actions/showstream.php:243
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:264
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4954,7 +4994,9 @@ msgid ""
 "follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
 
-#: actions/showstream.php:248
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:271
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4962,7 +5004,8 @@ msgid ""
 "[StatusNet](http://status.net/) tool. "
 msgstr ""
 
-#: actions/showstream.php:305
+#. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
+#: actions/showstream.php:328
 #, fuzzy, php-format
 msgid "Repeat of %s"
 msgstr "Svör við %s"
@@ -5077,35 +5120,42 @@ msgstr ""
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:56
+#. TRANS: Page title for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:55
 #, fuzzy
 msgid "Site Notice"
 msgstr "Babl vefsíðunnar"
 
-#: actions/sitenoticeadminpanel.php:67
+#. TRANS: Instructions for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:66
 #, fuzzy
 msgid "Edit site-wide message"
 msgstr "Ný skilaboð"
 
-#: actions/sitenoticeadminpanel.php:103
+#. TRANS: Server error displayed when saving a site-wide notice was impossible.
+#: actions/sitenoticeadminpanel.php:101
 #, fuzzy
 msgid "Unable to save site notice."
 msgstr "Vandamál komu upp við að vista babl."
 
-#: actions/sitenoticeadminpanel.php:113
-msgid "Max length for the site-wide notice is 255 chars."
+#. TRANS: Client error displayed when a site-wide notice was longer than allowed.
+#: actions/sitenoticeadminpanel.php:112
+msgid "Maximum length for the site-wide notice is 255 characters."
 msgstr ""
 
+#. TRANS: Label for site-wide notice text field in admin panel.
 #: actions/sitenoticeadminpanel.php:176
 #, fuzzy
 msgid "Site notice text"
 msgstr "Babl vefsíðunnar"
 
-#: actions/sitenoticeadminpanel.php:178
-msgid "Site-wide notice text (255 chars max; HTML okay)"
+#. TRANS: Tooltip for site-wide notice text field in admin panel.
+#: actions/sitenoticeadminpanel.php:179
+msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:198
+#. TRANS: Title for button to save site notice in admin panel.
+#: actions/sitenoticeadminpanel.php:201
 #, fuzzy
 msgid "Save site notice"
 msgstr "Babl vefsíðunnar"
@@ -5572,83 +5622,100 @@ msgid ""
 msgstr ""
 
 #. TRANS: User admin panel title
-#: actions/useradminpanel.php:60
+#: actions/useradminpanel.php:58
 #, fuzzy
 msgctxt "TITLE"
 msgid "User"
 msgstr "Notandi"
 
-#: actions/useradminpanel.php:71
+#. TRANS: Instruction for user admin panel.
+#: actions/useradminpanel.php:69
 msgid "User settings for this StatusNet site"
 msgstr ""
 
-#: actions/useradminpanel.php:150
+#. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
+#: actions/useradminpanel.php:147
 msgid "Invalid bio limit. Must be numeric."
 msgstr ""
 
-#: actions/useradminpanel.php:156
-msgid "Invalid welcome text. Max length is 255 characters."
+#. TRANS: Form validation error in user admin panel when welcome text is too long.
+#: actions/useradminpanel.php:154
+msgid "Invalid welcome text. Maximum length is 255 characters."
 msgstr ""
 
+#. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
+#. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
 #, php-format
-msgid "Invalid default subscripton: '%1$s' is not user."
+msgid "Invalid default subscripton: '%1$s' is not a user."
 msgstr ""
 
 #. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:106
+#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
 #: lib/personalgroupnav.php:109
 msgid "Profile"
 msgstr "Persónuleg síða"
 
-#: actions/useradminpanel.php:223
+#. TRANS: Field label in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:220
 msgid "Bio Limit"
 msgstr ""
 
-#: actions/useradminpanel.php:224
+#. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:222
 msgid "Maximum length of a profile bio in characters."
 msgstr ""
 
-#: actions/useradminpanel.php:232
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:231
 #, fuzzy
 msgid "New users"
 msgstr "Bjóða nýjum notendum að vera með"
 
+#. TRANS: Field label in user admin panel for setting new user welcome text.
 #: actions/useradminpanel.php:236
 msgid "New user welcome"
 msgstr ""
 
-#: actions/useradminpanel.php:237
-msgid "Welcome text for new users (Max 255 chars)."
-msgstr ""
+#. TRANS: Tooltip in user admin panel for setting new user welcome text.
+#: actions/useradminpanel.php:238
+#, fuzzy
+msgid "Welcome text for new users (maximum 255 characters)."
+msgstr "Fullt nafn er of langt (í mesta lagi 255 stafir)."
 
-#: actions/useradminpanel.php:242
+#. TRANS: Field label in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:244
 #, fuzzy
 msgid "Default subscription"
 msgstr "Allar áskriftir"
 
-#: actions/useradminpanel.php:243
+#. TRANS: Tooltip in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:246
 #, fuzzy
 msgid "Automatically subscribe new users to this user."
 msgstr ""
 "Gerast sjálfkrafa áskrifandi að hverjum þeim sem gerist áskrifandi að þér "
 "(best fyrir ómannlega notendur)"
 
-#: actions/useradminpanel.php:252
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:256
 #, fuzzy
 msgid "Invitations"
 msgstr "Boðskort hefur verið sent út"
 
-#: actions/useradminpanel.php:257
+#. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:262
 #, fuzzy
 msgid "Invitations enabled"
 msgstr "Boðskort hefur verið sent út"
 
-#: actions/useradminpanel.php:259
+#. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:265
 msgid "Whether to allow users to invite new users."
 msgstr ""
 
-#: actions/useradminpanel.php:295
+#. TRANS: Title for button to save user settings in user admin panel.
+#: actions/useradminpanel.php:302
 msgid "Save user settings"
 msgstr ""
 
@@ -5849,7 +5916,7 @@ msgid "Plugins"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:831
+#: actions/version.php:198 lib/action.php:880
 #, fuzzy
 msgid "Version"
 msgstr "Persónulegt"
@@ -6066,16 +6133,23 @@ msgstr "Gat ekki vistað áskrift."
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
+#. TRANS: Full name of a profile or group followed by nickname in parens
+#: classes/Profile.php:164
+#, fuzzy, php-format
+msgctxt "FANCYNAME"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:791
+#: classes/Profile.php:812
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:800
+#: classes/Profile.php:821
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6226,50 +6300,56 @@ msgstr "%1$s (%2$s)"
 msgid "Untitled page"
 msgstr "Ónafngreind síða"
 
+#. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
+#: lib/action.php:310
+msgctxt "TOOLTIP"
+msgid "Show more"
+msgstr ""
+
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:477
+#: lib/action.php:526
 msgid "Primary site navigation"
 msgstr "Stikl aðalsíðu"
 
 #. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:483
+#: lib/action.php:532
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "Persónuleg síða og vinarás"
 
 #. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:486
+#: lib/action.php:535
 #, fuzzy
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Persónulegt"
 
 #. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:488
+#: lib/action.php:537
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
 msgstr "Breyta lykilorðinu þínu"
 
 #. TRANS: Main menu option when logged in for access to user settings
-#: lib/action.php:491
+#: lib/action.php:540
 msgid "Account"
 msgstr "Aðgangur"
 
 #. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:493
+#: lib/action.php:542
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "Gat ekki framsent til vefþjóns: %s"
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:496
+#: lib/action.php:545
 msgid "Connect"
 msgstr "Tengjast"
 
 #. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:499
+#: lib/action.php:548
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
@@ -6277,87 +6357,87 @@ msgstr "Stikl aðalsíðu"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:502 lib/groupnav.php:117
+#: lib/action.php:551 lib/groupnav.php:117
 #, fuzzy
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Stjórnandi"
 
 #. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:506
+#: lib/action.php:555
 #, fuzzy, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Bjóða vinum og vandamönnum að slást í hópinn á %s"
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:509
+#: lib/action.php:558
 #, fuzzy
 msgctxt "MENU"
 msgid "Invite"
 msgstr "Bjóða"
 
 #. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:515
+#: lib/action.php:564
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "Skrá þig inn á síðuna"
 
 #. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:518
+#: lib/action.php:567
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Einkennismerki"
 
 #. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:523
+#: lib/action.php:572
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "Búa til nýjan hóp"
 
 #. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:526
+#: lib/action.php:575
 #, fuzzy
 msgctxt "MENU"
 msgid "Register"
 msgstr "Nýskrá"
 
 #. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:529
+#: lib/action.php:578
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "Skrá þig inn á síðuna"
 
 #. TRANS: Main menu option when not logged in to log in
-#: lib/action.php:532
+#: lib/action.php:581
 #, fuzzy
 msgctxt "MENU"
 msgid "Login"
 msgstr "Innskráning"
 
 #. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:535
+#: lib/action.php:584
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Hjálp"
 
 #. TRANS: Main menu option for help on the StatusNet site
-#: lib/action.php:538
+#: lib/action.php:587
 #, fuzzy
 msgctxt "MENU"
 msgid "Help"
 msgstr "Hjálp"
 
 #. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:541
+#: lib/action.php:590
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr "Leita að fólki eða texta"
 
 #. TRANS: Main menu option when logged in or when the StatusNet instance is not private
-#: lib/action.php:544
+#: lib/action.php:593
 #, fuzzy
 msgctxt "MENU"
 msgid "Search"
@@ -6365,68 +6445,69 @@ msgstr "Leita"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:566 lib/adminpanelaction.php:387
+#: lib/action.php:615 lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "Babl vefsíðunnar"
 
 #. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:633
+#: lib/action.php:682
 msgid "Local views"
 msgstr "Staðbundin sýn"
 
 #. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:703
+#: lib/action.php:752
 msgid "Page notice"
 msgstr "Babl síðunnar"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:804
+#: lib/action.php:853
 msgid "Secondary site navigation"
 msgstr "Stikl undirsíðu"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:810
+#: lib/action.php:859
 msgid "Help"
 msgstr "Hjálp"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:813
+#: lib/action.php:862
 msgid "About"
 msgstr "Um"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:816
+#: lib/action.php:865
 msgid "FAQ"
 msgstr "Spurt og svarað"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:821
+#: lib/action.php:870
 msgid "TOS"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:825
+#: lib/action.php:874
 msgid "Privacy"
 msgstr "Friðhelgi"
 
-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:828
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+#: lib/action.php:877
 msgid "Source"
 msgstr "Frumþula"
 
-#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:834
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+#: lib/action.php:884
 msgid "Contact"
 msgstr "Tengiliður"
 
-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:837
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+#: lib/action.php:887
 #, fuzzy
 msgid "Badge"
 msgstr "Pot"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:866
+#: lib/action.php:916
 msgid "StatusNet software license"
 msgstr "Hugbúnaðarleyfi StatusNet"
 
@@ -6434,7 +6515,7 @@ msgstr "Hugbúnaðarleyfi StatusNet"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:873
+#: lib/action.php:923
 #, fuzzy, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -6444,7 +6525,7 @@ msgstr ""
 "broughtbyurl%%). "
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:876
+#: lib/action.php:926
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** er örbloggsþjónusta."
@@ -6453,7 +6534,7 @@ msgstr "**%%site.name%%** er örbloggsþjónusta."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:883
+#: lib/action.php:933
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -6465,51 +6546,51 @@ msgstr ""
 "licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:899
+#: lib/action.php:949
 #, fuzzy
 msgid "Site content license"
 msgstr "Hugbúnaðarleyfi StatusNet"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:906
+#: lib/action.php:956
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:913
+#: lib/action.php:963
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:917
+#: lib/action.php:967
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:949
+#: lib/action.php:999
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1285
+#: lib/action.php:1335
 msgid "Pagination"
 msgstr "Uppröðun"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1296
+#: lib/action.php:1346
 msgid "After"
 msgstr "Eftir"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1306
+#: lib/action.php:1356
 msgid "Before"
 msgstr "Áður"
 
@@ -6871,7 +6952,7 @@ msgid "AJAX error"
 msgstr "Ajax villa"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:233 lib/mailhandler.php:142
+#: lib/channel.php:233 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "Fullkláruð skipun"
 
@@ -6888,7 +6969,7 @@ msgstr "Enginn persónuleg síða með þessu einkenni."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:626
+#: lib/command.php:99 lib/command.php:630
 #, fuzzy
 msgid "User has no last notice."
 msgstr "Notandi hefur ekkert nýtt babl"
@@ -6955,6 +7036,14 @@ msgstr ""
 msgid "%1$s left group %2$s."
 msgstr ""
 
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: lib/command.php:426
+#, fuzzy, php-format
+msgctxt "WHOIS"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
 #. TRANS: Whois output. %s is the full name of the queried user.
 #: lib/command.php:430
 #, php-format
@@ -6992,130 +7081,138 @@ msgid ""
 "same server."
 msgstr ""
 
-#. TRANS: Message given if content is too long.
+#. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
 #: lib/command.php:488
 #, fuzzy, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr "Skilaboð eru of löng - 140 tákn eru í mesta lagi leyfð en þú sendir %d"
+msgid "Message too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] ""
+"Skilaboð eru of löng - 140 tákn eru í mesta lagi leyfð en þú sendir %d"
+msgstr[1] ""
+"Skilaboð eru of löng - 140 tákn eru í mesta lagi leyfð en þú sendir %d"
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:514
+#: lib/command.php:516
 msgid "Error sending direct message."
 msgstr "Villa kom upp við að senda bein skilaboð"
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:551
+#: lib/command.php:553
 #, fuzzy, php-format
 msgid "Notice from %s repeated."
 msgstr "Babl sent inn"
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:554
+#: lib/command.php:556
 msgid "Error repeating notice."
 msgstr "Villa kom upp í stillingu notanda."
 
-#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:589
+#: lib/command.php:591
 #, fuzzy, php-format
-msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
-msgstr "Skilaboð eru of löng - 140 tákn eru í mesta lagi leyfð en þú sendir %d"
+msgid "Notice too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] ""
+"Skilaboð eru of löng - 140 tákn eru í mesta lagi leyfð en þú sendir %d"
+msgstr[1] ""
+"Skilaboð eru of löng - 140 tákn eru í mesta lagi leyfð en þú sendir %d"
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:600
+#: lib/command.php:604
 #, fuzzy, php-format
 msgid "Reply to %s sent."
 msgstr "Svara þessu babli"
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:603
+#: lib/command.php:607
 #, fuzzy
 msgid "Error saving notice."
 msgstr "Vandamál komu upp við að vista babl."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:650
+#: lib/command.php:654
 #, fuzzy
 msgid "Specify the name of the user to subscribe to."
 msgstr "Tilgreindu nafn notandans sem þú vilt gerast áskrifandi að"
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:659
+#: lib/command.php:663
 #, fuzzy
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Þú ert ekki áskrifandi."
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:667
+#: lib/command.php:671
 #, php-format
 msgid "Subscribed to %s."
 msgstr ""
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:688 lib/command.php:799
+#: lib/command.php:692 lib/command.php:803
 #, fuzzy
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "Tilgreindu nafn notandans sem þú vilt hætta sem áskrifandi að"
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:699
+#: lib/command.php:703
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:719 lib/command.php:745
+#: lib/command.php:723 lib/command.php:749
 msgid "Command not yet implemented."
 msgstr "Skipun hefur ekki verið fullbúin"
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:723
+#: lib/command.php:727
 msgid "Notification off."
 msgstr "Tilkynningar af."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:726
+#: lib/command.php:730
 msgid "Can't turn off notification."
 msgstr "Get ekki slökkt á tilkynningum."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:749
+#: lib/command.php:753
 msgid "Notification on."
 msgstr "Tilkynningar á."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:752
+#: lib/command.php:756
 msgid "Can't turn on notification."
 msgstr "Get ekki kveikt á tilkynningum."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:766
+#: lib/command.php:770
 msgid "Login command is disabled."
 msgstr ""
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:779
+#: lib/command.php:783
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:808
+#: lib/command.php:812
 #, php-format
 msgid "Unsubscribed %s."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:826
+#: lib/command.php:830
 #, fuzzy
 msgid "You are not subscribed to anyone."
 msgstr "Þú ert ekki áskrifandi."
@@ -7123,7 +7220,7 @@ msgstr "Þú ert ekki áskrifandi."
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:831
+#: lib/command.php:835
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Þú ert nú þegar í áskrift að þessum notendum:"
@@ -7131,7 +7228,7 @@ msgstr[1] "Þú ert nú þegar í áskrift að þessum notendum:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:853
+#: lib/command.php:857
 #, fuzzy
 msgid "No one is subscribed to you."
 msgstr "Gat ekki leyft öðrum að gerast áskrifandi að þér."
@@ -7139,7 +7236,7 @@ msgstr "Gat ekki leyft öðrum að gerast áskrifandi að þér."
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:858
+#: lib/command.php:862
 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."
@@ -7147,7 +7244,7 @@ msgstr[1] "Gat ekki leyft öðrum að gerast áskrifandi að þér."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:880
+#: lib/command.php:884
 #, fuzzy
 msgid "You are not a member of any groups."
 msgstr "Þú ert ekki meðlimur í þessum hópi."
@@ -7155,14 +7252,14 @@ msgstr "Þú ert ekki meðlimur í þessum hópi."
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:885
+#: lib/command.php:889
 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."
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:900
+#: lib/command.php:904
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -7355,7 +7452,8 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 lágstafir eða tölustafir, engin greinarmerki eða bil"
 
 #: lib/groupeditform.php:163
-msgid "URL of the homepage or blog of the group or topic"
+#, fuzzy
+msgid "URL of the homepage or blog of the group or topic."
 msgstr "Vefslóð vefsíðu hópsins eða umfjöllunarefnisins"
 
 #: lib/groupeditform.php:168
@@ -7365,18 +7463,27 @@ msgstr "Lýstu hópnum eða umfjöllunarefninu með 140 táknum"
 
 #: lib/groupeditform.php:170
 #, fuzzy, php-format
-msgid "Describe the group or topic in %d characters"
-msgstr "Lýstu hópnum eða umfjöllunarefninu með 140 táknum"
+msgid "Describe the group or topic in %d character or less"
+msgid_plural "Describe the group or topic in %d characters or less"
+msgstr[0] "Lýstu hópnum eða umfjöllunarefninu með 140 táknum"
+msgstr[1] "Lýstu hópnum eða umfjöllunarefninu með 140 táknum"
 
-#: lib/groupeditform.php:179
+#: lib/groupeditform.php:182
+#, fuzzy
 msgid ""
-"Location for the group, if any, like \"City, State (or Region), Country\""
+"Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr "Staðsetning hópsins, ef einhver, eins og \"Borg, landshluti, land\""
 
-#: lib/groupeditform.php:187
+#: lib/groupeditform.php:190
 #, php-format
-msgid "Extra nicknames for the group, comma- or space- separated, max %d"
-msgstr ""
+msgid ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"alias allowed."
+msgid_plural ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"aliases allowed."
+msgstr[0] ""
+msgstr[1] ""
 
 #. TRANS: Menu item in the group navigation page.
 #: lib/groupnav.php:86
@@ -7838,7 +7945,7 @@ msgstr "Afsakið en þetta er ekki móttökutölvupóstfangið þitt."
 msgid "Sorry, no incoming email allowed."
 msgstr "Því miður er móttökutölvupóstur ekki leyfður."
 
-#: lib/mailhandler.php:228
+#: lib/mailhandler.php:229
 #, fuzzy, php-format
 msgid "Unsupported message type: %s"
 msgstr "Skráarsnið myndar ekki stutt."
@@ -8194,17 +8301,18 @@ msgid "Sandbox this user"
 msgstr "Opna á þennan notanda"
 
 #. TRANS: Fieldset legend for the search form.
-#: lib/searchaction.php:121
+#: lib/searchaction.php:120
 #, fuzzy
 msgid "Search site"
 msgstr "Leita"
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
-#: lib/searchaction.php:129
+#: lib/searchaction.php:128
 msgid "Keyword(s)"
 msgstr ""
 
+#. TRANS: Button text for searching site.
 #: lib/searchaction.php:130
 msgctxt "BUTTON"
 msgid "Search"
@@ -8297,8 +8405,8 @@ msgid "The theme file is missing or the upload failed."
 msgstr ""
 
 #: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:278 lib/themeuploader.php:282
-#: lib/themeuploader.php:290 lib/themeuploader.php:297
+#: lib/themeuploader.php:279 lib/themeuploader.php:283
+#: lib/themeuploader.php:291 lib/themeuploader.php:298
 #, fuzzy
 msgid "Failed saving theme."
 msgstr "Mistókst að uppfæra mynd"
@@ -8309,29 +8417,32 @@ msgstr ""
 
 #: lib/themeuploader.php:166
 #, php-format
-msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
-msgstr ""
+msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
+msgid_plural ""
+"Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr[0] ""
+msgstr[1] ""
 
-#: lib/themeuploader.php:178
+#: lib/themeuploader.php:179
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr ""
 
-#: lib/themeuploader.php:218
+#: lib/themeuploader.php:219
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
 msgstr ""
 
-#: lib/themeuploader.php:224
+#: lib/themeuploader.php:225
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr ""
 
-#: lib/themeuploader.php:241
+#: lib/themeuploader.php:242
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr ""
 
-#: lib/themeuploader.php:259
+#: lib/themeuploader.php:260
 msgid "Error opening theme archive."
 msgstr "Vill kom upp við að aflétta notendalokun."
 
@@ -8519,20 +8630,38 @@ msgstr[0] ""
 msgstr[1] ""
 "Skilaboð eru of löng - 140 tákn eru í mesta lagi leyfð en þú sendir %d"
 
-#: scripts/restoreuser.php:82
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: scripts/restoreuser.php:61
 #, php-format
-msgid "Backup file for user %s (%s)"
+msgid "Getting backup from file '%s'."
 msgstr ""
 
-#: scripts/restoreuser.php:88
+#. TRANS: Commandline script output.
+#: scripts/restoreuser.php:91
 #, fuzzy
 msgid "No user specified; using backup user."
 msgstr "Engin persónuleg síða tilgreind"
 
-#: scripts/restoreuser.php:94
+#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
+#: scripts/restoreuser.php:98
 #, php-format
-msgid "%d entries in backup."
-msgstr ""
+msgid "%d entry in backup."
+msgid_plural "%d entries in backup."
+msgstr[0] ""
+msgstr[1] ""
+
+#, fuzzy
+#~ msgid "Name is too long (maximum 255 chars)."
+#~ msgstr "Fullt nafn er of langt (í mesta lagi 255 stafir)."
 
-#~ msgid "Description is too long (max %d chars)."
-#~ msgstr "Staðsetning er of löng (í mesta lagi %d stafir)."
+#, fuzzy
+#~ msgid "Organization is too long (maximum 255 chars)."
+#~ msgstr "Staðsetning er of löng (í mesta lagi 255 stafir)."
+
+#, fuzzy
+#~ msgid "That's too long. Max notice size is %d chars."
+#~ msgstr "Þetta er of langt. Hámarkslengd babls er 140 tákn."
+
+#, fuzzy
+#~ msgid " tagged %s"
+#~ msgstr "Babl merkt með %s"
diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po
index 8242d3244..083561229 100644
--- a/locale/it/LC_MESSAGES/statusnet.po
+++ b/locale/it/LC_MESSAGES/statusnet.po
@@ -11,17 +11,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-30 23:18+0000\n"
-"PO-Revision-Date: 2010-10-30 23:20:28+0000\n"
+"POT-Creation-Date: 2010-11-02 22:51+0000\n"
+"PO-Revision-Date: 2010-11-02 22:53:26+0000\n"
 "Language-Team: Italian <http://translatewiki.net/wiki/Portal:it>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r75708); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r75875); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: it\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2010-10-30 09:48:40+0000\n"
+"X-POT-Import-Date: 2010-10-30 23:42:01+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -80,15 +80,20 @@ msgstr "Salva impostazioni di accesso"
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
+#. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
+#. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #: actions/accessadminpanel.php:193 actions/emailsettings.php:228
-#: actions/imsettings.php:187 actions/pathsadminpanel.php:512
-#: actions/profilesettings.php:201 actions/smssettings.php:209
-#: actions/subscriptions.php:246 lib/applicationeditform.php:355
+#: actions/imsettings.php:187 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: lib/applicationeditform.php:355 lib/groupeditform.php:207
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Salva"
@@ -139,7 +144,7 @@ msgstr "Pagina inesistente."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:495 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Utente inesistente."
@@ -212,7 +217,9 @@ msgstr ""
 
 #. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:208
+#. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -568,8 +575,11 @@ msgstr "Nome troppo lungo (max 255 caratteri)."
 #. TRANS: Group edit form validation error.
 #. TRANS: Form validation error in New application form.
 #. TRANS: %d is the maximum number of characters for the description.
+#. TRANS: Group create form validation error.
+#. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:220 actions/editapplication.php:201
 #: actions/editgroup.php:216 actions/newapplication.php:178
+#: actions/newgroup.php:152
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -729,14 +739,14 @@ msgstr "Autorizzazione non presente."
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:172 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:74
 #: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
 #: actions/groupunblock.php:65 actions/imsettings.php:230
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
-#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/othersettings.php:153 actions/passwordsettings.php:138
 #: actions/profilesettings.php:221 actions/recoverpassword.php:350
 #: actions/register.php:172 actions/remotesubscribe.php:77
 #: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
@@ -917,20 +927,21 @@ msgstr "Non puoi eliminare il messaggio di un altro utente."
 
 #. TRANS: Client error displayed trying to repeat a non-existing notice through the API.
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
+#. TRANS: Error message displayed trying to delete a non-existing notice.
 #: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/deletenotice.php:58 actions/shownotice.php:92
+#: actions/deletenotice.php:61 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "Nessun messaggio."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:535
+#: actions/apistatusesretweet.php:83 lib/command.php:537
 msgid "Cannot repeat your own notice."
 msgstr "Non puoi ripetere un tuo messaggio."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:541
+#: actions/apistatusesretweet.php:92 lib/command.php:543
 msgid "Already repeated that notice."
 msgstr "Hai già ripetuto quel messaggio."
 
@@ -951,7 +962,8 @@ msgstr "Il client deve fornire un parametro \"status\" con un valore."
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#: actions/apistatusesupdate.php:244
+#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
+#: lib/mailhandler.php:60
 #, fuzzy, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
@@ -966,7 +978,7 @@ msgstr "Metodo delle API non trovato."
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
-#: actions/apistatusesupdate.php:308
+#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
 #, fuzzy, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
@@ -1179,17 +1191,18 @@ msgstr "Scegli un'area quadrata per la tua immagine personale"
 msgid "Lost our file data."
 msgstr "Perso il nostro file di dati."
 
-#: actions/avatarsettings.php:384
+#. TRANS: Success message for having updated a user avatar.
+#: actions/avatarsettings.php:385
 msgid "Avatar updated."
 msgstr "Immagine aggiornata."
 
 #. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
-#: actions/avatarsettings.php:388
+#: actions/avatarsettings.php:389
 msgid "Failed updating avatar."
 msgstr "Aggiornamento dell'immagine non riuscito."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:412
+#: actions/avatarsettings.php:413
 msgid "Avatar deleted."
 msgstr "Immagine eliminata."
 
@@ -1221,8 +1234,8 @@ msgstr ""
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:154 actions/deleteapplication.php:154
-#: actions/deletegroup.php:220 actions/deletenotice.php:150
+#: actions/block.php:154 actions/deleteapplication.php:157
+#: actions/deletegroup.php:220 actions/deletenotice.php:155
 #: actions/deleteuser.php:152 actions/groupblock.php:178
 msgctxt "BUTTON"
 msgid "No"
@@ -1240,8 +1253,8 @@ msgstr "Non bloccare questo utente"
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:161 actions/deleteapplication.php:161
-#: actions/deletegroup.php:227 actions/deletenotice.php:157
+#: actions/block.php:161 actions/deleteapplication.php:164
+#: actions/deletegroup.php:227 actions/deletenotice.php:162
 #: actions/deleteuser.php:159 actions/groupblock.php:185
 msgctxt "BUTTON"
 msgid "Yes"
@@ -1358,12 +1371,13 @@ msgstr "Quell'indirizzo è già stato confermato."
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
 #. TRANS: Server error thrown on database error updating IM preferences.
 #. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
 #. TRANS: Server error thrown when user profile settings could not be updated.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #: actions/confirmaddress.php:118 actions/emailsettings.php:331
 #: actions/emailsettings.php:477 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:174
+#: actions/imsettings.php:442 actions/othersettings.php:184
 #: actions/profilesettings.php:326 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
@@ -1399,16 +1413,19 @@ msgstr "Conversazione"
 msgid "Notices"
 msgstr "Messaggi"
 
-#: actions/deleteapplication.php:63
+#. TRANS: Client error displayed trying to delete an application while not logged in.
+#: actions/deleteapplication.php:62
 msgid "You must be logged in to delete an application."
 msgstr "Devi eseguire l'accesso per eliminare un'applicazione."
 
+#. TRANS: Client error displayed trying to delete an application that does not exist.
 #: actions/deleteapplication.php:71
 msgid "Application not found."
 msgstr "Applicazione non trovata."
 
+#. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
-#: actions/deleteapplication.php:78 actions/editapplication.php:78
+#: actions/deleteapplication.php:79 actions/editapplication.php:78
 #: actions/showapplication.php:94
 msgid "You are not the owner of this application."
 msgstr "Questa applicazione non è di tua proprietà."
@@ -1416,15 +1433,18 @@ msgstr "Questa applicazione non è di tua proprietà."
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
 #: actions/newapplication.php:114 actions/showapplication.php:118
-#: lib/action.php:1354
+#: lib/action.php:1404
 msgid "There was a problem with your session token."
 msgstr "Si è verificato un problema con il tuo token di sessione."
 
-#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+#. TRANS: Title for delete application page.
+#. TRANS: Fieldset legend on delete application page.
+#: actions/deleteapplication.php:124 actions/deleteapplication.php:149
 msgid "Delete application"
 msgstr "Elimina applicazione"
 
-#: actions/deleteapplication.php:149
+#. TRANS: Confirmation text on delete application page.
+#: actions/deleteapplication.php:152
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
 "about the application from the database, including all existing user "
@@ -1434,12 +1454,12 @@ msgstr ""
 "riguardo all'applicazione dal database, comprese tutte le connessioni utente."
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:158
+#: actions/deleteapplication.php:161
 msgid "Do not delete this application"
 msgstr "Non eliminare l'applicazione"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:164
+#: actions/deleteapplication.php:167
 msgid "Delete this application"
 msgstr "Elimina l'applicazione"
 
@@ -1475,13 +1495,14 @@ msgstr "Impossibile aggiornare il gruppo."
 msgid "Deleted group %s"
 msgstr "%1$s ha lasciato il gruppo %2$s"
 
-#. TRANS: Title.
+#. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
 #: actions/deletegroup.php:176 actions/deletegroup.php:202
 #, fuzzy
 msgid "Delete group"
 msgstr "Elimina utente"
 
+#. TRANS: Warning in form for deleleting a group.
 #: actions/deletegroup.php:206
 #, fuzzy
 msgid ""
@@ -1504,10 +1525,11 @@ msgstr "Non eliminare il messaggio"
 msgid "Delete this group"
 msgstr "Elimina questo utente"
 
+#. TRANS: Error message displayed trying to delete a notice while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1517,11 +1539,13 @@ msgstr "Elimina questo utente"
 msgid "Not logged in."
 msgstr "Accesso non effettuato."
 
-#: actions/deletenotice.php:74
+#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
+#: actions/deletenotice.php:78
 msgid "Can't delete this notice."
 msgstr "Impossibile eliminare questo messaggio."
 
-#: actions/deletenotice.php:106
+#. TRANS: Instructions for deleting a notice.
+#: actions/deletenotice.php:110
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
@@ -1529,21 +1553,24 @@ msgstr ""
 "Stai per eliminare definitivamente un messaggio. Una volta fatto non sarà "
 "possibile recuperarlo."
 
-#: actions/deletenotice.php:112 actions/deletenotice.php:144
+#. TRANS: Page title when deleting a notice.
+#. TRANS: Fieldset legend for the delete notice form.
+#: actions/deletenotice.php:117 actions/deletenotice.php:148
 msgid "Delete notice"
 msgstr "Elimina messaggio"
 
-#: actions/deletenotice.php:147
+#. TRANS: Message for the delete notice form.
+#: actions/deletenotice.php:152
 msgid "Are you sure you want to delete this notice?"
 msgstr "Vuoi eliminare questo messaggio?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:154
+#: actions/deletenotice.php:159
 msgid "Do not delete this notice"
 msgstr "Non eliminare il messaggio"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:161 lib/noticelist.php:667
+#: actions/deletenotice.php:166 lib/noticelist.php:667
 msgid "Delete this notice"
 msgstr "Elimina questo messaggio"
 
@@ -1707,11 +1734,9 @@ msgstr "Reimposta i valori predefiniti"
 
 #. TRANS: Submit button title.
 #: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
-#: actions/othersettings.php:126 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: actions/useradminpanel.php:295 lib/applicationeditform.php:357
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: lib/applicationeditform.php:357 lib/designsettings.php:256
 msgid "Save"
 msgstr "Salva"
 
@@ -1759,9 +1784,9 @@ msgid "Name is required."
 msgstr "Il nome è richiesto."
 
 #. TRANS: Validation error shown when providing too long a name in the "Edit application" form.
-#: actions/editapplication.php:188
+#: actions/editapplication.php:188 actions/newapplication.php:169
 #, fuzzy
-msgid "Name is too long (max 255 characters)."
+msgid "Name is too long (maximum 255 characters)."
 msgstr "Il nome è troppo lungo (max 255 caratteri)."
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
@@ -1790,7 +1815,7 @@ msgid "Organization is required."
 msgstr "L'organizzazione è richiesta."
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#: actions/editapplication.php:223
+#: actions/editapplication.php:223 actions/newapplication.php:199
 #, fuzzy
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "L'organizzazione è troppo lunga (max 255 caratteri)."
@@ -2592,7 +2617,7 @@ msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Pubblica un MicroID per il mio indirizzo Jabber/GTalk"
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:180
+#: actions/imsettings.php:290 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "Preferenze salvate."
 
@@ -2717,10 +2742,9 @@ msgstr[1] "Hai già un abbonamento a questi utenti:"
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#. TRANS: Whois output.
-#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:145 actions/invite.php:159 lib/command.php:426
-#, php-format
+#: actions/invite.php:145 actions/invite.php:159
+#, fuzzy, php-format
+msgctxt "INVITE"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
@@ -2907,7 +2931,8 @@ msgstr ""
 "licenza \"Tutti i diritti riservati\"."
 
 #: actions/licenseadminpanel.php:156
-msgid "Invalid license title. Max length is 255 characters."
+#, fuzzy
+msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "Titolo della licenza non valido. Lunghezza massima 255 caratteri."
 
 #: actions/licenseadminpanel.php:168
@@ -3080,20 +3105,10 @@ msgstr "Devi eseguire l'accesso per registrare un'applicazione."
 msgid "Use this form to register a new application."
 msgstr "Usa questo modulo per registrare un'applicazione."
 
-#: actions/newapplication.php:169
-#, fuzzy
-msgid "Name is too long (maximum 255 chars)."
-msgstr "Il nome è troppo lungo (max 255 caratteri)."
-
 #: actions/newapplication.php:184
 msgid "Source URL is required."
 msgstr "L'URL sorgente è richiesto."
 
-#: actions/newapplication.php:199
-#, fuzzy
-msgid "Organization is too long (maximum 255 chars)."
-msgstr "L'organizzazione è troppo lunga (max 255 caratteri)."
-
 #: actions/newapplication.php:266 actions/newapplication.php:275
 msgid "Could not create application."
 msgstr "Impossibile creare l'applicazione."
@@ -3113,14 +3128,14 @@ msgid "New message"
 msgstr "Nuovo messaggio"
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:499
+#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501
 msgid "You can't send a message to this user."
 msgstr "Non puoi inviare un messaggio a questo utente."
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
 #: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
-#: lib/command.php:579
+#: lib/command.php:581
 msgid "No content!"
 msgstr "Nessun contenuto!"
 
@@ -3129,7 +3144,7 @@ msgid "No recipient specified."
 msgstr "Nessun destinatario specificato."
 
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:503
+#: actions/newmessage.php:167 lib/command.php:505
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "Non inviarti un messaggio, piuttosto ripetilo a voce dolcemente."
@@ -3140,12 +3155,12 @@ msgstr "Messaggio inviato"
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:511
+#: actions/newmessage.php:188 lib/command.php:513
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Messaggio diretto a %s inviato."
 
-#: actions/newmessage.php:213 actions/newnotice.php:263
+#: actions/newmessage.php:213 actions/newnotice.php:264
 msgid "Ajax Error"
 msgstr "Errore di Ajax"
 
@@ -3153,18 +3168,7 @@ msgstr "Errore di Ajax"
 msgid "New notice"
 msgstr "Nuovo messaggio"
 
-#: actions/newnotice.php:159 lib/mailhandler.php:60
-#, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr "Troppo lungo. Lunghezza massima %d caratteri."
-
-#: actions/newnotice.php:183
-#, php-format
-msgid "Max notice size is %d chars, including attachment URL."
-msgstr ""
-"La dimensione massima di un messaggio è di %d caratteri, compreso l'URL."
-
-#: actions/newnotice.php:229
+#: actions/newnotice.php:230
 msgid "Notice posted"
 msgstr "Messaggio inviato"
 
@@ -3334,36 +3338,46 @@ msgstr "Cerca persone"
 msgid "Notice Search"
 msgstr "Cerca messaggi"
 
-#: actions/othersettings.php:60
+#: actions/othersettings.php:59
 msgid "Other settings"
 msgstr "Altre impostazioni"
 
+#. TRANS: Instructions for tab "Other" in user profile settings.
 #: actions/othersettings.php:71
 msgid "Manage various other options."
 msgstr "Gestisci altre opzioni."
 
-#: actions/othersettings.php:108
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/othersettings.php:111
 msgid " (free service)"
 msgstr " (servizio libero)"
 
-#: actions/othersettings.php:116
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/othersettings.php:120
 msgid "Shorten URLs with"
 msgstr "Accorcia gli URL con"
 
-#: actions/othersettings.php:117
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/othersettings.php:122
 msgid "Automatic shortening service to use."
 msgstr "Servizio di autoriduzione da usare"
 
-#: actions/othersettings.php:122
+#. TRANS: Label for checkbox.
+#: actions/othersettings.php:128
 msgid "View profile designs"
 msgstr "Visualizza aspetto"
 
-#: actions/othersettings.php:123
+#. TRANS: Tooltip for checkbox.
+#: actions/othersettings.php:130
 msgid "Show or hide profile designs."
 msgstr "Mostra o nasconde gli aspetti del profilo"
 
-#: actions/othersettings.php:153
-msgid "URL shortening service is too long (max 50 chars)."
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/othersettings.php:162
+#, fuzzy
+msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "Il servizio di riduzione degli URL è troppo lungo (max 50 caratteri)."
 
 #: actions/otp.php:69
@@ -3856,7 +3870,7 @@ msgstr "Biografia"
 #. TRANS: Label for group location (dt). Text hidden by default.
 #: actions/profilesettings.php:149 actions/register.php:485
 #: actions/showgroup.php:267 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:177
+#: actions/userauthorization.php:166 lib/groupeditform.php:180
 #: lib/userprofile.php:165
 msgid "Location"
 msgstr "Ubicazione"
@@ -4194,7 +4208,8 @@ msgid "Unexpected password reset."
 msgstr "Ripristino della password inaspettato."
 
 #: actions/recoverpassword.php:365
-msgid "Password must be 6 chars or more."
+#, fuzzy
+msgid "Password must be 6 characters or more."
 msgstr "La password deve essere lunga almeno 6 caratteri."
 
 #: actions/recoverpassword.php:369
@@ -4571,7 +4586,7 @@ msgstr "Organizzazione"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:172
+#: lib/applicationeditform.php:208 lib/groupeditform.php:175
 msgid "Description"
 msgstr "Descrizione"
 
@@ -4721,7 +4736,7 @@ msgid "Note"
 msgstr "Nota"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:298 lib/groupeditform.php:184
+#: actions/showgroup.php:298 lib/groupeditform.php:187
 msgid "Aliases"
 msgstr "Alias"
 
@@ -4853,47 +4868,67 @@ msgstr "Messaggio da %1$s su %2$s"
 msgid "Notice deleted."
 msgstr "Messaggio eliminato."
 
-#: actions/showstream.php:72
-#, php-format
-msgid " tagged %s"
-msgstr " etichettati con %s"
+#. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
+#: actions/showstream.php:70
+#, fuzzy, php-format
+msgid "%1$s tagged %2$s"
+msgstr "%1$s, pagina %2$d"
 
-#: actions/showstream.php:78
+#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#: actions/showstream.php:74
+#, fuzzy, php-format
+msgid "%1$s tagged %2$s, page %3$d"
+msgstr "Messaggi etichettati con %1$s, pagina %2$d"
+
+#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$d is the page number.
+#: actions/showstream.php:82
 #, php-format
 msgid "%1$s, page %2$d"
 msgstr "%1$s, pagina %2$d"
 
-#: actions/showstream.php:120
+#. TRANS: Title for link to notice feed.
+#. TRANS: %1$s is a user nickname, %2$s is a hashtag.
+#: actions/showstream.php:127
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Feed dei messaggi per %1$s etichettati con %2$s (RSS 1.0)"
 
-#: actions/showstream.php:127
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:136
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "Feed dei messaggi per %s (RSS 1.0)"
 
-#: actions/showstream.php:134
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:145
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "Feed dei messaggi per %s (RSS 2.0)"
 
-#: actions/showstream.php:141
+#: actions/showstream.php:152
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "Feed dei messaggi per %s (Atom)"
 
-#: actions/showstream.php:146
+#. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
+#. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
+#: actions/showstream.php:159
 #, php-format
 msgid "FOAF for %s"
 msgstr "FOAF per %s"
 
-#: actions/showstream.php:197
-#, php-format
-msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
+#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
+#: actions/showstream.php:211
+#, fuzzy, php-format
+msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr "Questa è l'attività di %1$s, ma %2$s non ha ancora scritto nulla."
 
-#: actions/showstream.php:202
+#. TRANS: Second sentence of empty list message for a stream for the user themselves.
+#: actions/showstream.php:217
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -4901,7 +4936,9 @@ msgstr ""
 "Visto niente di interessante? Non hai scritto ancora alcun messaggio, questo "
 "potrebbe essere un buon momento per iniziare! :)"
 
-#: actions/showstream.php:204
+#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:221
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -4910,7 +4947,9 @@ msgstr ""
 "[Scrivi qualche cosa](%%%%action.newnotice%%%%?status_textarea=%s) su questo "
 "argomento!"
 
-#: actions/showstream.php:243
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:264
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4924,7 +4963,9 @@ msgstr ""
 "i messaggi di **%s** e di molti altri! ([Maggiori informazioni](%%%%doc.help%"
 "%%%))"
 
-#: actions/showstream.php:248
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:271
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4935,7 +4976,8 @@ msgstr ""
 "it.wikipedia.org/wiki/Microblogging) basato sul software libero [StatusNet]"
 "(http://status.net/). "
 
-#: actions/showstream.php:305
+#. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
+#: actions/showstream.php:328
 #, php-format
 msgid "Repeat of %s"
 msgstr "Ripetizione di %s"
@@ -5049,31 +5091,40 @@ msgstr ""
 "Quanto tempo gli utenti devono attendere (in secondi) prima di inviare "
 "nuovamente lo stesso messaggio"
 
-#: actions/sitenoticeadminpanel.php:56
+#. TRANS: Page title for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:55
 msgid "Site Notice"
 msgstr "Messaggio del sito"
 
-#: actions/sitenoticeadminpanel.php:67
+#. TRANS: Instructions for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:66
 msgid "Edit site-wide message"
 msgstr "Modifica il messaggio del sito"
 
-#: actions/sitenoticeadminpanel.php:103
+#. TRANS: Server error displayed when saving a site-wide notice was impossible.
+#: actions/sitenoticeadminpanel.php:101
 msgid "Unable to save site notice."
 msgstr "Impossibile salvare il messaggio del sito."
 
-#: actions/sitenoticeadminpanel.php:113
-msgid "Max length for the site-wide notice is 255 chars."
+#. TRANS: Client error displayed when a site-wide notice was longer than allowed.
+#: actions/sitenoticeadminpanel.php:112
+#, fuzzy
+msgid "Maximum length for the site-wide notice is 255 characters."
 msgstr "La dimensione massima del messaggio del sito è di 255 caratteri."
 
+#. TRANS: Label for site-wide notice text field in admin panel.
 #: actions/sitenoticeadminpanel.php:176
 msgid "Site notice text"
 msgstr "Testo messaggio del sito"
 
-#: actions/sitenoticeadminpanel.php:178
-msgid "Site-wide notice text (255 chars max; HTML okay)"
+#. TRANS: Tooltip for site-wide notice text field in admin panel.
+#: actions/sitenoticeadminpanel.php:179
+#, fuzzy
+msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr "Testo messaggio del sito (massimo 255 caratteri, HTML consentito)"
 
-#: actions/sitenoticeadminpanel.php:198
+#. TRANS: Title for button to save site notice in admin panel.
+#: actions/sitenoticeadminpanel.php:201
 msgid "Save site notice"
 msgstr "Salva messaggio"
 
@@ -5540,76 +5591,94 @@ msgstr ""
 "licenza \"%2$s\" di questo sito."
 
 #. TRANS: User admin panel title
-#: actions/useradminpanel.php:60
+#: actions/useradminpanel.php:58
 msgctxt "TITLE"
 msgid "User"
 msgstr "Utente"
 
-#: actions/useradminpanel.php:71
+#. TRANS: Instruction for user admin panel.
+#: actions/useradminpanel.php:69
 msgid "User settings for this StatusNet site"
 msgstr "Impostazioni utente per questo sito StatusNet"
 
-#: actions/useradminpanel.php:150
+#. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
+#: actions/useradminpanel.php:147
 msgid "Invalid bio limit. Must be numeric."
 msgstr "Limite per la biografia non valido. Deve essere numerico."
 
-#: actions/useradminpanel.php:156
-msgid "Invalid welcome text. Max length is 255 characters."
+#. TRANS: Form validation error in user admin panel when welcome text is too long.
+#: actions/useradminpanel.php:154
+#, fuzzy
+msgid "Invalid welcome text. Maximum length is 255 characters."
 msgstr ""
 "Testo di benvenuto non valido. La lunghezza massima è di 255 caratteri."
 
+#. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
+#. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
-#, php-format
-msgid "Invalid default subscripton: '%1$s' is not user."
+#, fuzzy, php-format
+msgid "Invalid default subscripton: '%1$s' is not a user."
 msgstr "Abbonamento predefinito non valido: \"%1$s\" non è un utente."
 
 #. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:106
+#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
 #: lib/personalgroupnav.php:109
 msgid "Profile"
 msgstr "Profilo"
 
-#: actions/useradminpanel.php:223
+#. TRANS: Field label in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:220
 msgid "Bio Limit"
 msgstr "Limite biografia"
 
-#: actions/useradminpanel.php:224
+#. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:222
 msgid "Maximum length of a profile bio in characters."
 msgstr "Lunghezza massima in caratteri della biografia"
 
-#: actions/useradminpanel.php:232
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:231
 msgid "New users"
 msgstr "Nuovi utenti"
 
+#. TRANS: Field label in user admin panel for setting new user welcome text.
 #: actions/useradminpanel.php:236
 msgid "New user welcome"
 msgstr "Messaggio per nuovi utenti"
 
-#: actions/useradminpanel.php:237
-msgid "Welcome text for new users (Max 255 chars)."
+#. TRANS: Tooltip in user admin panel for setting new user welcome text.
+#: actions/useradminpanel.php:238
+#, fuzzy
+msgid "Welcome text for new users (maximum 255 characters)."
 msgstr "Messaggio di benvenuto per nuovi utenti (max 255 caratteri)"
 
-#: actions/useradminpanel.php:242
+#. TRANS: Field label in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:244
 msgid "Default subscription"
 msgstr "Abbonamento predefinito"
 
-#: actions/useradminpanel.php:243
+#. TRANS: Tooltip in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:246
 msgid "Automatically subscribe new users to this user."
 msgstr "Abbonare automaticamente i nuovi utenti a questo utente"
 
-#: actions/useradminpanel.php:252
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:256
 msgid "Invitations"
 msgstr "Inviti"
 
-#: actions/useradminpanel.php:257
+#. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:262
 msgid "Invitations enabled"
 msgstr "Inviti abilitati"
 
-#: actions/useradminpanel.php:259
+#. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:265
 msgid "Whether to allow users to invite new users."
 msgstr "Indica se consentire agli utenti di invitarne di nuovi"
 
-#: actions/useradminpanel.php:295
+#. TRANS: Title for button to save user settings in user admin panel.
+#: actions/useradminpanel.php:302
 msgid "Save user settings"
 msgstr "Salva impostazioni utente"
 
@@ -5819,7 +5888,7 @@ msgid "Plugins"
 msgstr "Plugin"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:831
+#: actions/version.php:198 lib/action.php:880
 msgid "Version"
 msgstr "Versione"
 
@@ -6030,9 +6099,16 @@ msgstr "Impossibile salvare le informazioni del gruppo locale."
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
+#. TRANS: Full name of a profile or group followed by nickname in parens
+#: classes/Profile.php:164
+#, fuzzy, php-format
+msgctxt "FANCYNAME"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:791
+#: classes/Profile.php:812
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
@@ -6040,7 +6116,7 @@ msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:800
+#: classes/Profile.php:821
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6187,194 +6263,201 @@ msgstr "%1$s - %2$s"
 msgid "Untitled page"
 msgstr "Pagina senza nome"
 
+#. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
+#: lib/action.php:310
+msgctxt "TOOLTIP"
+msgid "Show more"
+msgstr ""
+
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:477
+#: lib/action.php:526
 msgid "Primary site navigation"
 msgstr "Esplorazione sito primaria"
 
 #. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:483
+#: lib/action.php:532
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "Profilo personale e attività degli amici"
 
 #. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:486
+#: lib/action.php:535
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Personale"
 
 #. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:488
+#: lib/action.php:537
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
 msgstr "Modifica la tua email, immagine, password o il tuo profilo"
 
 #. TRANS: Main menu option when logged in for access to user settings
-#: lib/action.php:491
+#: lib/action.php:540
 msgid "Account"
 msgstr "Account"
 
 #. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:493
+#: lib/action.php:542
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "Connettiti con altri servizi"
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:496
+#: lib/action.php:545
 msgid "Connect"
 msgstr "Connetti"
 
 #. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:499
+#: lib/action.php:548
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "Modifica la configurazione del sito"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:502 lib/groupnav.php:117
+#: lib/action.php:551 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Amministra"
 
 #. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:506
+#: lib/action.php:555
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Invita amici e colleghi a seguirti su %s"
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:509
+#: lib/action.php:558
 msgctxt "MENU"
 msgid "Invite"
 msgstr "Invita"
 
 #. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:515
+#: lib/action.php:564
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "Termina la tua sessione sul sito"
 
 #. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:518
+#: lib/action.php:567
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Esci"
 
 #. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:523
+#: lib/action.php:572
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "Crea un account"
 
 #. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:526
+#: lib/action.php:575
 msgctxt "MENU"
 msgid "Register"
 msgstr "Registrati"
 
 #. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:529
+#: lib/action.php:578
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "Accedi al sito"
 
 #. TRANS: Main menu option when not logged in to log in
-#: lib/action.php:532
+#: lib/action.php:581
 msgctxt "MENU"
 msgid "Login"
 msgstr "Accedi"
 
 #. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:535
+#: lib/action.php:584
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Aiutami!"
 
 #. TRANS: Main menu option for help on the StatusNet site
-#: lib/action.php:538
+#: lib/action.php:587
 msgctxt "MENU"
 msgid "Help"
 msgstr "Aiuto"
 
 #. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:541
+#: lib/action.php:590
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr "Cerca persone o del testo"
 
 #. TRANS: Main menu option when logged in or when the StatusNet instance is not private
-#: lib/action.php:544
+#: lib/action.php:593
 msgctxt "MENU"
 msgid "Search"
 msgstr "Cerca"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:566 lib/adminpanelaction.php:387
+#: lib/action.php:615 lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "Messaggio del sito"
 
 #. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:633
+#: lib/action.php:682
 msgid "Local views"
 msgstr "Viste locali"
 
 #. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:703
+#: lib/action.php:752
 msgid "Page notice"
 msgstr "Pagina messaggio"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:804
+#: lib/action.php:853
 msgid "Secondary site navigation"
 msgstr "Esplorazione secondaria del sito"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:810
+#: lib/action.php:859
 msgid "Help"
 msgstr "Aiuto"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:813
+#: lib/action.php:862
 msgid "About"
 msgstr "Informazioni"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:816
+#: lib/action.php:865
 msgid "FAQ"
 msgstr "FAQ"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:821
+#: lib/action.php:870
 msgid "TOS"
 msgstr "TOS"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:825
+#: lib/action.php:874
 msgid "Privacy"
 msgstr "Privacy"
 
-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:828
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+#: lib/action.php:877
 msgid "Source"
 msgstr "Sorgenti"
 
-#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:834
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+#: lib/action.php:884
 msgid "Contact"
 msgstr "Contatti"
 
-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:837
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+#: lib/action.php:887
 msgid "Badge"
 msgstr "Badge"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:866
+#: lib/action.php:916
 msgid "StatusNet software license"
 msgstr "Licenza del software StatusNet"
 
@@ -6382,7 +6465,7 @@ msgstr "Licenza del software StatusNet"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:873
+#: lib/action.php:923
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -6392,7 +6475,7 @@ msgstr ""
 "(%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:876
+#: lib/action.php:926
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** è un servizio di microblog."
@@ -6401,7 +6484,7 @@ msgstr "**%%site.name%%** è un servizio di microblog."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:883
+#: lib/action.php:933
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -6413,27 +6496,27 @@ msgstr ""
 "(http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:899
+#: lib/action.php:949
 msgid "Site content license"
 msgstr "Licenza del contenuto del sito"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:906
+#: lib/action.php:956
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "I contenuti e i dati di %1$s sono privati e confidenziali."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:913
+#: lib/action.php:963
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 "I contenuti e i dati sono copyright di %1$s. Tutti i diritti riservati."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:917
+#: lib/action.php:967
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "I contenuti e i dati sono forniti dai collaboratori. Tutti i diritti "
@@ -6441,7 +6524,7 @@ msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:949
+#: lib/action.php:999
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
@@ -6449,19 +6532,19 @@ msgstr ""
 "licenza %2$s."
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1285
+#: lib/action.php:1335
 msgid "Pagination"
 msgstr "Paginazione"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1296
+#: lib/action.php:1346
 msgid "After"
 msgstr "Successivi"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1306
+#: lib/action.php:1356
 msgid "Before"
 msgstr "Precedenti"
 
@@ -6807,7 +6890,7 @@ msgid "AJAX error"
 msgstr "Errore di Ajax"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:233 lib/mailhandler.php:142
+#: lib/channel.php:233 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "Comando completato"
 
@@ -6823,7 +6906,7 @@ msgstr "Un messaggio con quel ID non esiste."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:626
+#: lib/command.php:99 lib/command.php:630
 msgid "User has no last notice."
 msgstr "L'utente non ha un ultimo messaggio."
 
@@ -6892,6 +6975,14 @@ msgstr "L'utente %1$s è entrato nel gruppo %2$s."
 msgid "%1$s left group %2$s."
 msgstr "%1$s ha lasciato il gruppo %2$s."
 
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: lib/command.php:426
+#, fuzzy, php-format
+msgctxt "WHOIS"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
 #. TRANS: Whois output. %s is the full name of the queried user.
 #: lib/command.php:430
 #, php-format
@@ -6931,113 +7022,117 @@ msgstr ""
 "%s è un profilo remoto. È possibile inviare messaggi privati solo agli "
 "utenti sullo stesso server."
 
-#. TRANS: Message given if content is too long.
+#. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
 #: lib/command.php:488
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr "Messaggio troppo lungo: massimo %1$d caratteri, inviati %2$d."
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] "Messaggio troppo lungo: massimo %1$d caratteri, inviati %2$d."
+msgstr[1] "Messaggio troppo lungo: massimo %1$d caratteri, inviati %2$d."
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:514
+#: lib/command.php:516
 msgid "Error sending direct message."
 msgstr "Errore nell'inviare il messaggio diretto."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:551
+#: lib/command.php:553
 #, php-format
 msgid "Notice from %s repeated."
 msgstr "Messaggio da %s ripetuto."
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:554
+#: lib/command.php:556
 msgid "Error repeating notice."
 msgstr "Errore nel ripetere il messaggio."
 
-#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:589
-#, php-format
-msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
-msgstr "Messaggio troppo lungo: massimo %1$d caratteri, inviati %2$d."
+#: lib/command.php:591
+#, fuzzy, php-format
+msgid "Notice too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] "Messaggio troppo lungo: massimo %1$d caratteri, inviati %2$d."
+msgstr[1] "Messaggio troppo lungo: massimo %1$d caratteri, inviati %2$d."
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:600
+#: lib/command.php:604
 #, php-format
 msgid "Reply to %s sent."
 msgstr "Risposta a %s inviata."
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:603
+#: lib/command.php:607
 msgid "Error saving notice."
 msgstr "Errore nel salvare il messaggio."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:650
+#: lib/command.php:654
 msgid "Specify the name of the user to subscribe to."
 msgstr "Specifica il nome dell'utente a cui abbonarti."
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:659
+#: lib/command.php:663
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Impossibile abbonarsi ai profili OMB attraverso un comando."
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:667
+#: lib/command.php:671
 #, php-format
 msgid "Subscribed to %s."
 msgstr "Abbonati a %s."
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:688 lib/command.php:799
+#: lib/command.php:692 lib/command.php:803
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "Specifica il nome dell'utente da cui annullare l'abbonamento."
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:699
+#: lib/command.php:703
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr "Abbonamento a %s annullato."
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:719 lib/command.php:745
+#: lib/command.php:723 lib/command.php:749
 msgid "Command not yet implemented."
 msgstr "Comando non ancora implementato."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:723
+#: lib/command.php:727
 msgid "Notification off."
 msgstr "Notifiche disattivate."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:726
+#: lib/command.php:730
 msgid "Can't turn off notification."
 msgstr "Impossibile disattivare le notifiche."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:749
+#: lib/command.php:753
 msgid "Notification on."
 msgstr "Notifiche attivate."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:752
+#: lib/command.php:756
 msgid "Can't turn on notification."
 msgstr "Impossibile attivare le notifiche."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:766
+#: lib/command.php:770
 msgid "Login command is disabled."
 msgstr "Il comando di accesso è disabilitato."
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:779
+#: lib/command.php:783
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
@@ -7046,20 +7141,20 @@ msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:808
+#: lib/command.php:812
 #, php-format
 msgid "Unsubscribed %s."
 msgstr "Abbonamento di %s annullato."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:826
+#: lib/command.php:830
 msgid "You are not subscribed to anyone."
 msgstr "Il tuo abbonamento è stato annullato."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:831
+#: lib/command.php:835
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Persona di cui hai già un abbonamento:"
@@ -7067,14 +7162,14 @@ msgstr[1] "Persone di cui hai già un abbonamento:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:853
+#: lib/command.php:857
 msgid "No one is subscribed to you."
 msgstr "Nessuno è abbonato ai tuoi messaggi."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:858
+#: lib/command.php:862
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Questa persona è abbonata ai tuoi messaggi:"
@@ -7082,21 +7177,21 @@ msgstr[1] "Queste persone sono abbonate ai tuoi messaggi:"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:880
+#: lib/command.php:884
 msgid "You are not a member of any groups."
 msgstr "Non fai parte di alcun gruppo."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:885
+#: lib/command.php:889
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Non fai parte di questo gruppo:"
 msgstr[1] "Non fai parte di questi gruppi:"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:900
+#: lib/command.php:904
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -7332,7 +7427,8 @@ msgstr ""
 "1-64 lettere minuscole o numeri, senza spazi o simboli di punteggiatura"
 
 #: lib/groupeditform.php:163
-msgid "URL of the homepage or blog of the group or topic"
+#, fuzzy
+msgid "URL of the homepage or blog of the group or topic."
 msgstr "URL della pagina web, blog del gruppo o l'argomento"
 
 #: lib/groupeditform.php:168
@@ -7340,19 +7436,29 @@ msgid "Describe the group or topic"
 msgstr "Descrivi il gruppo o l'argomento"
 
 #: lib/groupeditform.php:170
-#, php-format
-msgid "Describe the group or topic in %d characters"
-msgstr "Descrivi il gruppo o l'argomento in %d caratteri"
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d character or less"
+msgid_plural "Describe the group or topic in %d characters or less"
+msgstr[0] "Descrivi il gruppo o l'argomento in %d caratteri"
+msgstr[1] "Descrivi il gruppo o l'argomento in %d caratteri"
 
-#: lib/groupeditform.php:179
+#: lib/groupeditform.php:182
+#, fuzzy
 msgid ""
-"Location for the group, if any, like \"City, State (or Region), Country\""
+"Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr "Dove è situato il gruppo, tipo \"città, regione, stato\""
 
-#: lib/groupeditform.php:187
-#, php-format
-msgid "Extra nicknames for the group, comma- or space- separated, max %d"
-msgstr ""
+#: lib/groupeditform.php:190
+#, fuzzy, php-format
+msgid ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"alias allowed."
+msgid_plural ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"aliases allowed."
+msgstr[0] ""
+"Soprannomi aggiuntivi per il gruppo, separati da virgole o spazi, max %d"
+msgstr[1] ""
 "Soprannomi aggiuntivi per il gruppo, separati da virgole o spazi, max %d"
 
 #. TRANS: Menu item in the group navigation page.
@@ -7911,7 +8017,7 @@ msgstr "Quella non è la tua email di ricezione."
 msgid "Sorry, no incoming email allowed."
 msgstr "Email di ricezione non consentita."
 
-#: lib/mailhandler.php:228
+#: lib/mailhandler.php:229
 #, php-format
 msgid "Unsupported message type: %s"
 msgstr "Tipo di messaggio non supportato: %s"
@@ -8259,16 +8365,17 @@ msgid "Sandbox this user"
 msgstr "Metti questo utente nella \"sandbox\""
 
 #. TRANS: Fieldset legend for the search form.
-#: lib/searchaction.php:121
+#: lib/searchaction.php:120
 msgid "Search site"
 msgstr "Cerca nel sito"
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
-#: lib/searchaction.php:129
+#: lib/searchaction.php:128
 msgid "Keyword(s)"
 msgstr "Parole"
 
+#. TRANS: Button text for searching site.
 #: lib/searchaction.php:130
 msgctxt "BUTTON"
 msgid "Search"
@@ -8359,8 +8466,8 @@ msgid "The theme file is missing or the upload failed."
 msgstr "Manca il file del tema o il caricamento non è riuscito."
 
 #: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:278 lib/themeuploader.php:282
-#: lib/themeuploader.php:290 lib/themeuploader.php:297
+#: lib/themeuploader.php:279 lib/themeuploader.php:283
+#: lib/themeuploader.php:291 lib/themeuploader.php:298
 msgid "Failed saving theme."
 msgstr "Salvataggio del tema non riuscito."
 
@@ -8369,16 +8476,20 @@ msgid "Invalid theme: bad directory structure."
 msgstr "Tema non valido: struttura directory non corretta."
 
 #: lib/themeuploader.php:166
-#, php-format
-msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
-msgstr ""
+#, fuzzy, php-format
+msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
+msgid_plural ""
+"Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr[0] ""
+"Il tema caricato è troppo grande, deve essere meno di %d byte non compresso."
+msgstr[1] ""
 "Il tema caricato è troppo grande, deve essere meno di %d byte non compresso."
 
-#: lib/themeuploader.php:178
+#: lib/themeuploader.php:179
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr "File di tema non valido: manca il file css/display.css"
 
-#: lib/themeuploader.php:218
+#: lib/themeuploader.php:219
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
@@ -8386,17 +8497,17 @@ msgstr ""
 "Il tema contiene file non o nomi di cartelle non validi. Utilizzare "
 "solamente caratteri ASCII, numeri, il trattino basso e il segno meno."
 
-#: lib/themeuploader.php:224
+#: lib/themeuploader.php:225
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr ""
 "Il tema contiene file con estensioni non sicure: potrebbe non essere sicuro."
 
-#: lib/themeuploader.php:241
+#: lib/themeuploader.php:242
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr "Il tema contiene file di tipo \".%s\" che non sono supportati."
 
-#: lib/themeuploader.php:259
+#: lib/themeuploader.php:260
 msgid "Error opening theme archive."
 msgstr "Errore nell'aprire il file del tema."
 
@@ -8577,22 +8688,42 @@ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
 msgstr[0] "Messaggio troppo lungo: massimo %1$d caratteri, inviati %2$d."
 msgstr[1] "Messaggio troppo lungo: massimo %1$d caratteri, inviati %2$d."
 
-#: scripts/restoreuser.php:82
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: scripts/restoreuser.php:61
 #, php-format
-msgid "Backup file for user %s (%s)"
-msgstr "File di backup per l'utente %s (%s)"
+msgid "Getting backup from file '%s'."
+msgstr ""
 
-#: scripts/restoreuser.php:88
+#. TRANS: Commandline script output.
+#: scripts/restoreuser.php:91
 msgid "No user specified; using backup user."
 msgstr "Nessun utente specificato: viene usato l'utente di backup."
 
-#: scripts/restoreuser.php:94
-#, php-format
-msgid "%d entries in backup."
-msgstr "%d voci nel backup."
+#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
+#: scripts/restoreuser.php:98
+#, fuzzy, php-format
+msgid "%d entry in backup."
+msgid_plural "%d entries in backup."
+msgstr[0] "%d voci nel backup."
+msgstr[1] "%d voci nel backup."
+
+#, fuzzy
+#~ msgid "Name is too long (maximum 255 chars)."
+#~ msgstr "Il nome è troppo lungo (max 255 caratteri)."
+
+#, fuzzy
+#~ msgid "Organization is too long (maximum 255 chars)."
+#~ msgstr "L'organizzazione è troppo lunga (max 255 caratteri)."
+
+#~ msgid "That's too long. Max notice size is %d chars."
+#~ msgstr "Troppo lungo. Lunghezza massima %d caratteri."
+
+#~ msgid "Max notice size is %d chars, including attachment URL."
+#~ msgstr ""
+#~ "La dimensione massima di un messaggio è di %d caratteri, compreso l'URL."
 
-#~ msgid "Description is too long (max %d chars)."
-#~ msgstr "La descrizione è troppo lunga (max %d caratteri)."
+#~ msgid " tagged %s"
+#~ msgstr " etichettati con %s"
 
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "Troppi alias! Massimo %d."
+#~ msgid "Backup file for user %s (%s)"
+#~ msgstr "File di backup per l'utente %s (%s)"
diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po
index e6b3fb238..1001c1406 100644
--- a/locale/ja/LC_MESSAGES/statusnet.po
+++ b/locale/ja/LC_MESSAGES/statusnet.po
@@ -12,17 +12,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-30 23:18+0000\n"
-"PO-Revision-Date: 2010-10-30 23:20:30+0000\n"
+"POT-Creation-Date: 2010-11-02 22:51+0000\n"
+"PO-Revision-Date: 2010-11-02 22:53:27+0000\n"
 "Language-Team: Japanese <http://translatewiki.net/wiki/Portal:ja>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r75708); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r75875); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ja\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2010-10-30 09:48:40+0000\n"
+"X-POT-Import-Date: 2010-10-30 23:42:01+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -79,15 +79,20 @@ msgstr "アクセス設定の保存"
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
+#. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
+#. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #: actions/accessadminpanel.php:193 actions/emailsettings.php:228
-#: actions/imsettings.php:187 actions/pathsadminpanel.php:512
-#: actions/profilesettings.php:201 actions/smssettings.php:209
-#: actions/subscriptions.php:246 lib/applicationeditform.php:355
+#: actions/imsettings.php:187 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: lib/applicationeditform.php:355 lib/groupeditform.php:207
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Save"
@@ -139,7 +144,7 @@ msgstr "そのようなタグはありません。"
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:495 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "そのようなユーザはいません。"
@@ -210,7 +215,9 @@ msgstr ""
 
 #. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:208
+#. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -566,8 +573,11 @@ msgstr "フルネームが長すぎます。（255字まで）"
 #. TRANS: Group edit form validation error.
 #. TRANS: Form validation error in New application form.
 #. TRANS: %d is the maximum number of characters for the description.
+#. TRANS: Group create form validation error.
+#. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:220 actions/editapplication.php:201
 #: actions/editgroup.php:216 actions/newapplication.php:178
+#: actions/newgroup.php:152
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -726,14 +736,14 @@ msgstr "認証されていません。"
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:172 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:74
 #: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
 #: actions/groupunblock.php:65 actions/imsettings.php:230
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
-#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/othersettings.php:153 actions/passwordsettings.php:138
 #: actions/profilesettings.php:221 actions/recoverpassword.php:350
 #: actions/register.php:172 actions/remotesubscribe.php:77
 #: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
@@ -908,20 +918,21 @@ msgstr "他のユーザのステータスを消すことはできません。"
 
 #. TRANS: Client error displayed trying to repeat a non-existing notice through the API.
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
+#. TRANS: Error message displayed trying to delete a non-existing notice.
 #: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/deletenotice.php:58 actions/shownotice.php:92
+#: actions/deletenotice.php:61 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "そのようなつぶやきはありません。"
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:535
+#: actions/apistatusesretweet.php:83 lib/command.php:537
 msgid "Cannot repeat your own notice."
 msgstr "あなたのつぶやきを繰り返せません。"
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:541
+#: actions/apistatusesretweet.php:92 lib/command.php:543
 msgid "Already repeated that notice."
 msgstr "すでにつぶやきを繰り返しています。"
 
@@ -942,7 +953,8 @@ msgstr ""
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#: actions/apistatusesupdate.php:244
+#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
+#: lib/mailhandler.php:60
 #, fuzzy, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
@@ -956,7 +968,7 @@ msgstr "API メソッドが見つかりません。"
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
-#: actions/apistatusesupdate.php:308
+#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
 #, fuzzy, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
@@ -1167,17 +1179,18 @@ msgstr "あなたのアバターとなるイメージを正方形で指定"
 msgid "Lost our file data."
 msgstr "ファイルデータを紛失しました。"
 
-#: actions/avatarsettings.php:384
+#. TRANS: Success message for having updated a user avatar.
+#: actions/avatarsettings.php:385
 msgid "Avatar updated."
 msgstr "アバターが更新されました。"
 
 #. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
-#: actions/avatarsettings.php:388
+#: actions/avatarsettings.php:389
 msgid "Failed updating avatar."
 msgstr "アバターの更新に失敗しました。"
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:412
+#: actions/avatarsettings.php:413
 msgid "Avatar deleted."
 msgstr "アバターが削除されました。"
 
@@ -1210,8 +1223,8 @@ msgstr ""
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:154 actions/deleteapplication.php:154
-#: actions/deletegroup.php:220 actions/deletenotice.php:150
+#: actions/block.php:154 actions/deleteapplication.php:157
+#: actions/deletegroup.php:220 actions/deletenotice.php:155
 #: actions/deleteuser.php:152 actions/groupblock.php:178
 msgctxt "BUTTON"
 msgid "No"
@@ -1229,8 +1242,8 @@ msgstr "このユーザをアンブロックする"
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:161 actions/deleteapplication.php:161
-#: actions/deletegroup.php:227 actions/deletenotice.php:157
+#: actions/block.php:161 actions/deleteapplication.php:164
+#: actions/deletegroup.php:227 actions/deletenotice.php:162
 #: actions/deleteuser.php:159 actions/groupblock.php:185
 #, fuzzy
 msgctxt "BUTTON"
@@ -1348,12 +1361,13 @@ msgstr "そのアドレスは既に承認されています。"
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
 #. TRANS: Server error thrown on database error updating IM preferences.
 #. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
 #. TRANS: Server error thrown when user profile settings could not be updated.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #: actions/confirmaddress.php:118 actions/emailsettings.php:331
 #: actions/emailsettings.php:477 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:174
+#: actions/imsettings.php:442 actions/othersettings.php:184
 #: actions/profilesettings.php:326 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
@@ -1389,16 +1403,19 @@ msgstr "会話"
 msgid "Notices"
 msgstr "つぶやき"
 
-#: actions/deleteapplication.php:63
+#. TRANS: Client error displayed trying to delete an application while not logged in.
+#: actions/deleteapplication.php:62
 msgid "You must be logged in to delete an application."
 msgstr "アプリケーションを削除するにはログインしていなければなりません。"
 
+#. TRANS: Client error displayed trying to delete an application that does not exist.
 #: actions/deleteapplication.php:71
 msgid "Application not found."
 msgstr "アプリケーションが見つかりません。"
 
+#. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
-#: actions/deleteapplication.php:78 actions/editapplication.php:78
+#: actions/deleteapplication.php:79 actions/editapplication.php:78
 #: actions/showapplication.php:94
 msgid "You are not the owner of this application."
 msgstr "このアプリケーションのオーナーではありません。"
@@ -1406,15 +1423,18 @@ msgstr "このアプリケーションのオーナーではありません。"
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
 #: actions/newapplication.php:114 actions/showapplication.php:118
-#: lib/action.php:1354
+#: lib/action.php:1404
 msgid "There was a problem with your session token."
 msgstr "あなたのセッショントークンに関する問題がありました。"
 
-#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+#. TRANS: Title for delete application page.
+#. TRANS: Fieldset legend on delete application page.
+#: actions/deleteapplication.php:124 actions/deleteapplication.php:149
 msgid "Delete application"
 msgstr "アプリケーション削除"
 
-#: actions/deleteapplication.php:149
+#. TRANS: Confirmation text on delete application page.
+#: actions/deleteapplication.php:152
 #, fuzzy
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
@@ -1425,12 +1445,12 @@ msgstr ""
 "ベースからユーザに関するすべてのデータをクリアします。"
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:158
+#: actions/deleteapplication.php:161
 msgid "Do not delete this application"
 msgstr "このアプリケーションを削除しないでください"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:164
+#: actions/deleteapplication.php:167
 msgid "Delete this application"
 msgstr "このアプリケーションを削除"
 
@@ -1467,13 +1487,14 @@ msgstr "グループを更新できません。"
 msgid "Deleted group %s"
 msgstr "%1$s はグループ %2$s に残りました。"
 
-#. TRANS: Title.
+#. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
 #: actions/deletegroup.php:176 actions/deletegroup.php:202
 #, fuzzy
 msgid "Delete group"
 msgstr "ユーザ削除"
 
+#. TRANS: Warning in form for deleleting a group.
 #: actions/deletegroup.php:206
 #, fuzzy
 msgid ""
@@ -1496,10 +1517,11 @@ msgstr "このつぶやきを削除できません。"
 msgid "Delete this group"
 msgstr "このユーザを削除"
 
+#. TRANS: Error message displayed trying to delete a notice while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1509,11 +1531,13 @@ msgstr "このユーザを削除"
 msgid "Not logged in."
 msgstr "ログインしていません。"
 
-#: actions/deletenotice.php:74
+#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
+#: actions/deletenotice.php:78
 msgid "Can't delete this notice."
 msgstr "このつぶやきを削除できません。"
 
-#: actions/deletenotice.php:106
+#. TRANS: Instructions for deleting a notice.
+#: actions/deletenotice.php:110
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
@@ -1521,21 +1545,24 @@ msgstr ""
 "あなたはつぶやきを永久に削除しようとしています。 これが完了するとそれを元に戻"
 "すことはできません。"
 
-#: actions/deletenotice.php:112 actions/deletenotice.php:144
+#. TRANS: Page title when deleting a notice.
+#. TRANS: Fieldset legend for the delete notice form.
+#: actions/deletenotice.php:117 actions/deletenotice.php:148
 msgid "Delete notice"
 msgstr "つぶやき削除"
 
-#: actions/deletenotice.php:147
+#. TRANS: Message for the delete notice form.
+#: actions/deletenotice.php:152
 msgid "Are you sure you want to delete this notice?"
 msgstr "本当にこのつぶやきを削除しますか？"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:154
+#: actions/deletenotice.php:159
 msgid "Do not delete this notice"
 msgstr "このつぶやきを削除できません。"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:161 lib/noticelist.php:667
+#: actions/deletenotice.php:166 lib/noticelist.php:667
 msgid "Delete this notice"
 msgstr "このつぶやきを削除"
 
@@ -1700,11 +1727,9 @@ msgstr "デフォルトへリセットする"
 
 #. TRANS: Submit button title.
 #: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
-#: actions/othersettings.php:126 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: actions/useradminpanel.php:295 lib/applicationeditform.php:357
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: lib/applicationeditform.php:357 lib/designsettings.php:256
 msgid "Save"
 msgstr "保存"
 
@@ -1752,9 +1777,9 @@ msgid "Name is required."
 msgstr "名前は必須です。"
 
 #. TRANS: Validation error shown when providing too long a name in the "Edit application" form.
-#: actions/editapplication.php:188
+#: actions/editapplication.php:188 actions/newapplication.php:169
 #, fuzzy
-msgid "Name is too long (max 255 characters)."
+msgid "Name is too long (maximum 255 characters)."
 msgstr "名前が長すぎます。（最大255字まで）"
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
@@ -1783,7 +1808,7 @@ msgid "Organization is required."
 msgstr "組織が必要です。"
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#: actions/editapplication.php:223
+#: actions/editapplication.php:223 actions/newapplication.php:199
 #, fuzzy
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "組織が長すぎます。（最大255字）"
@@ -2591,7 +2616,7 @@ msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "私のJabber/GTalkアドレスのためにMicroIDを発行してください。"
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:180
+#: actions/imsettings.php:290 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "設定が保存されました。"
 
@@ -2715,10 +2740,9 @@ msgstr[0] "すでにこれらのユーザをフォローしています:"
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#. TRANS: Whois output.
-#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:145 actions/invite.php:159 lib/command.php:426
-#, php-format
+#: actions/invite.php:145 actions/invite.php:159
+#, fuzzy, php-format
+msgctxt "INVITE"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
@@ -2901,8 +2925,9 @@ msgid ""
 msgstr ""
 
 #: actions/licenseadminpanel.php:156
-msgid "Invalid license title. Max length is 255 characters."
-msgstr ""
+#, fuzzy
+msgid "Invalid license title. Maximum length is 255 characters."
+msgstr "不正なウェルカムテキスト。最大長は255字です。"
 
 #: actions/licenseadminpanel.php:168
 msgid "Invalid license URL."
@@ -3074,20 +3099,10 @@ msgstr "アプリケーションを登録するにはログインしていなけ
 msgid "Use this form to register a new application."
 msgstr "このフォームを使って新しいアプリケーションを登録します。"
 
-#: actions/newapplication.php:169
-#, fuzzy
-msgid "Name is too long (maximum 255 chars)."
-msgstr "名前が長すぎます。（最大255字まで）"
-
 #: actions/newapplication.php:184
 msgid "Source URL is required."
 msgstr "ソースURLが必要です。"
 
-#: actions/newapplication.php:199
-#, fuzzy
-msgid "Organization is too long (maximum 255 chars)."
-msgstr "組織が長すぎます。（最大255字）"
-
 #: actions/newapplication.php:266 actions/newapplication.php:275
 msgid "Could not create application."
 msgstr "アプリケーションを作成できません。"
@@ -3107,14 +3122,14 @@ msgid "New message"
 msgstr "新しいメッセージ"
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:499
+#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501
 msgid "You can't send a message to this user."
 msgstr "このユーザにメッセージを送ることはできません。"
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
 #: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
-#: lib/command.php:579
+#: lib/command.php:581
 msgid "No content!"
 msgstr "コンテンツがありません！"
 
@@ -3123,7 +3138,7 @@ msgid "No recipient specified."
 msgstr "受取人が書かれていません。"
 
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:503
+#: actions/newmessage.php:167 lib/command.php:505
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -3135,12 +3150,12 @@ msgstr "メッセージを送りました"
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:511
+#: actions/newmessage.php:188 lib/command.php:513
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "ダイレクトメッセージを %s  に送りました"
 
-#: actions/newmessage.php:213 actions/newnotice.php:263
+#: actions/newmessage.php:213 actions/newnotice.php:264
 msgid "Ajax Error"
 msgstr "Ajax エラー"
 
@@ -3148,17 +3163,7 @@ msgstr "Ajax エラー"
 msgid "New notice"
 msgstr "新しいつぶやき"
 
-#: actions/newnotice.php:159 lib/mailhandler.php:60
-#, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr "長すぎます。つぶやきは最大 %d 字までです。"
-
-#: actions/newnotice.php:183
-#, php-format
-msgid "Max notice size is %d chars, including attachment URL."
-msgstr "つぶやきは URL を含めて最大 %d 字までです。"
-
-#: actions/newnotice.php:229
+#: actions/newnotice.php:230
 msgid "Notice posted"
 msgstr "つぶやきを投稿しました"
 
@@ -3328,36 +3333,46 @@ msgstr "ピープル検索"
 msgid "Notice Search"
 msgstr "つぶやき検索"
 
-#: actions/othersettings.php:60
+#: actions/othersettings.php:59
 msgid "Other settings"
 msgstr "その他の設定"
 
+#. TRANS: Instructions for tab "Other" in user profile settings.
 #: actions/othersettings.php:71
 msgid "Manage various other options."
 msgstr "他のオプションを管理。"
 
-#: actions/othersettings.php:108
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/othersettings.php:111
 msgid " (free service)"
 msgstr "(フリーサービス)"
 
-#: actions/othersettings.php:116
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/othersettings.php:120
 msgid "Shorten URLs with"
 msgstr "URLを短くします"
 
-#: actions/othersettings.php:117
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/othersettings.php:122
 msgid "Automatic shortening service to use."
 msgstr "使用する自動短縮サービス。"
 
-#: actions/othersettings.php:122
+#. TRANS: Label for checkbox.
+#: actions/othersettings.php:128
 msgid "View profile designs"
 msgstr "プロファイルデザインを表示"
 
-#: actions/othersettings.php:123
+#. TRANS: Tooltip for checkbox.
+#: actions/othersettings.php:130
 msgid "Show or hide profile designs."
 msgstr "プロファイルデザインの表示または非表示"
 
-#: actions/othersettings.php:153
-msgid "URL shortening service is too long (max 50 chars)."
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/othersettings.php:162
+#, fuzzy
+msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "URL 短縮サービスが長すぎます。（最大50字）"
 
 #: actions/otp.php:69
@@ -3847,7 +3862,7 @@ msgstr "自己紹介"
 #. TRANS: Label for group location (dt). Text hidden by default.
 #: actions/profilesettings.php:149 actions/register.php:485
 #: actions/showgroup.php:267 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:177
+#: actions/userauthorization.php:166 lib/groupeditform.php:180
 #: lib/userprofile.php:165
 msgid "Location"
 msgstr "場所"
@@ -4185,7 +4200,8 @@ msgid "Unexpected password reset."
 msgstr "予期せぬパスワードのリセットです。"
 
 #: actions/recoverpassword.php:365
-msgid "Password must be 6 chars or more."
+#, fuzzy
+msgid "Password must be 6 characters or more."
 msgstr "パスワードは6字以上でなければいけません。"
 
 #: actions/recoverpassword.php:369
@@ -4560,7 +4576,7 @@ msgstr "組織"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:172
+#: lib/applicationeditform.php:208 lib/groupeditform.php:175
 msgid "Description"
 msgstr "概要"
 
@@ -4712,7 +4728,7 @@ msgid "Note"
 msgstr "ノート"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:298 lib/groupeditform.php:184
+#: actions/showgroup.php:298 lib/groupeditform.php:187
 msgid "Aliases"
 msgstr "別名"
 
@@ -4844,47 +4860,67 @@ msgstr "%2$s 上の %1$s からのメッセージ"
 msgid "Notice deleted."
 msgstr "つぶやきを削除しました。"
 
-#: actions/showstream.php:72
-#, php-format
-msgid " tagged %s"
-msgstr "タグ付けされた %s"
+#. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
+#: actions/showstream.php:70
+#, fuzzy, php-format
+msgid "%1$s tagged %2$s"
+msgstr "%1$s、ページ %2$d"
 
-#: actions/showstream.php:78
+#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#: actions/showstream.php:74
+#, fuzzy, php-format
+msgid "%1$s tagged %2$s, page %3$d"
+msgstr "%1$s とタグ付けされたつぶやき、ページ %2$d"
+
+#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$d is the page number.
+#: actions/showstream.php:82
 #, php-format
 msgid "%1$s, page %2$d"
 msgstr "%1$s、ページ %2$d"
 
-#: actions/showstream.php:120
+#. TRANS: Title for link to notice feed.
+#. TRANS: %1$s is a user nickname, %2$s is a hashtag.
+#: actions/showstream.php:127
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "%1$sの%2$sとタグ付けされたつぶやきフィード (RSS 1.0)"
 
-#: actions/showstream.php:127
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:136
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "%sのつぶやきフィード (RSS 1.0)"
 
-#: actions/showstream.php:134
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:145
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "%sのつぶやきフィード (RSS 2.0)"
 
-#: actions/showstream.php:141
+#: actions/showstream.php:152
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "%sのつぶやきフィード (Atom)"
 
-#: actions/showstream.php:146
+#. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
+#. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
+#: actions/showstream.php:159
 #, php-format
 msgid "FOAF for %s"
 msgstr "%s の FOAF"
 
-#: actions/showstream.php:197
-#, php-format
-msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
+#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
+#: actions/showstream.php:211
+#, fuzzy, php-format
+msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr "これは %1$s のタイムラインですが、%2$s はまだなにも投稿していません。"
 
-#: actions/showstream.php:202
+#. TRANS: Second sentence of empty list message for a stream for the user themselves.
+#: actions/showstream.php:217
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -4892,7 +4928,9 @@ msgstr ""
 "最近おもしろいものは何でしょう? あなたは少しのつぶやきも投稿していませんが、"
 "いまは始める良い時でしょう:)"
 
-#: actions/showstream.php:204
+#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:221
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -4901,7 +4939,9 @@ msgstr ""
 "最初の [このトピック投稿](%%%%action.newnotice%%%%?status_textarea=%s) をして"
 "ください!"
 
-#: actions/showstream.php:243
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:264
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4915,7 +4955,9 @@ msgstr ""
 "%%%%)して、**%s** のつぶやきなどをフォローしましょう! ([もっと読む](%%%%doc."
 "help%%%%))"
 
-#: actions/showstream.php:248
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:271
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4926,7 +4968,8 @@ msgstr ""
 "[StatusNet](http://status.net/)を基にした[マイクロブロギング](http://en."
 "wikipedia.org/wiki/Micro-blogging) サービス。"
 
-#: actions/showstream.php:305
+#. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
+#: actions/showstream.php:328
 #, php-format
 msgid "Repeat of %s"
 msgstr "%s の繰り返し"
@@ -5043,35 +5086,43 @@ msgstr ""
 "どれくらい長い間(秒)、ユーザは、再び同じものを投稿するのを待たなければならな"
 "いか。"
 
-#: actions/sitenoticeadminpanel.php:56
+#. TRANS: Page title for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:55
 #, fuzzy
 msgid "Site Notice"
 msgstr "サイトつぶやき"
 
-#: actions/sitenoticeadminpanel.php:67
+#. TRANS: Instructions for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:66
 #, fuzzy
 msgid "Edit site-wide message"
 msgstr "新しいメッセージ"
 
-#: actions/sitenoticeadminpanel.php:103
+#. TRANS: Server error displayed when saving a site-wide notice was impossible.
+#: actions/sitenoticeadminpanel.php:101
 #, fuzzy
 msgid "Unable to save site notice."
 msgstr "あなたのデザイン設定を保存できません。"
 
-#: actions/sitenoticeadminpanel.php:113
-msgid "Max length for the site-wide notice is 255 chars."
-msgstr ""
+#. TRANS: Client error displayed when a site-wide notice was longer than allowed.
+#: actions/sitenoticeadminpanel.php:112
+#, fuzzy
+msgid "Maximum length for the site-wide notice is 255 characters."
+msgstr "プロファイル自己紹介の最大文字長。"
 
+#. TRANS: Label for site-wide notice text field in admin panel.
 #: actions/sitenoticeadminpanel.php:176
 #, fuzzy
 msgid "Site notice text"
 msgstr "サイトつぶやき"
 
-#: actions/sitenoticeadminpanel.php:178
-msgid "Site-wide notice text (255 chars max; HTML okay)"
+#. TRANS: Tooltip for site-wide notice text field in admin panel.
+#: actions/sitenoticeadminpanel.php:179
+msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:198
+#. TRANS: Title for button to save site notice in admin panel.
+#: actions/sitenoticeadminpanel.php:201
 #, fuzzy
 msgid "Save site notice"
 msgstr "サイトつぶやき"
@@ -5544,76 +5595,94 @@ msgstr ""
 "りません。"
 
 #. TRANS: User admin panel title
-#: actions/useradminpanel.php:60
+#: actions/useradminpanel.php:58
 #, fuzzy
 msgctxt "TITLE"
 msgid "User"
 msgstr "ユーザ"
 
-#: actions/useradminpanel.php:71
+#. TRANS: Instruction for user admin panel.
+#: actions/useradminpanel.php:69
 msgid "User settings for this StatusNet site"
 msgstr ""
 
-#: actions/useradminpanel.php:150
+#. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
+#: actions/useradminpanel.php:147
 msgid "Invalid bio limit. Must be numeric."
 msgstr "不正な自己紹介制限。数字である必要があります。"
 
-#: actions/useradminpanel.php:156
-msgid "Invalid welcome text. Max length is 255 characters."
+#. TRANS: Form validation error in user admin panel when welcome text is too long.
+#: actions/useradminpanel.php:154
+#, fuzzy
+msgid "Invalid welcome text. Maximum length is 255 characters."
 msgstr "不正なウェルカムテキスト。最大長は255字です。"
 
+#. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
+#. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
-#, php-format
-msgid "Invalid default subscripton: '%1$s' is not user."
+#, fuzzy, php-format
+msgid "Invalid default subscripton: '%1$s' is not a user."
 msgstr "不正なデフォルトフォローです: '%1$s'  はユーザではありません。"
 
 #. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:106
+#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
 #: lib/personalgroupnav.php:109
 msgid "Profile"
 msgstr "プロファイル"
 
-#: actions/useradminpanel.php:223
+#. TRANS: Field label in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:220
 msgid "Bio Limit"
 msgstr "自己紹介制限"
 
-#: actions/useradminpanel.php:224
+#. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:222
 msgid "Maximum length of a profile bio in characters."
 msgstr "プロファイル自己紹介の最大文字長。"
 
-#: actions/useradminpanel.php:232
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:231
 msgid "New users"
 msgstr "新しいユーザ"
 
+#. TRANS: Field label in user admin panel for setting new user welcome text.
 #: actions/useradminpanel.php:236
 msgid "New user welcome"
 msgstr "新しいユーザを歓迎"
 
-#: actions/useradminpanel.php:237
-msgid "Welcome text for new users (Max 255 chars)."
+#. TRANS: Tooltip in user admin panel for setting new user welcome text.
+#: actions/useradminpanel.php:238
+#, fuzzy
+msgid "Welcome text for new users (maximum 255 characters)."
 msgstr "新しいユーザへのウェルカムテキスト (最大255字)。"
 
-#: actions/useradminpanel.php:242
+#. TRANS: Field label in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:244
 msgid "Default subscription"
 msgstr "デフォルトフォロー"
 
-#: actions/useradminpanel.php:243
+#. TRANS: Tooltip in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:246
 msgid "Automatically subscribe new users to this user."
 msgstr "自動的にこのユーザに新しいユーザをフォローしてください。"
 
-#: actions/useradminpanel.php:252
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:256
 msgid "Invitations"
 msgstr "招待"
 
-#: actions/useradminpanel.php:257
+#. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:262
 msgid "Invitations enabled"
 msgstr "招待が可能"
 
-#: actions/useradminpanel.php:259
+#. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:265
 msgid "Whether to allow users to invite new users."
 msgstr "ユーザが新しいユーザを招待するのを許容するかどうか。"
 
-#: actions/useradminpanel.php:295
+#. TRANS: Title for button to save user settings in user admin panel.
+#: actions/useradminpanel.php:302
 msgid "Save user settings"
 msgstr ""
 
@@ -5814,7 +5883,7 @@ msgid "Plugins"
 msgstr "プラグイン"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:831
+#: actions/version.php:198 lib/action.php:880
 msgid "Version"
 msgstr "バージョン"
 
@@ -6027,16 +6096,23 @@ msgstr "フォローを保存できません。"
 msgid "RT @%1$s %2$s"
 msgstr ""
 
+#. TRANS: Full name of a profile or group followed by nickname in parens
+#: classes/Profile.php:164
+#, fuzzy, php-format
+msgctxt "FANCYNAME"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:791
+#: classes/Profile.php:812
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:800
+#: classes/Profile.php:821
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6183,135 +6259,141 @@ msgstr ""
 msgid "Untitled page"
 msgstr "名称未設定ページ"
 
+#. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
+#: lib/action.php:310
+msgctxt "TOOLTIP"
+msgid "Show more"
+msgstr ""
+
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:477
+#: lib/action.php:526
 msgid "Primary site navigation"
 msgstr "プライマリサイトナビゲーション"
 
 #. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:483
+#: lib/action.php:532
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "パーソナルプロファイルと友人のタイムライン"
 
 #. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:486
+#: lib/action.php:535
 #, fuzzy
 msgctxt "MENU"
 msgid "Personal"
 msgstr "パーソナル"
 
 #. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:488
+#: lib/action.php:537
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
 msgstr "パスワードの変更"
 
 #. TRANS: Main menu option when logged in for access to user settings
-#: lib/action.php:491
+#: lib/action.php:540
 msgid "Account"
 msgstr "アカウント"
 
 #. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:493
+#: lib/action.php:542
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "接続"
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:496
+#: lib/action.php:545
 msgid "Connect"
 msgstr "接続"
 
 #. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:499
+#: lib/action.php:548
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "基本サイト設定"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:502 lib/groupnav.php:117
+#: lib/action.php:551 lib/groupnav.php:117
 #, fuzzy
 msgctxt "MENU"
 msgid "Admin"
 msgstr "管理者"
 
 #. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:506
+#: lib/action.php:555
 #, fuzzy, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "友人や同僚が %s で加わるよう誘ってください。"
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:509
+#: lib/action.php:558
 #, fuzzy
 msgctxt "MENU"
 msgid "Invite"
 msgstr "招待"
 
 #. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:515
+#: lib/action.php:564
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "サイトのテーマ"
 
 #. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:518
+#: lib/action.php:567
 msgctxt "MENU"
 msgid "Logout"
 msgstr "ロゴ"
 
 #. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:523
+#: lib/action.php:572
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "新しいグループを作成"
 
 #. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:526
+#: lib/action.php:575
 #, fuzzy
 msgctxt "MENU"
 msgid "Register"
 msgstr "登録"
 
 #. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:529
+#: lib/action.php:578
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "サイトへログイン"
 
 #. TRANS: Main menu option when not logged in to log in
-#: lib/action.php:532
+#: lib/action.php:581
 #, fuzzy
 msgctxt "MENU"
 msgid "Login"
 msgstr "ログイン"
 
 #. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:535
+#: lib/action.php:584
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "ヘルプ"
 
 #. TRANS: Main menu option for help on the StatusNet site
-#: lib/action.php:538
+#: lib/action.php:587
 #, fuzzy
 msgctxt "MENU"
 msgid "Help"
 msgstr "ヘルプ"
 
 #. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:541
+#: lib/action.php:590
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr "もっとグループを検索"
 
 #. TRANS: Main menu option when logged in or when the StatusNet instance is not private
-#: lib/action.php:544
+#: lib/action.php:593
 #, fuzzy
 msgctxt "MENU"
 msgid "Search"
@@ -6319,67 +6401,68 @@ msgstr "検索"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:566 lib/adminpanelaction.php:387
+#: lib/action.php:615 lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "サイトつぶやき"
 
 #. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:633
+#: lib/action.php:682
 msgid "Local views"
 msgstr "ローカルビュー"
 
 #. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:703
+#: lib/action.php:752
 msgid "Page notice"
 msgstr "ページつぶやき"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:804
+#: lib/action.php:853
 msgid "Secondary site navigation"
 msgstr "セカンダリサイトナビゲーション"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:810
+#: lib/action.php:859
 msgid "Help"
 msgstr "ヘルプ"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:813
+#: lib/action.php:862
 msgid "About"
 msgstr "About"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:816
+#: lib/action.php:865
 msgid "FAQ"
 msgstr "よくある質問"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:821
+#: lib/action.php:870
 msgid "TOS"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:825
+#: lib/action.php:874
 msgid "Privacy"
 msgstr "プライバシー"
 
-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:828
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+#: lib/action.php:877
 msgid "Source"
 msgstr "ソース"
 
-#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:834
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+#: lib/action.php:884
 msgid "Contact"
 msgstr "連絡先"
 
-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:837
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+#: lib/action.php:887
 msgid "Badge"
 msgstr "バッジ"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:866
+#: lib/action.php:916
 msgid "StatusNet software license"
 msgstr "StatusNet ソフトウェアライセンス"
 
@@ -6387,7 +6470,7 @@ msgstr "StatusNet ソフトウェアライセンス"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:873
+#: lib/action.php:923
 #, fuzzy, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -6397,7 +6480,7 @@ msgstr ""
 "イクロブログサービスです。 "
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:876
+#: lib/action.php:926
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** はマイクロブログサービスです。"
@@ -6406,7 +6489,7 @@ msgstr "**%%site.name%%** はマイクロブログサービスです。"
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:883
+#: lib/action.php:933
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -6418,50 +6501,50 @@ msgstr ""
 "org/licensing/licenses/agpl-3.0.html)。"
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:899
+#: lib/action.php:949
 msgid "Site content license"
 msgstr "サイト内容ライセンス"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:906
+#: lib/action.php:956
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:913
+#: lib/action.php:963
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:917
+#: lib/action.php:967
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:949
+#: lib/action.php:999
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1285
+#: lib/action.php:1335
 msgid "Pagination"
 msgstr "ページ化"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1296
+#: lib/action.php:1346
 msgid "After"
 msgstr "<<後"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1306
+#: lib/action.php:1356
 msgid "Before"
 msgstr "前>>"
 
@@ -6813,7 +6896,7 @@ msgid "AJAX error"
 msgstr "Ajax エラー"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:233 lib/mailhandler.php:142
+#: lib/channel.php:233 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "コマンド完了"
 
@@ -6830,7 +6913,7 @@ msgstr "その ID によるつぶやきは存在していません"
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:626
+#: lib/command.php:99 lib/command.php:630
 #, fuzzy
 msgid "User has no last notice."
 msgstr "利用者はまだつぶやいていません"
@@ -6900,6 +6983,14 @@ msgstr ""
 msgid "%1$s left group %2$s."
 msgstr ""
 
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: lib/command.php:426
+#, fuzzy, php-format
+msgctxt "WHOIS"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
 #. TRANS: Whois output. %s is the full name of the queried user.
 #: lib/command.php:430
 #, php-format
@@ -6937,171 +7028,173 @@ msgid ""
 "same server."
 msgstr ""
 
-#. TRANS: Message given if content is too long.
+#. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
 #: lib/command.php:488
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr "メッセージが長すぎます - 最大 %1$d 字、あなたが送ったのは %2$d。"
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] "メッセージが長すぎます - 最大 %1$d 字、あなたが送ったのは %2$d。"
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:514
+#: lib/command.php:516
 msgid "Error sending direct message."
 msgstr "ダイレクトメッセージ送信エラー。"
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:551
+#: lib/command.php:553
 #, fuzzy, php-format
 msgid "Notice from %s repeated."
 msgstr "%s からつぶやきが繰り返されています"
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:554
+#: lib/command.php:556
 msgid "Error repeating notice."
 msgstr "つぶやき繰り返しエラー"
 
-#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:589
+#: lib/command.php:591
 #, fuzzy, php-format
-msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
-msgstr "つぶやきが長すぎます - 最大 %d 字、あなたが送ったのは %d"
+msgid "Notice too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] "つぶやきが長すぎます - 最大 %d 字、あなたが送ったのは %d"
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:600
+#: lib/command.php:604
 #, fuzzy, php-format
 msgid "Reply to %s sent."
 msgstr "%s へ返信を送りました"
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:603
+#: lib/command.php:607
 msgid "Error saving notice."
 msgstr "つぶやき保存エラー。"
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:650
+#: lib/command.php:654
 #, fuzzy
 msgid "Specify the name of the user to subscribe to."
 msgstr "フォローする利用者の名前を指定してください"
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:659
+#: lib/command.php:663
 #, fuzzy
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "あなたはそのプロファイルにフォローされていません。"
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:667
+#: lib/command.php:671
 #, php-format
 msgid "Subscribed to %s."
 msgstr ""
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:688 lib/command.php:799
+#: lib/command.php:692 lib/command.php:803
 #, fuzzy
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "フォローをやめるユーザの名前を指定してください"
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:699
+#: lib/command.php:703
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:719 lib/command.php:745
+#: lib/command.php:723 lib/command.php:749
 msgid "Command not yet implemented."
 msgstr "コマンドはまだ実装されていません。"
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:723
+#: lib/command.php:727
 msgid "Notification off."
 msgstr "通知オフ。"
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:726
+#: lib/command.php:730
 msgid "Can't turn off notification."
 msgstr "通知をオフできません。"
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:749
+#: lib/command.php:753
 msgid "Notification on."
 msgstr "通知オン。"
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:752
+#: lib/command.php:756
 msgid "Can't turn on notification."
 msgstr "通知をオンできません。"
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:766
+#: lib/command.php:770
 #, fuzzy
 msgid "Login command is disabled."
 msgstr "ログインコマンドが無効になっています。"
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:779
+#: lib/command.php:783
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:808
+#: lib/command.php:812
 #, php-format
 msgid "Unsubscribed %s."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:826
+#: lib/command.php:830
 msgid "You are not subscribed to anyone."
 msgstr "あなたはだれにもフォローされていません。"
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:831
+#: lib/command.php:835
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "あなたはこの人にフォローされています:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:853
+#: lib/command.php:857
 msgid "No one is subscribed to you."
 msgstr "誰もフォローしていません。"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:858
+#: lib/command.php:862
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "この人はあなたにフォローされている:"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:880
+#: lib/command.php:884
 msgid "You are not a member of any groups."
 msgstr "あなたはどのグループのメンバーでもありません。"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:885
+#: lib/command.php:889
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "あなたはこのグループのメンバーではありません:"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:900
+#: lib/command.php:904
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -7296,7 +7389,8 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64文字の、小文字アルファベットか数字で、スペースや句読点は除く"
 
 #: lib/groupeditform.php:163
-msgid "URL of the homepage or blog of the group or topic"
+#, fuzzy
+msgid "URL of the homepage or blog of the group or topic."
 msgstr "グループやトピックのホームページやブログの URL"
 
 #: lib/groupeditform.php:168
@@ -7304,19 +7398,27 @@ msgid "Describe the group or topic"
 msgstr "グループやトピックを記述"
 
 #: lib/groupeditform.php:170
-#, php-format
-msgid "Describe the group or topic in %d characters"
-msgstr "グループやトピックを %d 字以内記述"
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d character or less"
+msgid_plural "Describe the group or topic in %d characters or less"
+msgstr[0] "グループやトピックを %d 字以内記述"
 
-#: lib/groupeditform.php:179
+#: lib/groupeditform.php:182
+#, fuzzy
 msgid ""
-"Location for the group, if any, like \"City, State (or Region), Country\""
+"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 "グループのエクストラニックネーム、カンマまたはスペース区切り、最大 %d"
+#: lib/groupeditform.php:190
+#, fuzzy, php-format
+msgid ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"alias allowed."
+msgid_plural ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"aliases allowed."
+msgstr[0] ""
+"グループのエクストラニックネーム、カンマまたはスペース区切り、最大 %d"
 
 #. TRANS: Menu item in the group navigation page.
 #: lib/groupnav.php:86
@@ -7840,7 +7942,7 @@ msgstr "すみません、それはあなたの入って来るメールアドレ
 msgid "Sorry, no incoming email allowed."
 msgstr "すみません、入ってくるメールは許可されていません。"
 
-#: lib/mailhandler.php:228
+#: lib/mailhandler.php:229
 #, php-format
 msgid "Unsupported message type: %s"
 msgstr "サポート外のメッセージタイプ: %s"
@@ -8194,16 +8296,17 @@ msgid "Sandbox this user"
 msgstr "このユーザをサンドボックス"
 
 #. TRANS: Fieldset legend for the search form.
-#: lib/searchaction.php:121
+#: lib/searchaction.php:120
 msgid "Search site"
 msgstr "サイト検索"
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
-#: lib/searchaction.php:129
+#: lib/searchaction.php:128
 msgid "Keyword(s)"
 msgstr "キーワード"
 
+#. TRANS: Button text for searching site.
 #: lib/searchaction.php:130
 msgctxt "BUTTON"
 msgid "Search"
@@ -8293,8 +8396,8 @@ msgid "The theme file is missing or the upload failed."
 msgstr ""
 
 #: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:278 lib/themeuploader.php:282
-#: lib/themeuploader.php:290 lib/themeuploader.php:297
+#: lib/themeuploader.php:279 lib/themeuploader.php:283
+#: lib/themeuploader.php:291 lib/themeuploader.php:298
 #, fuzzy
 msgid "Failed saving theme."
 msgstr "アバターの更新に失敗しました。"
@@ -8305,29 +8408,31 @@ msgstr ""
 
 #: lib/themeuploader.php:166
 #, php-format
-msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
-msgstr ""
+msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
+msgid_plural ""
+"Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr[0] ""
 
-#: lib/themeuploader.php:178
+#: lib/themeuploader.php:179
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr ""
 
-#: lib/themeuploader.php:218
+#: lib/themeuploader.php:219
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
 msgstr ""
 
-#: lib/themeuploader.php:224
+#: lib/themeuploader.php:225
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr ""
 
-#: lib/themeuploader.php:241
+#: lib/themeuploader.php:242
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr ""
 
-#: lib/themeuploader.php:259
+#: lib/themeuploader.php:260
 msgid "Error opening theme archive."
 msgstr "ブロックの削除エラー"
 
@@ -8507,23 +8612,38 @@ msgid "Message too long. Maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
 msgstr[0] "メッセージが長すぎます - 最大 %1$d 字、あなたが送ったのは %2$d。"
 
-#: scripts/restoreuser.php:82
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: scripts/restoreuser.php:61
 #, php-format
-msgid "Backup file for user %s (%s)"
+msgid "Getting backup from file '%s'."
 msgstr ""
 
-#: scripts/restoreuser.php:88
+#. TRANS: Commandline script output.
+#: scripts/restoreuser.php:91
 #, fuzzy
 msgid "No user specified; using backup user."
 msgstr "ユーザIDの記述がありません。"
 
-#: scripts/restoreuser.php:94
+#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
+#: scripts/restoreuser.php:98
 #, php-format
-msgid "%d entries in backup."
-msgstr ""
+msgid "%d entry in backup."
+msgid_plural "%d entries in backup."
+msgstr[0] ""
+
+#, fuzzy
+#~ msgid "Name is too long (maximum 255 chars)."
+#~ msgstr "名前が長すぎます。（最大255字まで）"
+
+#, fuzzy
+#~ msgid "Organization is too long (maximum 255 chars)."
+#~ msgstr "組織が長すぎます。（最大255字）"
+
+#~ msgid "That's too long. Max notice size is %d chars."
+#~ msgstr "長すぎます。つぶやきは最大 %d 字までです。"
 
-#~ msgid "Description is too long (max %d chars)."
-#~ msgstr "記述が長すぎます。（最長%d字）"
+#~ msgid "Max notice size is %d chars, including attachment URL."
+#~ msgstr "つぶやきは URL を含めて最大 %d 字までです。"
 
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "別名が多すぎます! 最大 %d。"
+#~ msgid " tagged %s"
+#~ msgstr "タグ付けされた %s"
diff --git a/locale/ka/LC_MESSAGES/statusnet.po b/locale/ka/LC_MESSAGES/statusnet.po
index 5035cb8ba..233e1e874 100644
--- a/locale/ka/LC_MESSAGES/statusnet.po
+++ b/locale/ka/LC_MESSAGES/statusnet.po
@@ -9,17 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-30 23:18+0000\n"
-"PO-Revision-Date: 2010-10-30 23:20:31+0000\n"
+"POT-Creation-Date: 2010-11-02 22:51+0000\n"
+"PO-Revision-Date: 2010-11-02 22:53:28+0000\n"
 "Language-Team: Georgian <http://translatewiki.net/wiki/Portal:ka>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r75708); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r75875); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ka\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2010-10-30 09:48:40+0000\n"
+"X-POT-Import-Date: 2010-10-30 23:42:01+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -76,15 +76,20 @@ msgstr "შეინახე შესვლის პარამეტრე�
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
+#. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
+#. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #: actions/accessadminpanel.php:193 actions/emailsettings.php:228
-#: actions/imsettings.php:187 actions/pathsadminpanel.php:512
-#: actions/profilesettings.php:201 actions/smssettings.php:209
-#: actions/subscriptions.php:246 lib/applicationeditform.php:355
+#: actions/imsettings.php:187 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: lib/applicationeditform.php:355 lib/groupeditform.php:207
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "შეინახე"
@@ -135,7 +140,7 @@ msgstr "ასეთი გვერდი არ არსებობს."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:495 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "ასეთი მომხმარებელი არ არსებობს."
@@ -206,7 +211,9 @@ msgstr ""
 
 #. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:208
+#. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -556,8 +563,11 @@ msgstr "სრული სახელი ძალიან გრძელი
 #. TRANS: Group edit form validation error.
 #. TRANS: Form validation error in New application form.
 #. TRANS: %d is the maximum number of characters for the description.
+#. TRANS: Group create form validation error.
+#. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:220 actions/editapplication.php:201
 #: actions/editgroup.php:216 actions/newapplication.php:178
+#: actions/newgroup.php:152
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -714,14 +724,14 @@ msgstr "თქვენ არ ხართ ავტორიზირებუ
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:172 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:74
 #: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
 #: actions/groupunblock.php:65 actions/imsettings.php:230
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
-#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/othersettings.php:153 actions/passwordsettings.php:138
 #: actions/profilesettings.php:221 actions/recoverpassword.php:350
 #: actions/register.php:172 actions/remotesubscribe.php:77
 #: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
@@ -895,20 +905,21 @@ msgstr "სხვა მომხმარებლის სტატუსი�
 
 #. TRANS: Client error displayed trying to repeat a non-existing notice through the API.
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
+#. TRANS: Error message displayed trying to delete a non-existing notice.
 #: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/deletenotice.php:58 actions/shownotice.php:92
+#: actions/deletenotice.php:61 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "ასეთი შეტყობინება არ არსებობს."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:535
+#: actions/apistatusesretweet.php:83 lib/command.php:537
 msgid "Cannot repeat your own notice."
 msgstr "საკუთარი შეტყობინების გამეორება არ შეიძლება."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:541
+#: actions/apistatusesretweet.php:92 lib/command.php:543
 msgid "Already repeated that notice."
 msgstr "ეს შეტყობინება უკვე გამეორებულია."
 
@@ -929,7 +940,8 @@ msgstr ""
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#: actions/apistatusesupdate.php:244
+#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
+#: lib/mailhandler.php:60
 #, fuzzy, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
@@ -943,7 +955,7 @@ msgstr "API მეთოდი ვერ მოიძებნა."
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
-#: actions/apistatusesupdate.php:308
+#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
 #, fuzzy, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
@@ -1154,17 +1166,18 @@ msgstr "აირჩიეთ სურათის კვადრატულ�
 msgid "Lost our file data."
 msgstr ""
 
-#: actions/avatarsettings.php:384
+#. TRANS: Success message for having updated a user avatar.
+#: actions/avatarsettings.php:385
 msgid "Avatar updated."
 msgstr "ავატარი განახლდა."
 
 #. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
-#: actions/avatarsettings.php:388
+#: actions/avatarsettings.php:389
 msgid "Failed updating avatar."
 msgstr "ავატარის განახლება ვერ მოხერხდა."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:412
+#: actions/avatarsettings.php:413
 msgid "Avatar deleted."
 msgstr "ავატარი წაიშალა."
 
@@ -1193,8 +1206,8 @@ msgstr ""
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:154 actions/deleteapplication.php:154
-#: actions/deletegroup.php:220 actions/deletenotice.php:150
+#: actions/block.php:154 actions/deleteapplication.php:157
+#: actions/deletegroup.php:220 actions/deletenotice.php:155
 #: actions/deleteuser.php:152 actions/groupblock.php:178
 msgctxt "BUTTON"
 msgid "No"
@@ -1212,8 +1225,8 @@ msgstr "არ დაბლოკო ეს მომხმარებელი
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:161 actions/deleteapplication.php:161
-#: actions/deletegroup.php:227 actions/deletenotice.php:157
+#: actions/block.php:161 actions/deleteapplication.php:164
+#: actions/deletegroup.php:227 actions/deletenotice.php:162
 #: actions/deleteuser.php:159 actions/groupblock.php:185
 msgctxt "BUTTON"
 msgid "Yes"
@@ -1330,12 +1343,13 @@ msgstr "ეს მისამართი უკვე დადასტურ
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
 #. TRANS: Server error thrown on database error updating IM preferences.
 #. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
 #. TRANS: Server error thrown when user profile settings could not be updated.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #: actions/confirmaddress.php:118 actions/emailsettings.php:331
 #: actions/emailsettings.php:477 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:174
+#: actions/imsettings.php:442 actions/othersettings.php:184
 #: actions/profilesettings.php:326 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
@@ -1371,16 +1385,19 @@ msgstr "საუბარი"
 msgid "Notices"
 msgstr "შეტყობინებები"
 
-#: actions/deleteapplication.php:63
+#. TRANS: Client error displayed trying to delete an application while not logged in.
+#: actions/deleteapplication.php:62
 msgid "You must be logged in to delete an application."
 msgstr "აპლიკაციის წასაშლელად საჭიროა ავროტიზაცია."
 
+#. TRANS: Client error displayed trying to delete an application that does not exist.
 #: actions/deleteapplication.php:71
 msgid "Application not found."
 msgstr "აპლიკაცია ვერ მოიძებნა."
 
+#. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
-#: actions/deleteapplication.php:78 actions/editapplication.php:78
+#: actions/deleteapplication.php:79 actions/editapplication.php:78
 #: actions/showapplication.php:94
 msgid "You are not the owner of this application."
 msgstr "თქვენ არ ხართ ამ აპლიკაციის მფლობელი."
@@ -1388,15 +1405,18 @@ msgstr "თქვენ არ ხართ ამ აპლიკაციი�
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
 #: actions/newapplication.php:114 actions/showapplication.php:118
-#: lib/action.php:1354
+#: lib/action.php:1404
 msgid "There was a problem with your session token."
 msgstr ""
 
-#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+#. TRANS: Title for delete application page.
+#. TRANS: Fieldset legend on delete application page.
+#: actions/deleteapplication.php:124 actions/deleteapplication.php:149
 msgid "Delete application"
 msgstr "აპლიკაციის წაშლა"
 
-#: actions/deleteapplication.php:149
+#. TRANS: Confirmation text on delete application page.
+#: actions/deleteapplication.php:152
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
 "about the application from the database, including all existing user "
@@ -1406,12 +1426,12 @@ msgstr ""
 "მონაცემებს ამ აპლიკაციის შესახებ, ყველა შეერთებული მომხმარებლის ჩათვლით."
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:158
+#: actions/deleteapplication.php:161
 msgid "Do not delete this application"
 msgstr "არ წაშალო ეს აპლიკაცია"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:164
+#: actions/deleteapplication.php:167
 msgid "Delete this application"
 msgstr "აპლიკაციის წაშლა"
 
@@ -1447,13 +1467,14 @@ msgstr "ჯგუფის განახლება ვერ მოხერ
 msgid "Deleted group %s"
 msgstr "%1$s-მა დატოვა ჯგუფი %2$s"
 
-#. TRANS: Title.
+#. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
 #: actions/deletegroup.php:176 actions/deletegroup.php:202
 #, fuzzy
 msgid "Delete group"
 msgstr "მომხმარებლის წაშლა"
 
+#. TRANS: Warning in form for deleleting a group.
 #: actions/deletegroup.php:206
 #, fuzzy
 msgid ""
@@ -1476,10 +1497,11 @@ msgstr "არ წაშალო ეს შეტყობინება"
 msgid "Delete this group"
 msgstr "ამ მომხმარებლის წაშლა"
 
+#. TRANS: Error message displayed trying to delete a notice while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1489,31 +1511,36 @@ msgstr "ამ მომხმარებლის წაშლა"
 msgid "Not logged in."
 msgstr "ავტორიზებული არ ხართ."
 
-#: actions/deletenotice.php:74
+#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
+#: actions/deletenotice.php:78
 msgid "Can't delete this notice."
 msgstr "ამ შეტყობინების წაშლა შეუძლებელია."
 
-#: actions/deletenotice.php:106
+#. TRANS: Instructions for deleting a notice.
+#: actions/deletenotice.php:110
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
 msgstr "თქვენ შეტყობინების სამუდამოდ წაშლას აპირებთ. ეს მოქმედება შეუქცევადია."
 
-#: actions/deletenotice.php:112 actions/deletenotice.php:144
+#. TRANS: Page title when deleting a notice.
+#. TRANS: Fieldset legend for the delete notice form.
+#: actions/deletenotice.php:117 actions/deletenotice.php:148
 msgid "Delete notice"
 msgstr "შეტყობინების წაშლა"
 
-#: actions/deletenotice.php:147
+#. TRANS: Message for the delete notice form.
+#: actions/deletenotice.php:152
 msgid "Are you sure you want to delete this notice?"
 msgstr "ნამდვილად გსურთ ამ შეტყობინების წაშლა?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:154
+#: actions/deletenotice.php:159
 msgid "Do not delete this notice"
 msgstr "არ წაშალო ეს შეტყობინება"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:161 lib/noticelist.php:667
+#: actions/deletenotice.php:166 lib/noticelist.php:667
 msgid "Delete this notice"
 msgstr "შეტყობინების წაშლა"
 
@@ -1678,11 +1705,9 @@ msgstr "პირვანდელის პარამეტრების �
 
 #. TRANS: Submit button title.
 #: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
-#: actions/othersettings.php:126 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: actions/useradminpanel.php:295 lib/applicationeditform.php:357
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: lib/applicationeditform.php:357 lib/designsettings.php:256
 msgid "Save"
 msgstr "შენახვა"
 
@@ -1730,9 +1755,9 @@ msgid "Name is required."
 msgstr "სახელი სავალდებულოა."
 
 #. TRANS: Validation error shown when providing too long a name in the "Edit application" form.
-#: actions/editapplication.php:188
+#: actions/editapplication.php:188 actions/newapplication.php:169
 #, fuzzy
-msgid "Name is too long (max 255 characters)."
+msgid "Name is too long (maximum 255 characters)."
 msgstr "სახელი ძალიან გრძელია (არაუმეტეს 255 სიმბოლო)."
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
@@ -1761,7 +1786,7 @@ msgid "Organization is required."
 msgstr "ორგანიზაცია სავალდებულოა."
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#: actions/editapplication.php:223
+#: actions/editapplication.php:223 actions/newapplication.php:199
 #, fuzzy
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "ორგანიზაცია ძალიან გრძელია (არაუმეტეს 255 სიმბოლო)."
@@ -2558,7 +2583,7 @@ msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "გამოაქვეყნე  MicroID ჩემი Jabber/GTalk მისამართისთვის."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:180
+#: actions/imsettings.php:290 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "პარამეტრები შენახულია."
 
@@ -2681,10 +2706,9 @@ msgstr[0] "თქვენ უკვე გამოწერილი გაქ
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#. TRANS: Whois output.
-#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:145 actions/invite.php:159 lib/command.php:426
-#, php-format
+#: actions/invite.php:145 actions/invite.php:159
+#, fuzzy, php-format
+msgctxt "INVITE"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
@@ -2868,8 +2892,9 @@ msgid ""
 msgstr ""
 
 #: actions/licenseadminpanel.php:156
-msgid "Invalid license title. Max length is 255 characters."
-msgstr ""
+#, fuzzy
+msgid "Invalid license title. Maximum length is 255 characters."
+msgstr "არასწორი მისასალმებელი ტექსტი. სიმბოლოების მაქს. რაოდენობაა 255."
 
 #: actions/licenseadminpanel.php:168
 msgid "Invalid license URL."
@@ -3041,20 +3066,10 @@ msgstr "აპლიკაციის დასარეგისტრირ�
 msgid "Use this form to register a new application."
 msgstr "აპლიკაციაში დასარეგისტრირებლად გამოიყენეთ ეს ფორმა."
 
-#: actions/newapplication.php:169
-#, fuzzy
-msgid "Name is too long (maximum 255 chars)."
-msgstr "სახელი ძალიან გრძელია (არაუმეტეს 255 სიმბოლო)."
-
 #: actions/newapplication.php:184
 msgid "Source URL is required."
 msgstr "წყაროს URL სავალდებულოა."
 
-#: actions/newapplication.php:199
-#, fuzzy
-msgid "Organization is too long (maximum 255 chars)."
-msgstr "ორგანიზაცია ძალიან გრძელია (არაუმეტეს 255 სიმბოლო)."
-
 #: actions/newapplication.php:266 actions/newapplication.php:275
 msgid "Could not create application."
 msgstr "აპლიკაციის შექმნა ვერ მოხერხდა."
@@ -3074,14 +3089,14 @@ msgid "New message"
 msgstr "ახალი შეტყობინება"
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:499
+#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501
 msgid "You can't send a message to this user."
 msgstr "ამ მომხმარებელს შეტყობინებას ვერ გაუგზავნი."
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
 #: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
-#: lib/command.php:579
+#: lib/command.php:581
 msgid "No content!"
 msgstr "შიგთავსი არ არის!"
 
@@ -3090,7 +3105,7 @@ msgid "No recipient specified."
 msgstr "მიმღები მითითებული არ არის."
 
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:503
+#: actions/newmessage.php:167 lib/command.php:505
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "ნუ გაუგზავნი შეტყობინებას საკუთარ თავს; უბრალოდ ჩუმად ჩაუჩურჩულე."
@@ -3101,12 +3116,12 @@ msgstr "შეტყობინება გაგზავნილია"
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:511
+#: actions/newmessage.php:188 lib/command.php:513
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "პირდაპირი შეტყობინება გაეგზავნა %s–ს."
 
-#: actions/newmessage.php:213 actions/newnotice.php:263
+#: actions/newmessage.php:213 actions/newnotice.php:264
 msgid "Ajax Error"
 msgstr "Ajax შეცდომა"
 
@@ -3114,17 +3129,7 @@ msgstr "Ajax შეცდომა"
 msgid "New notice"
 msgstr "ახალი შეტყობინება"
 
-#: actions/newnotice.php:159 lib/mailhandler.php:60
-#, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr "შეტყობინების დასაძვები ზომაა %d სიმბოლო."
-
-#: actions/newnotice.php:183
-#, php-format
-msgid "Max notice size is %d chars, including attachment URL."
-msgstr "შეყობინების დასაშვები ზომაა %d სიმბოლო მიმაგრებული URL-ის ჩათვლით."
-
-#: actions/newnotice.php:229
+#: actions/newnotice.php:230
 msgid "Notice posted"
 msgstr "შეტყობინება დაიპოსტა"
 
@@ -3290,36 +3295,46 @@ msgstr "პიროვნებების ძიება"
 msgid "Notice Search"
 msgstr "შეტყობინებების ძიება"
 
-#: actions/othersettings.php:60
+#: actions/othersettings.php:59
 msgid "Other settings"
 msgstr "სხვა პარამეტრები"
 
+#. TRANS: Instructions for tab "Other" in user profile settings.
 #: actions/othersettings.php:71
 msgid "Manage various other options."
 msgstr "სხა მრავალნაირი პარამეტრების მართვა."
 
-#: actions/othersettings.php:108
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/othersettings.php:111
 msgid " (free service)"
 msgstr " (უფასო სერვისი)"
 
-#: actions/othersettings.php:116
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/othersettings.php:120
 msgid "Shorten URLs with"
 msgstr "შეამოკლე URL–ები შემდეგით"
 
-#: actions/othersettings.php:117
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/othersettings.php:122
 msgid "Automatic shortening service to use."
 msgstr "გამოსაყენებელი შემოკლების ავტომატური სერვისი."
 
-#: actions/othersettings.php:122
+#. TRANS: Label for checkbox.
+#: actions/othersettings.php:128
 msgid "View profile designs"
 msgstr "პროფილის დიზაინების ნახვა"
 
-#: actions/othersettings.php:123
+#. TRANS: Tooltip for checkbox.
+#: actions/othersettings.php:130
 msgid "Show or hide profile designs."
 msgstr "აჩვენე ან დამალე პროფილის დიზაინები."
 
-#: actions/othersettings.php:153
-msgid "URL shortening service is too long (max 50 chars)."
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/othersettings.php:162
+#, fuzzy
+msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "URL–ს შემოკლების სერვისი ძალიან გრძელია (მაქს. 50 სიმბოლო)."
 
 #: actions/otp.php:69
@@ -3805,7 +3820,7 @@ msgstr "ბიოგრაფია"
 #. TRANS: Label for group location (dt). Text hidden by default.
 #: actions/profilesettings.php:149 actions/register.php:485
 #: actions/showgroup.php:267 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:177
+#: actions/userauthorization.php:166 lib/groupeditform.php:180
 #: lib/userprofile.php:165
 msgid "Location"
 msgstr "მდებარეობა"
@@ -4139,7 +4154,8 @@ msgid "Unexpected password reset."
 msgstr "პაროლის მოულოდნელი გადაყენება."
 
 #: actions/recoverpassword.php:365
-msgid "Password must be 6 chars or more."
+#, fuzzy
+msgid "Password must be 6 characters or more."
 msgstr "პაროლი უნდა შედგებოდეს 6 ან მეტი სიმბოლოსგან."
 
 #: actions/recoverpassword.php:369
@@ -4516,7 +4532,7 @@ msgstr "ორგანიზაცია"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:172
+#: lib/applicationeditform.php:208 lib/groupeditform.php:175
 msgid "Description"
 msgstr "აღწერა"
 
@@ -4664,7 +4680,7 @@ msgid "Note"
 msgstr "შენიშვნა"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:298 lib/groupeditform.php:184
+#: actions/showgroup.php:298 lib/groupeditform.php:187
 msgid "Aliases"
 msgstr ""
 
@@ -4787,60 +4803,86 @@ msgstr ""
 msgid "Notice deleted."
 msgstr ""
 
-#: actions/showstream.php:72
-#, php-format
-msgid " tagged %s"
-msgstr ""
+#. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
+#: actions/showstream.php:70
+#, fuzzy, php-format
+msgid "%1$s tagged %2$s"
+msgstr "%1$s - %2$s"
+
+#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#: actions/showstream.php:74
+#, fuzzy, php-format
+msgid "%1$s tagged %2$s, page %3$d"
+msgstr "შეტყობინებები მონიშნული %1$s-ით, გვერდი %2$d"
 
-#: actions/showstream.php:78
+#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$d is the page number.
+#: actions/showstream.php:82
 #, php-format
 msgid "%1$s, page %2$d"
 msgstr ""
 
-#: actions/showstream.php:120
+#. TRANS: Title for link to notice feed.
+#. TRANS: %1$s is a user nickname, %2$s is a hashtag.
+#: actions/showstream.php:127
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr ""
 
-#: actions/showstream.php:127
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:136
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr ""
 
-#: actions/showstream.php:134
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:145
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr ""
 
-#: actions/showstream.php:141
+#: actions/showstream.php:152
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr ""
 
-#: actions/showstream.php:146
+#. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
+#. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
+#: actions/showstream.php:159
 #, php-format
 msgid "FOAF for %s"
 msgstr ""
 
-#: actions/showstream.php:197
-#, php-format
-msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
+#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
+#: actions/showstream.php:211
+#, fuzzy, php-format
+msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr ""
+"ეს არის $s-ს და მეგობრების განახლებების ნაკადი, მაგრამ ჯერჯერობით არავის "
+"დაუპოსტავს."
 
-#: actions/showstream.php:202
+#. TRANS: Second sentence of empty list message for a stream for the user themselves.
+#: actions/showstream.php:217
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
 msgstr ""
 
-#: actions/showstream.php:204
+#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:221
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
 "%?status_textarea=%2$s)."
 msgstr ""
 
-#: actions/showstream.php:243
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:264
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4849,7 +4891,9 @@ msgid ""
 "follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
 
-#: actions/showstream.php:248
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:271
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4857,7 +4901,8 @@ msgid ""
 "[StatusNet](http://status.net/) tool. "
 msgstr ""
 
-#: actions/showstream.php:305
+#. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
+#: actions/showstream.php:328
 #, php-format
 msgid "Repeat of %s"
 msgstr ""
@@ -4968,31 +5013,40 @@ msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 "რამდენი ხანი (წამებში) უნდა ელოდოს მომხმარებელი რომ დაპოსტოს ერთი და იგივე."
 
-#: actions/sitenoticeadminpanel.php:56
+#. TRANS: Page title for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:55
 msgid "Site Notice"
 msgstr "საიტის შეტყობინება"
 
-#: actions/sitenoticeadminpanel.php:67
+#. TRANS: Instructions for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:66
 msgid "Edit site-wide message"
 msgstr "ჩაასწორე საიტის მომცველი შეტყობინება"
 
-#: actions/sitenoticeadminpanel.php:103
+#. TRANS: Server error displayed when saving a site-wide notice was impossible.
+#: actions/sitenoticeadminpanel.php:101
 msgid "Unable to save site notice."
 msgstr "საიტის შეტყობინების შენახვა ვერ მოხერხდა."
 
-#: actions/sitenoticeadminpanel.php:113
-msgid "Max length for the site-wide notice is 255 chars."
+#. TRANS: Client error displayed when a site-wide notice was longer than allowed.
+#: actions/sitenoticeadminpanel.php:112
+#, fuzzy
+msgid "Maximum length for the site-wide notice is 255 characters."
 msgstr "საიტის მომცველი შეტყობინების მაქს. ზომაა 255 სიმბოლო."
 
+#. TRANS: Label for site-wide notice text field in admin panel.
 #: actions/sitenoticeadminpanel.php:176
 msgid "Site notice text"
 msgstr "საიტის შეტყობინების ტექსტი"
 
-#: actions/sitenoticeadminpanel.php:178
-msgid "Site-wide notice text (255 chars max; HTML okay)"
+#. TRANS: Tooltip for site-wide notice text field in admin panel.
+#: actions/sitenoticeadminpanel.php:179
+#, fuzzy
+msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr "საერთო სასაიტო შეტყობინების ტექსტი (მაქს. 255 სიმბოლო; HTML შეიძლება)"
 
-#: actions/sitenoticeadminpanel.php:198
+#. TRANS: Title for button to save site notice in admin panel.
+#: actions/sitenoticeadminpanel.php:201
 msgid "Save site notice"
 msgstr "შეინახე საერთოსასაიტო შეტყობინება"
 
@@ -5463,75 +5517,93 @@ msgstr ""
 "ლიცენზიასთან ‘%2$s’."
 
 #. TRANS: User admin panel title
-#: actions/useradminpanel.php:60
+#: actions/useradminpanel.php:58
 msgctxt "TITLE"
 msgid "User"
 msgstr "მომხმარებელი"
 
-#: actions/useradminpanel.php:71
+#. TRANS: Instruction for user admin panel.
+#: actions/useradminpanel.php:69
 msgid "User settings for this StatusNet site"
 msgstr ""
 
-#: actions/useradminpanel.php:150
+#. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
+#: actions/useradminpanel.php:147
 msgid "Invalid bio limit. Must be numeric."
 msgstr "ბიოგრაფიის არასწორი ლიმიტი. უნდა იყოს ციფრი."
 
-#: actions/useradminpanel.php:156
-msgid "Invalid welcome text. Max length is 255 characters."
+#. TRANS: Form validation error in user admin panel when welcome text is too long.
+#: actions/useradminpanel.php:154
+#, fuzzy
+msgid "Invalid welcome text. Maximum length is 255 characters."
 msgstr "არასწორი მისასალმებელი ტექსტი. სიმბოლოების მაქს. რაოდენობაა 255."
 
+#. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
+#. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
 #, php-format
-msgid "Invalid default subscripton: '%1$s' is not user."
+msgid "Invalid default subscripton: '%1$s' is not a user."
 msgstr ""
 
 #. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:106
+#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
 #: lib/personalgroupnav.php:109
 msgid "Profile"
 msgstr "პროფილი"
 
-#: actions/useradminpanel.php:223
+#. TRANS: Field label in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:220
 msgid "Bio Limit"
 msgstr "ბიოგრაფიის ლიმიტი"
 
-#: actions/useradminpanel.php:224
+#. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:222
 msgid "Maximum length of a profile bio in characters."
 msgstr "პროფილის ბიოგრაფიის მაქსიმალური ზომა სიმბოლოებში."
 
-#: actions/useradminpanel.php:232
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:231
 msgid "New users"
 msgstr "ახალი მომხმარებლები"
 
+#. TRANS: Field label in user admin panel for setting new user welcome text.
 #: actions/useradminpanel.php:236
 msgid "New user welcome"
 msgstr "ახალი მომხმარებლის მისალმება"
 
-#: actions/useradminpanel.php:237
-msgid "Welcome text for new users (Max 255 chars)."
+#. TRANS: Tooltip in user admin panel for setting new user welcome text.
+#: actions/useradminpanel.php:238
+#, fuzzy
+msgid "Welcome text for new users (maximum 255 characters)."
 msgstr "მისალმების ტექსტი ახალი მომხმარებლებისთვის (მაქს. 255 სიმბოლო)."
 
-#: actions/useradminpanel.php:242
+#. TRANS: Field label in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:244
 msgid "Default subscription"
 msgstr ""
 
-#: actions/useradminpanel.php:243
+#. TRANS: Tooltip in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:246
 msgid "Automatically subscribe new users to this user."
 msgstr "ავტომატურად გამოაწერინე ამ მომხმარებელს ახალი მომხმარებლები."
 
-#: actions/useradminpanel.php:252
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:256
 msgid "Invitations"
 msgstr "მოსაწვევეი"
 
-#: actions/useradminpanel.php:257
+#. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:262
 msgid "Invitations enabled"
 msgstr "მოსაწვევები გააქტიურებულია"
 
-#: actions/useradminpanel.php:259
+#. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:265
 msgid "Whether to allow users to invite new users."
 msgstr "მიეცეთ თუ არა მომხმარებლებს სხვების მოწვევის უფლება."
 
-#: actions/useradminpanel.php:295
+#. TRANS: Title for button to save user settings in user admin panel.
+#: actions/useradminpanel.php:302
 msgid "Save user settings"
 msgstr ""
 
@@ -5742,7 +5814,7 @@ msgid "Plugins"
 msgstr "დამატებები"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:831
+#: actions/version.php:198 lib/action.php:880
 msgid "Version"
 msgstr "ვერსია"
 
@@ -5954,9 +6026,16 @@ msgstr "ჯგუფის ლოკალური ინფორმაცი�
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
+#. TRANS: Full name of a profile or group followed by nickname in parens
+#: classes/Profile.php:164
+#, fuzzy, php-format
+msgctxt "FANCYNAME"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:791
+#: classes/Profile.php:812
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
@@ -5964,7 +6043,7 @@ msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:800
+#: classes/Profile.php:821
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6111,194 +6190,201 @@ msgstr "%1$s - %2$s"
 msgid "Untitled page"
 msgstr "უსათაურო გვერდი"
 
+#. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
+#: lib/action.php:310
+msgctxt "TOOLTIP"
+msgid "Show more"
+msgstr ""
+
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:477
+#: lib/action.php:526
 msgid "Primary site navigation"
 msgstr "საიტის ძირითადი ნავიგაცია"
 
 #. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:483
+#: lib/action.php:532
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "პირადი პროფილი და მეგობრების ნაკადი"
 
 #. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:486
+#: lib/action.php:535
 msgctxt "MENU"
 msgid "Personal"
 msgstr "პირადი"
 
 #. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:488
+#: lib/action.php:537
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
 msgstr "შეცვალე ელ. ფოსტა, ავატარი, პაროლი, პროფილი"
 
 #. TRANS: Main menu option when logged in for access to user settings
-#: lib/action.php:491
+#: lib/action.php:540
 msgid "Account"
 msgstr "ანგარიში"
 
 #. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:493
+#: lib/action.php:542
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "სერვისებთან დაკავშირება"
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:496
+#: lib/action.php:545
 msgid "Connect"
 msgstr "კავშირი"
 
 #. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:499
+#: lib/action.php:548
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "საიტის კონფიგურაცია"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:502 lib/groupnav.php:117
+#: lib/action.php:551 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "ადმინი"
 
 #. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:506
+#: lib/action.php:555
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "მოიწვიე მეგობრები და კოლეგები %s-ზე"
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:509
+#: lib/action.php:558
 msgctxt "MENU"
 msgid "Invite"
 msgstr "მოწვევა"
 
 #. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:515
+#: lib/action.php:564
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "გასვლა საიტიდან"
 
 #. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:518
+#: lib/action.php:567
 msgctxt "MENU"
 msgid "Logout"
 msgstr "გასვლა"
 
 #. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:523
+#: lib/action.php:572
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "გახსენი ანგარიში"
 
 #. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:526
+#: lib/action.php:575
 msgctxt "MENU"
 msgid "Register"
 msgstr "რეგისტრაცია"
 
 #. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:529
+#: lib/action.php:578
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "საიტზე შესვლა"
 
 #. TRANS: Main menu option when not logged in to log in
-#: lib/action.php:532
+#: lib/action.php:581
 msgctxt "MENU"
 msgid "Login"
 msgstr "შესვლა"
 
 #. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:535
+#: lib/action.php:584
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "დამეხმარეთ!"
 
 #. TRANS: Main menu option for help on the StatusNet site
-#: lib/action.php:538
+#: lib/action.php:587
 msgctxt "MENU"
 msgid "Help"
 msgstr "დახმარება"
 
 #. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:541
+#: lib/action.php:590
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr "მოძებნე ხალხი ან ტექსტი"
 
 #. TRANS: Main menu option when logged in or when the StatusNet instance is not private
-#: lib/action.php:544
+#: lib/action.php:593
 msgctxt "MENU"
 msgid "Search"
 msgstr "ძიება"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:566 lib/adminpanelaction.php:387
+#: lib/action.php:615 lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "საიტის შეტყობინება"
 
 #. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:633
+#: lib/action.php:682
 msgid "Local views"
 msgstr "ლოკალური ხედები"
 
 #. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:703
+#: lib/action.php:752
 msgid "Page notice"
 msgstr "გვერდის შეტყობინება"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:804
+#: lib/action.php:853
 msgid "Secondary site navigation"
 msgstr "საიტის მეორადი ნავიგაცია"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:810
+#: lib/action.php:859
 msgid "Help"
 msgstr "დახმარება"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:813
+#: lib/action.php:862
 msgid "About"
 msgstr "საიტის შესახებ"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:816
+#: lib/action.php:865
 msgid "FAQ"
 msgstr "ხდკ"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:821
+#: lib/action.php:870
 msgid "TOS"
 msgstr "მპ"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:825
+#: lib/action.php:874
 msgid "Privacy"
 msgstr "პირადი"
 
-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:828
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+#: lib/action.php:877
 msgid "Source"
 msgstr "წყარო"
 
-#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:834
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+#: lib/action.php:884
 msgid "Contact"
 msgstr "კონტაქტი"
 
-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:837
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+#: lib/action.php:887
 msgid "Badge"
 msgstr "იარლიყი"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:866
+#: lib/action.php:916
 msgid "StatusNet software license"
 msgstr "StatusNet კოდის ლიცენზია"
 
@@ -6306,7 +6392,7 @@ msgstr "StatusNet კოდის ლიცენზია"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:873
+#: lib/action.php:923
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -6316,7 +6402,7 @@ msgstr ""
 "(%%site.broughtbyurl%%)-ს მიერ."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:876
+#: lib/action.php:926
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** არის მიკრობლოგინგის სერვისი."
@@ -6325,7 +6411,7 @@ msgstr "**%%site.name%%** არის მიკრობლოგინგი�
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:883
+#: lib/action.php:933
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -6337,51 +6423,51 @@ msgstr ""
 "org/licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:899
+#: lib/action.php:949
 msgid "Site content license"
 msgstr "საიტის შიგთავსის ლიცენზია"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:906
+#: lib/action.php:956
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "%1$s ის შიგთავსი და მონაცემები არის პირადული და კონფიდენციალური."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:913
+#: lib/action.php:963
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr "შიგთავსი და მონაცემები %1$s-ის საკუთრებაა. ყველა უფლება დაცულია."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:917
+#: lib/action.php:967
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "შიგთავსი და მონაცემები წვლილის შემტანების საკუთრებაა. ყველა უფლება დაცულია."
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:949
+#: lib/action.php:999
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr "%1$s-ს მთლიანი შიგთავსი და მონაცემები ხელმისაწვდომია %2$s ლიცენზიით."
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1285
+#: lib/action.php:1335
 msgid "Pagination"
 msgstr "გვერდებათ დაყოფა"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1296
+#: lib/action.php:1346
 msgid "After"
 msgstr "შემდეგი"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1306
+#: lib/action.php:1356
 msgid "Before"
 msgstr "წინა"
 
@@ -6727,7 +6813,7 @@ msgid "AJAX error"
 msgstr "Ajax შეცდომა"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:233 lib/mailhandler.php:142
+#: lib/channel.php:233 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "ბრძანება დასრულდა"
 
@@ -6743,7 +6829,7 @@ msgstr "შეტყობინებები ამ ID-თ არ არს�
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:626
+#: lib/command.php:99 lib/command.php:630
 msgid "User has no last notice."
 msgstr "მომხმარებელს არ გააჩნია ბოლო შეტყობინება."
 
@@ -6812,6 +6898,14 @@ msgstr "%1$s გაწევრიანდა ჯგუფში %2$s."
 msgid "%1$s left group %2$s."
 msgstr "%1$s-მა დატოვა ჯგუფი %2$s."
 
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: lib/command.php:426
+#, fuzzy, php-format
+msgctxt "WHOIS"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
 #. TRANS: Whois output. %s is the full name of the queried user.
 #: lib/command.php:430
 #, php-format
@@ -6851,171 +6945,173 @@ msgstr ""
 "%s დაშორებული პროფილია; პირდაპირი შეტყობინებების გაგზავნა მხოლოდ იგივე "
 "სერვერზე მყოფ მომხმარებელთანაა შესააძლებელი."
 
-#. TRANS: Message given if content is too long.
+#. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
 #: lib/command.php:488
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] ""
 "შეტყობინება ძალიან გრძელია - დასაშვები რაოდენობაა %1$d სიმბოლომდე, თქვენ "
 "გააგზავნეთ %2$d."
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:514
+#: lib/command.php:516
 msgid "Error sending direct message."
 msgstr "შეცდომა პირდაპირი შეტყობინების გაგზავნისას."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:551
+#: lib/command.php:553
 #, php-format
 msgid "Notice from %s repeated."
 msgstr "შეტყობინება %s-გან გამეორდა."
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:554
+#: lib/command.php:556
 msgid "Error repeating notice."
 msgstr "შეცდომა შეტყობინების გამეორებისას."
 
-#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:589
-#, php-format
-msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
+#: lib/command.php:591
+#, fuzzy, php-format
+msgid "Notice too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] ""
 "შეტყობინება ძალიან გრძელია - დასაშვები რაოდენობაა %1$d სიმბოლომდე, თქვენ "
 "გააგზავნეთ %2$d."
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:600
+#: lib/command.php:604
 #, php-format
 msgid "Reply to %s sent."
 msgstr "პასუხი %s-ს გაეგზავნა."
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:603
+#: lib/command.php:607
 msgid "Error saving notice."
 msgstr "შეცდომა შეტყობინების შენახვისას."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:650
+#: lib/command.php:654
 msgid "Specify the name of the user to subscribe to."
 msgstr "მიუთითეთ მომხმარებლის სახელი, რომელსაც გინდათ ყური დაუგდოთ."
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:659
+#: lib/command.php:663
 msgid "Can't subscribe to OMB profiles by command."
 msgstr ""
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:667
+#: lib/command.php:671
 #, php-format
 msgid "Subscribed to %s."
 msgstr "%s-ს გამოწერა დასრულდა წარმატებით."
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:688 lib/command.php:799
+#: lib/command.php:692 lib/command.php:803
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "მიუთითეთ მომხმარებლის სახელი, რომ გამოწერა გააუქმოთ."
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:699
+#: lib/command.php:703
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr "%s-ს გამოწერა გაუქმდა."
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:719 lib/command.php:745
+#: lib/command.php:723 lib/command.php:749
 msgid "Command not yet implemented."
 msgstr "ბრძანება ჯერ არ არის შემუშავებული."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:723
+#: lib/command.php:727
 msgid "Notification off."
 msgstr ""
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:726
+#: lib/command.php:730
 msgid "Can't turn off notification."
 msgstr ""
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:749
+#: lib/command.php:753
 msgid "Notification on."
 msgstr ""
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:752
+#: lib/command.php:756
 msgid "Can't turn on notification."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:766
+#: lib/command.php:770
 msgid "Login command is disabled."
 msgstr ""
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:779
+#: lib/command.php:783
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:808
+#: lib/command.php:812
 #, php-format
 msgid "Unsubscribed %s."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:826
+#: lib/command.php:830
 msgid "You are not subscribed to anyone."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:831
+#: lib/command.php:835
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] ""
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:853
+#: lib/command.php:857
 msgid "No one is subscribed to you."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:858
+#: lib/command.php:862
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] ""
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:880
+#: lib/command.php:884
 msgid "You are not a member of any groups."
 msgstr ""
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:885
+#: lib/command.php:889
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] ""
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:900
+#: lib/command.php:904
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -7208,7 +7304,8 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1–64 პატარა ასოები ან ციფრები. პუნქტუაციები ან სივრცეები დაუშვებელია"
 
 #: lib/groupeditform.php:163
-msgid "URL of the homepage or blog of the group or topic"
+#, fuzzy
+msgid "URL of the homepage or blog of the group or topic."
 msgstr "საწყისი გვერდის URL, ან ჯგუფის/თემის ბლოგი"
 
 #: lib/groupeditform.php:168
@@ -7216,21 +7313,28 @@ msgid "Describe the group or topic"
 msgstr "აღწერე ჯგუფი ან თემა"
 
 #: lib/groupeditform.php:170
-#, php-format
-msgid "Describe the group or topic in %d characters"
-msgstr "არწერე ჯგუფი ან თემა %d სიმბოლოთი"
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d character or less"
+msgid_plural "Describe the group or topic in %d characters or less"
+msgstr[0] "არწერე ჯგუფი ან თემა %d სიმბოლოთი"
 
-#: lib/groupeditform.php:179
+#: lib/groupeditform.php:182
+#, fuzzy
 msgid ""
-"Location for the group, if any, like \"City, State (or Region), Country\""
+"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/groupeditform.php:190
+#, fuzzy, php-format
+msgid ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"alias allowed."
+msgid_plural ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"aliases allowed."
+msgstr[0] ""
 "ჯგუფის დამატებითი მეტსახელები. გამოყავით მძიმით ან სივრცით. მაქსიმუმ %d "
 "სიმბოლო"
 
@@ -7765,7 +7869,7 @@ msgstr ""
 msgid "Sorry, no incoming email allowed."
 msgstr "ბოდიში, შემომავალი ელ. ფოსტის მისამართი არ არის დაშვებული."
 
-#: lib/mailhandler.php:228
+#: lib/mailhandler.php:229
 #, php-format
 msgid "Unsupported message type: %s"
 msgstr "შეტყობინების ტიპი არ არის მხარდაჭერილი: %s"
@@ -8112,16 +8216,17 @@ msgid "Sandbox this user"
 msgstr "ამ მომხმარებლის იზოლირება"
 
 #. TRANS: Fieldset legend for the search form.
-#: lib/searchaction.php:121
+#: lib/searchaction.php:120
 msgid "Search site"
 msgstr "ძიება საიტზე"
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
-#: lib/searchaction.php:129
+#: lib/searchaction.php:128
 msgid "Keyword(s)"
 msgstr "საკვანძო სიტყვები"
 
+#. TRANS: Button text for searching site.
 #: lib/searchaction.php:130
 msgctxt "BUTTON"
 msgid "Search"
@@ -8211,8 +8316,8 @@ msgid "The theme file is missing or the upload failed."
 msgstr "თემის ფაილი არ არის, ან ატვირთვა ვერ მოხერხდა."
 
 #: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:278 lib/themeuploader.php:282
-#: lib/themeuploader.php:290 lib/themeuploader.php:297
+#: lib/themeuploader.php:279 lib/themeuploader.php:283
+#: lib/themeuploader.php:291 lib/themeuploader.php:298
 msgid "Failed saving theme."
 msgstr "თემის შენახვა ჩაიშალა."
 
@@ -8221,15 +8326,18 @@ msgid "Invalid theme: bad directory structure."
 msgstr "არასწორი თემა: დირექტორიების არასწორი სტრუქტურა."
 
 #: lib/themeuploader.php:166
-#, php-format
-msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
-msgstr "ატვირთული თემა ძალიან დიდია; შეუკუმშავი უნდა იყოს %d ბაიტზე ნაკლები."
+#, fuzzy, php-format
+msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
+msgid_plural ""
+"Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr[0] ""
+"ატვირთული თემა ძალიან დიდია; შეუკუმშავი უნდა იყოს %d ბაიტზე ნაკლები."
 
-#: lib/themeuploader.php:178
+#: lib/themeuploader.php:179
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr "თემის არასწორი არქივი: ფაილი css/display.css არ არის"
 
-#: lib/themeuploader.php:218
+#: lib/themeuploader.php:219
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
@@ -8237,17 +8345,17 @@ msgstr ""
 "თემა შეიცავს ფაილის ან საქაღალდის არასწორ სახელს. გამოიყენეთ ASCII ასოები, "
 "ციფრები, ქვედა ტირე, და მინუსის ნიშანი."
 
-#: lib/themeuploader.php:224
+#: lib/themeuploader.php:225
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr ""
 "თემა ფაილის  გაფართოებების საშიშ სახელებს შეიცავს; შეიძლება არ იყოს უსაფრთხო."
 
-#: lib/themeuploader.php:241
+#: lib/themeuploader.php:242
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr "თემა შეიცავს ფაილის ტიპს '.%s', რომელიც აკრძალულია."
 
-#: lib/themeuploader.php:259
+#: lib/themeuploader.php:260
 msgid "Error opening theme archive."
 msgstr "თემის არქივის გახსნისას მოხდა შეცდომა."
 
@@ -8426,20 +8534,35 @@ msgstr[0] ""
 "შეტყობინება ძალიან გრძელია - დასაშვები რაოდენობაა %1$d სიმბოლომდე, თქვენ "
 "გააგზავნეთ %2$d."
 
-#: scripts/restoreuser.php:82
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: scripts/restoreuser.php:61
 #, php-format
-msgid "Backup file for user %s (%s)"
+msgid "Getting backup from file '%s'."
 msgstr ""
 
-#: scripts/restoreuser.php:88
+#. TRANS: Commandline script output.
+#: scripts/restoreuser.php:91
 #, fuzzy
 msgid "No user specified; using backup user."
 msgstr "მომხმარებლის ID მითითებული არ არის."
 
-#: scripts/restoreuser.php:94
+#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
+#: scripts/restoreuser.php:98
 #, php-format
-msgid "%d entries in backup."
-msgstr ""
+msgid "%d entry in backup."
+msgid_plural "%d entries in backup."
+msgstr[0] ""
+
+#, fuzzy
+#~ msgid "Name is too long (maximum 255 chars)."
+#~ msgstr "სახელი ძალიან გრძელია (არაუმეტეს 255 სიმბოლო)."
+
+#, fuzzy
+#~ msgid "Organization is too long (maximum 255 chars)."
+#~ msgstr "ორგანიზაცია ძალიან გრძელია (არაუმეტეს 255 სიმბოლო)."
+
+#~ msgid "That's too long. Max notice size is %d chars."
+#~ msgstr "შეტყობინების დასაძვები ზომაა %d სიმბოლო."
 
-#~ msgid "Description is too long (max %d chars)."
-#~ msgstr "აღწერა ძალიან გრძელია (არაუმეტეს %d სიმბოლო)."
+#~ msgid "Max notice size is %d chars, including attachment URL."
+#~ msgstr "შეყობინების დასაშვები ზომაა %d სიმბოლო მიმაგრებული URL-ის ჩათვლით."
diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po
index 10af95aaf..76255a186 100644
--- a/locale/ko/LC_MESSAGES/statusnet.po
+++ b/locale/ko/LC_MESSAGES/statusnet.po
@@ -11,17 +11,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-30 23:18+0000\n"
-"PO-Revision-Date: 2010-10-30 23:20:32+0000\n"
+"POT-Creation-Date: 2010-11-02 22:51+0000\n"
+"PO-Revision-Date: 2010-11-02 22:53:29+0000\n"
 "Language-Team: Korean <http://translatewiki.net/wiki/Portal:ko>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r75708); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r75875); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ko\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2010-10-30 09:48:40+0000\n"
+"X-POT-Import-Date: 2010-10-30 23:42:01+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -78,15 +78,20 @@ msgstr "접근 설정을 저장"
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
+#. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
+#. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #: actions/accessadminpanel.php:193 actions/emailsettings.php:228
-#: actions/imsettings.php:187 actions/pathsadminpanel.php:512
-#: actions/profilesettings.php:201 actions/smssettings.php:209
-#: actions/subscriptions.php:246 lib/applicationeditform.php:355
+#: actions/imsettings.php:187 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: lib/applicationeditform.php:355 lib/groupeditform.php:207
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "저장"
@@ -137,7 +142,7 @@ msgstr "해당하는 페이지 없음"
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:495 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "해당하는 이용자 없음"
@@ -206,7 +211,9 @@ msgstr ""
 
 #. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:208
+#. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -556,8 +563,11 @@ msgstr "실명이 너무 깁니다. (최대 255글자)"
 #. TRANS: Group edit form validation error.
 #. TRANS: Form validation error in New application form.
 #. TRANS: %d is the maximum number of characters for the description.
+#. TRANS: Group create form validation error.
+#. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:220 actions/editapplication.php:201
 #: actions/editgroup.php:216 actions/newapplication.php:178
+#: actions/newgroup.php:152
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -715,14 +725,14 @@ msgstr "당신은 이 프로필에 구독되지 않고있습니다."
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:172 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:74
 #: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
 #: actions/groupunblock.php:65 actions/imsettings.php:230
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
-#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/othersettings.php:153 actions/passwordsettings.php:138
 #: actions/profilesettings.php:221 actions/recoverpassword.php:350
 #: actions/register.php:172 actions/remotesubscribe.php:77
 #: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
@@ -902,20 +912,21 @@ msgstr "당신은 다른 사용자의 상태를 삭제하지 않아도 된다."
 
 #. TRANS: Client error displayed trying to repeat a non-existing notice through the API.
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
+#. TRANS: Error message displayed trying to delete a non-existing notice.
 #: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/deletenotice.php:58 actions/shownotice.php:92
+#: actions/deletenotice.php:61 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "그러한 통지는 없습니다."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:535
+#: actions/apistatusesretweet.php:83 lib/command.php:537
 msgid "Cannot repeat your own notice."
 msgstr "자기 자신의 소식은 재전송할 수 없습니다."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:541
+#: actions/apistatusesretweet.php:92 lib/command.php:543
 msgid "Already repeated that notice."
 msgstr "이미 재전송된 소식입니다."
 
@@ -936,7 +947,8 @@ msgstr ""
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#: actions/apistatusesupdate.php:244
+#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
+#: lib/mailhandler.php:60
 #, fuzzy, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
@@ -950,7 +962,7 @@ msgstr "API 메서드 발견 안 됨."
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
-#: actions/apistatusesupdate.php:308
+#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
 #, fuzzy, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
@@ -1159,17 +1171,18 @@ msgstr "그림에서 당신의 아바타로 사용할 영역을 지정하십시�
 msgid "Lost our file data."
 msgstr "파일 데이터를 잃어버렸습니다."
 
-#: actions/avatarsettings.php:384
+#. TRANS: Success message for having updated a user avatar.
+#: actions/avatarsettings.php:385
 msgid "Avatar updated."
 msgstr "아바타가 업데이트 되었습니다."
 
 #. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
-#: actions/avatarsettings.php:388
+#: actions/avatarsettings.php:389
 msgid "Failed updating avatar."
 msgstr "아바타 업데이트 실패"
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:412
+#: actions/avatarsettings.php:413
 msgid "Avatar deleted."
 msgstr "아바타가 삭제되었습니다."
 
@@ -1200,8 +1213,8 @@ msgstr ""
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:154 actions/deleteapplication.php:154
-#: actions/deletegroup.php:220 actions/deletenotice.php:150
+#: actions/block.php:154 actions/deleteapplication.php:157
+#: actions/deletegroup.php:220 actions/deletenotice.php:155
 #: actions/deleteuser.php:152 actions/groupblock.php:178
 msgctxt "BUTTON"
 msgid "No"
@@ -1219,8 +1232,8 @@ msgstr "이용자를 차단하지 않는다."
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:161 actions/deleteapplication.php:161
-#: actions/deletegroup.php:227 actions/deletenotice.php:157
+#: actions/block.php:161 actions/deleteapplication.php:164
+#: actions/deletegroup.php:227 actions/deletenotice.php:162
 #: actions/deleteuser.php:159 actions/groupblock.php:185
 msgctxt "BUTTON"
 msgid "Yes"
@@ -1338,12 +1351,13 @@ msgstr "그 주소는 이미 승인되었습니다."
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
 #. TRANS: Server error thrown on database error updating IM preferences.
 #. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
 #. TRANS: Server error thrown when user profile settings could not be updated.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #: actions/confirmaddress.php:118 actions/emailsettings.php:331
 #: actions/emailsettings.php:477 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:174
+#: actions/imsettings.php:442 actions/othersettings.php:184
 #: actions/profilesettings.php:326 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
@@ -1379,16 +1393,19 @@ msgstr "대화"
 msgid "Notices"
 msgstr "통지"
 
-#: actions/deleteapplication.php:63
+#. TRANS: Client error displayed trying to delete an application while not logged in.
+#: actions/deleteapplication.php:62
 msgid "You must be logged in to delete an application."
 msgstr "응용 프로그램 수정을 위해서는 로그인해야 합니다."
 
+#. TRANS: Client error displayed trying to delete an application that does not exist.
 #: actions/deleteapplication.php:71
 msgid "Application not found."
 msgstr "인증 코드가 없습니다."
 
+#. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
-#: actions/deleteapplication.php:78 actions/editapplication.php:78
+#: actions/deleteapplication.php:79 actions/editapplication.php:78
 #: actions/showapplication.php:94
 msgid "You are not the owner of this application."
 msgstr "이 응용프로그램 삭제 않기"
@@ -1396,15 +1413,18 @@ msgstr "이 응용프로그램 삭제 않기"
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
 #: actions/newapplication.php:114 actions/showapplication.php:118
-#: lib/action.php:1354
+#: lib/action.php:1404
 msgid "There was a problem with your session token."
 msgstr "당신의 세션토큰관련 문제가 있습니다."
 
-#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+#. TRANS: Title for delete application page.
+#. TRANS: Fieldset legend on delete application page.
+#: actions/deleteapplication.php:124 actions/deleteapplication.php:149
 msgid "Delete application"
 msgstr "응용프로그램 삭제"
 
-#: actions/deleteapplication.php:149
+#. TRANS: Confirmation text on delete application page.
+#: actions/deleteapplication.php:152
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
 "about the application from the database, including all existing user "
@@ -1412,12 +1432,12 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:158
+#: actions/deleteapplication.php:161
 msgid "Do not delete this application"
 msgstr "이 응용프로그램 삭제 않기"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:164
+#: actions/deleteapplication.php:167
 msgid "Delete this application"
 msgstr "이 응용프로그램 삭제"
 
@@ -1454,13 +1474,14 @@ msgstr "그룹을 업데이트 할 수 없습니다."
 msgid "Deleted group %s"
 msgstr "%1$s의 상태 (%2$s에서)"
 
-#. TRANS: Title.
+#. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
 #: actions/deletegroup.php:176 actions/deletegroup.php:202
 #, fuzzy
 msgid "Delete group"
 msgstr "이용자 삭제"
 
+#. TRANS: Warning in form for deleleting a group.
 #: actions/deletegroup.php:206
 msgid ""
 "Are you sure you want to delete this group? This will clear all data about "
@@ -1480,10 +1501,11 @@ msgstr "이 통지를 지울 수 없습니다."
 msgid "Delete this group"
 msgstr "이 사용자 삭제"
 
+#. TRANS: Error message displayed trying to delete a notice while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1493,11 +1515,13 @@ msgstr "이 사용자 삭제"
 msgid "Not logged in."
 msgstr "로그인하고 있지 않습니다."
 
-#: actions/deletenotice.php:74
+#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
+#: actions/deletenotice.php:78
 msgid "Can't delete this notice."
 msgstr "이 통지를 지울 수 없습니다."
 
-#: actions/deletenotice.php:106
+#. TRANS: Instructions for deleting a notice.
+#: actions/deletenotice.php:110
 #, fuzzy
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
@@ -1505,22 +1529,25 @@ msgid ""
 msgstr ""
 "영구적으로 게시글을 삭제하려고 합니다. 한번 삭제되면, 복구할 수 없습니다."
 
-#: actions/deletenotice.php:112 actions/deletenotice.php:144
+#. TRANS: Page title when deleting a notice.
+#. TRANS: Fieldset legend for the delete notice form.
+#: actions/deletenotice.php:117 actions/deletenotice.php:148
 msgid "Delete notice"
 msgstr "통지 삭제"
 
-#: actions/deletenotice.php:147
+#. TRANS: Message for the delete notice form.
+#: actions/deletenotice.php:152
 msgid "Are you sure you want to delete this notice?"
 msgstr "정말로 통지를 삭제하시겠습니까?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:154
+#: actions/deletenotice.php:159
 #, fuzzy
 msgid "Do not delete this notice"
 msgstr "이 통지를 지울 수 없습니다."
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:161 lib/noticelist.php:667
+#: actions/deletenotice.php:166 lib/noticelist.php:667
 msgid "Delete this notice"
 msgstr "이 게시글 삭제하기"
 
@@ -1681,11 +1708,9 @@ msgstr ""
 
 #. TRANS: Submit button title.
 #: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
-#: actions/othersettings.php:126 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: actions/useradminpanel.php:295 lib/applicationeditform.php:357
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: lib/applicationeditform.php:357 lib/designsettings.php:256
 msgid "Save"
 msgstr "저장"
 
@@ -1734,9 +1759,9 @@ msgid "Name is required."
 msgstr "기관 이름이 필요합니다."
 
 #. TRANS: Validation error shown when providing too long a name in the "Edit application" form.
-#: actions/editapplication.php:188
+#: actions/editapplication.php:188 actions/newapplication.php:169
 #, fuzzy
-msgid "Name is too long (max 255 characters)."
+msgid "Name is too long (maximum 255 characters)."
 msgstr "실명이 너무 깁니다. (최대 255글자)"
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
@@ -1766,7 +1791,7 @@ msgid "Organization is required."
 msgstr "기관 이름이 필요합니다."
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#: actions/editapplication.php:223
+#: actions/editapplication.php:223 actions/newapplication.php:199
 #, fuzzy
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "기관 이름이 너무 깁니다. (최대 255글자)"
@@ -2551,7 +2576,7 @@ msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Jabber/GTalk 계정을 위한 MicroID의 생성"
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:180
+#: actions/imsettings.php:290 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "설정이 저장되었습니다."
 
@@ -2673,10 +2698,9 @@ msgstr[0] "당신은 다음 사용자를 이미 구독하고 있습니다."
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#. TRANS: Whois output.
-#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:145 actions/invite.php:159 lib/command.php:426
-#, php-format
+#: actions/invite.php:145 actions/invite.php:159
+#, fuzzy, php-format
+msgctxt "INVITE"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
@@ -2850,8 +2874,9 @@ msgid ""
 msgstr ""
 
 #: actions/licenseadminpanel.php:156
-msgid "Invalid license title. Max length is 255 characters."
-msgstr ""
+#, fuzzy
+msgid "Invalid license title. Maximum length is 255 characters."
+msgstr "위치가 너무 깁니다. (최대 255글자)"
 
 #: actions/licenseadminpanel.php:168
 msgid "Invalid license URL."
@@ -3026,20 +3051,10 @@ msgstr "응용 프로그램 수정을 위해서는 로그인해야 합니다."
 msgid "Use this form to register a new application."
 msgstr "새 그룹을 만들기 위해 이 양식을 사용하세요."
 
-#: actions/newapplication.php:169
-#, fuzzy
-msgid "Name is too long (maximum 255 chars)."
-msgstr "실명이 너무 깁니다. (최대 255글자)"
-
 #: actions/newapplication.php:184
 msgid "Source URL is required."
 msgstr "소스 URL이 필요합니다."
 
-#: actions/newapplication.php:199
-#, fuzzy
-msgid "Organization is too long (maximum 255 chars)."
-msgstr "기관 이름이 너무 깁니다. (최대 255글자)"
-
 #: actions/newapplication.php:266 actions/newapplication.php:275
 msgid "Could not create application."
 msgstr "관심소식을 생성할 수 없습니다."
@@ -3059,14 +3074,14 @@ msgid "New message"
 msgstr "새로운 메시지입니다."
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:499
+#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501
 msgid "You can't send a message to this user."
 msgstr "당신은 이 사용자에게 메시지를 보낼 수 없습니다."
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
 #: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
-#: lib/command.php:579
+#: lib/command.php:581
 msgid "No content!"
 msgstr "내용이 없습니다!"
 
@@ -3075,7 +3090,7 @@ msgid "No recipient specified."
 msgstr "수신자를 지정하지 않았습니다."
 
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:503
+#: actions/newmessage.php:167 lib/command.php:505
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -3087,12 +3102,12 @@ msgstr "쪽지가 전송되었습니다."
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:511
+#: actions/newmessage.php:188 lib/command.php:513
 #, fuzzy, php-format
 msgid "Direct message to %s sent."
 msgstr "%s에게 보낸 직접 메시지"
 
-#: actions/newmessage.php:213 actions/newnotice.php:263
+#: actions/newmessage.php:213 actions/newnotice.php:264
 msgid "Ajax Error"
 msgstr "Ajax 에러입니다."
 
@@ -3100,17 +3115,7 @@ msgstr "Ajax 에러입니다."
 msgid "New notice"
 msgstr "새로운 통지"
 
-#: actions/newnotice.php:159 lib/mailhandler.php:60
-#, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr "너무 깁니다. 통지의 최대 길이는 %d 글자 입니다."
-
-#: actions/newnotice.php:183
-#, php-format
-msgid "Max notice size is %d chars, including attachment URL."
-msgstr "소식의 최대 길이는 첨부 URL을 포함하여 %d 글자입니다."
-
-#: actions/newnotice.php:229
+#: actions/newnotice.php:230
 msgid "Notice posted"
 msgstr "게시글이 등록되었습니다."
 
@@ -3275,36 +3280,46 @@ msgstr "사람 찾기"
 msgid "Notice Search"
 msgstr "통지 검색"
 
-#: actions/othersettings.php:60
+#: actions/othersettings.php:59
 msgid "Other settings"
 msgstr "아바타 설정"
 
+#. TRANS: Instructions for tab "Other" in user profile settings.
 #: actions/othersettings.php:71
 msgid "Manage various other options."
 msgstr "여러가지 기타 옵션을 관리합니다."
 
-#: actions/othersettings.php:108
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/othersettings.php:111
 msgid " (free service)"
 msgstr " (무료 서비스)"
 
-#: actions/othersettings.php:116
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/othersettings.php:120
 msgid "Shorten URLs with"
 msgstr "URL 줄이기 기능"
 
-#: actions/othersettings.php:117
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/othersettings.php:122
 msgid "Automatic shortening service to use."
 msgstr "사용할 URL 자동 줄이기 서비스."
 
-#: actions/othersettings.php:122
+#. TRANS: Label for checkbox.
+#: actions/othersettings.php:128
 msgid "View profile designs"
 msgstr "프로필 디자인 보기"
 
-#: actions/othersettings.php:123
+#. TRANS: Tooltip for checkbox.
+#: actions/othersettings.php:130
 msgid "Show or hide profile designs."
 msgstr "프로필 디자인 보이거나 감춥니다."
 
-#: actions/othersettings.php:153
-msgid "URL shortening service is too long (max 50 chars)."
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/othersettings.php:162
+#, fuzzy
+msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "URL 줄이기 서비스 너무 깁니다. (최대 50글자)"
 
 #: actions/otp.php:69
@@ -3787,7 +3802,7 @@ msgstr "자기소개"
 #. TRANS: Label for group location (dt). Text hidden by default.
 #: actions/profilesettings.php:149 actions/register.php:485
 #: actions/showgroup.php:267 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:177
+#: actions/userauthorization.php:166 lib/groupeditform.php:180
 #: lib/userprofile.php:165
 msgid "Location"
 msgstr "위치"
@@ -4114,7 +4129,8 @@ msgid "Unexpected password reset."
 msgstr "잘못된 비밀 번호 지정"
 
 #: actions/recoverpassword.php:365
-msgid "Password must be 6 chars or more."
+#, fuzzy
+msgid "Password must be 6 characters or more."
 msgstr "비밀 번호는 6자 이상이어야 합니다."
 
 #: actions/recoverpassword.php:369
@@ -4484,7 +4500,7 @@ msgstr "기관 이름이 필요합니다."
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:172
+#: lib/applicationeditform.php:208 lib/groupeditform.php:175
 msgid "Description"
 msgstr "설명"
 
@@ -4628,7 +4644,7 @@ msgid "Note"
 msgstr "설명"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:298 lib/groupeditform.php:184
+#: actions/showgroup.php:298 lib/groupeditform.php:187
 msgid "Aliases"
 msgstr ""
 
@@ -4755,47 +4771,67 @@ msgstr "%1$s에서 %2$s까지 메시지"
 msgid "Notice deleted."
 msgstr "게시글이 등록되었습니다."
 
-#: actions/showstream.php:72
+#. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
+#: actions/showstream.php:70
 #, fuzzy, php-format
-msgid " tagged %s"
+msgid "%1$s tagged %2$s"
+msgstr "%s 및 친구들, %d 페이지"
+
+#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#: actions/showstream.php:74
+#, fuzzy, php-format
+msgid "%1$s tagged %2$s, page %3$d"
 msgstr "%s 태그된 통지"
 
-#: actions/showstream.php:78
+#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$d is the page number.
+#: actions/showstream.php:82
 #, php-format
 msgid "%1$s, page %2$d"
 msgstr "%s 및 친구들, %d 페이지"
 
-#: actions/showstream.php:120
+#. TRANS: Title for link to notice feed.
+#. TRANS: %1$s is a user nickname, %2$s is a hashtag.
+#: actions/showstream.php:127
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "%s 그룹을 위한 공지피드 (RSS 1.0)"
 
-#: actions/showstream.php:127
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:136
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "%s 그룹을 위한 공지피드 (RSS 1.0)"
 
-#: actions/showstream.php:134
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:145
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "%s 그룹을 위한 공지피드 (RSS 2.0)"
 
-#: actions/showstream.php:141
+#: actions/showstream.php:152
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "%s 그룹을 위한 공지피드 (Atom)"
 
-#: actions/showstream.php:146
+#. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
+#. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
+#: actions/showstream.php:159
 #, fuzzy, php-format
 msgid "FOAF for %s"
 msgstr "%s의 보낸쪽지함"
 
-#: actions/showstream.php:197
+#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
+#: actions/showstream.php:211
 #, fuzzy, php-format
-msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
+msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr "%s 및 친구들의 타임라인이지만, 아직 아무도 글을 작성하지 않았습니다."
 
-#: actions/showstream.php:202
+#. TRANS: Second sentence of empty list message for a stream for the user themselves.
+#: actions/showstream.php:217
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -4803,14 +4839,18 @@ msgstr ""
 "최근에 재미있는 일들이 있었나요? 아직 올린 글이 없느데, 지금 시작해 보면 어떨"
 "까요. :)"
 
-#: actions/showstream.php:204
+#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:221
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
 "%?status_textarea=%2$s)."
 msgstr ""
 
-#: actions/showstream.php:243
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:264
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4819,7 +4859,9 @@ msgid ""
 "follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
 
-#: actions/showstream.php:248
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:271
 #, fuzzy, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4829,7 +4871,8 @@ msgstr ""
 "**%s**는 %%%%site.name%%%% [마이크로블로깅](http://en.wikipedia.org/wiki/"
 "Micro-blogging) 서비스에 계정을 갖고 있습니다."
 
-#: actions/showstream.php:305
+#. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
+#: actions/showstream.php:328
 #, fuzzy, php-format
 msgid "Repeat of %s"
 msgstr "%s에 답신"
@@ -4942,33 +4985,40 @@ msgstr ""
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:56
+#. TRANS: Page title for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:55
 msgid "Site Notice"
 msgstr "사이트 공지 사항"
 
-#: actions/sitenoticeadminpanel.php:67
+#. TRANS: Instructions for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:66
 #, fuzzy
 msgid "Edit site-wide message"
 msgstr "새로운 메시지입니다."
 
-#: actions/sitenoticeadminpanel.php:103
+#. TRANS: Server error displayed when saving a site-wide notice was impossible.
+#: actions/sitenoticeadminpanel.php:101
 msgid "Unable to save site notice."
 msgstr "디자인 설정을 저장할 수 없습니다."
 
-#: actions/sitenoticeadminpanel.php:113
-msgid "Max length for the site-wide notice is 255 chars."
+#. TRANS: Client error displayed when a site-wide notice was longer than allowed.
+#: actions/sitenoticeadminpanel.php:112
+msgid "Maximum length for the site-wide notice is 255 characters."
 msgstr ""
 
+#. TRANS: Label for site-wide notice text field in admin panel.
 #: actions/sitenoticeadminpanel.php:176
 #, fuzzy
 msgid "Site notice text"
 msgstr "사이트 공지"
 
-#: actions/sitenoticeadminpanel.php:178
-msgid "Site-wide notice text (255 chars max; HTML okay)"
+#. TRANS: Tooltip for site-wide notice text field in admin panel.
+#: actions/sitenoticeadminpanel.php:179
+msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:198
+#. TRANS: Title for button to save site notice in admin panel.
+#: actions/sitenoticeadminpanel.php:201
 #, fuzzy
 msgid "Save site notice"
 msgstr "사이트 공지"
@@ -5423,79 +5473,96 @@ msgid ""
 msgstr ""
 
 #. TRANS: User admin panel title
-#: actions/useradminpanel.php:60
+#: actions/useradminpanel.php:58
 msgctxt "TITLE"
 msgid "User"
 msgstr "사용자"
 
-#: actions/useradminpanel.php:71
+#. TRANS: Instruction for user admin panel.
+#: actions/useradminpanel.php:69
 msgid "User settings for this StatusNet site"
 msgstr ""
 
-#: actions/useradminpanel.php:150
+#. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
+#: actions/useradminpanel.php:147
 msgid "Invalid bio limit. Must be numeric."
 msgstr ""
 
-#: actions/useradminpanel.php:156
-msgid "Invalid welcome text. Max length is 255 characters."
+#. TRANS: Form validation error in user admin panel when welcome text is too long.
+#: actions/useradminpanel.php:154
+msgid "Invalid welcome text. Maximum length is 255 characters."
 msgstr ""
 
+#. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
+#. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
 #, php-format
-msgid "Invalid default subscripton: '%1$s' is not user."
+msgid "Invalid default subscripton: '%1$s' is not a user."
 msgstr ""
 
 #. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:106
+#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
 #: lib/personalgroupnav.php:109
 msgid "Profile"
 msgstr "프로필"
 
-#: actions/useradminpanel.php:223
+#. TRANS: Field label in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:220
 msgid "Bio Limit"
 msgstr ""
 
-#: actions/useradminpanel.php:224
+#. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:222
 msgid "Maximum length of a profile bio in characters."
 msgstr ""
 
-#: actions/useradminpanel.php:232
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:231
 msgid "New users"
 msgstr "새 사용자"
 
+#. TRANS: Field label in user admin panel for setting new user welcome text.
 #: actions/useradminpanel.php:236
 msgid "New user welcome"
 msgstr ""
 
-#: actions/useradminpanel.php:237
-msgid "Welcome text for new users (Max 255 chars)."
-msgstr ""
+#. TRANS: Tooltip in user admin panel for setting new user welcome text.
+#: actions/useradminpanel.php:238
+#, fuzzy
+msgid "Welcome text for new users (maximum 255 characters)."
+msgstr "실명이 너무 깁니다. (최대 255글자)"
 
-#: actions/useradminpanel.php:242
+#. TRANS: Field label in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:244
 #, fuzzy
 msgid "Default subscription"
 msgstr "모든 예약 구독"
 
-#: actions/useradminpanel.php:243
+#. TRANS: Tooltip in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:246
 #, fuzzy
 msgid "Automatically subscribe new users to this user."
 msgstr "나에게 구독하는 사람에게 자동 구독 신청"
 
-#: actions/useradminpanel.php:252
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:256
 #, fuzzy
 msgid "Invitations"
 msgstr "초대권을 보냈습니다"
 
-#: actions/useradminpanel.php:257
+#. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:262
 #, fuzzy
 msgid "Invitations enabled"
 msgstr "초대권을 보냈습니다"
 
-#: actions/useradminpanel.php:259
+#. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:265
 msgid "Whether to allow users to invite new users."
 msgstr ""
 
-#: actions/useradminpanel.php:295
+#. TRANS: Title for button to save user settings in user admin panel.
+#: actions/useradminpanel.php:302
 msgid "Save user settings"
 msgstr ""
 
@@ -5705,7 +5772,7 @@ msgid "Plugins"
 msgstr "플러그인"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:831
+#: actions/version.php:198 lib/action.php:880
 msgid "Version"
 msgstr "버전"
 
@@ -5919,16 +5986,23 @@ msgstr "새 그룹을 만들 수 없습니다."
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
+#. TRANS: Full name of a profile or group followed by nickname in parens
+#: classes/Profile.php:164
+#, fuzzy, php-format
+msgctxt "FANCYNAME"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:791
+#: classes/Profile.php:812
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:800
+#: classes/Profile.php:821
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6076,195 +6150,202 @@ msgstr "%1$s - %2$s"
 msgid "Untitled page"
 msgstr "제목없는 페이지"
 
+#. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
+#: lib/action.php:310
+msgctxt "TOOLTIP"
+msgid "Show more"
+msgstr ""
+
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:477
+#: lib/action.php:526
 msgid "Primary site navigation"
 msgstr "주 사이트 네비게이션"
 
 #. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:483
+#: lib/action.php:532
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "개인 프로필과 친구 타임라인"
 
 #. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:486
+#: lib/action.php:535
 msgctxt "MENU"
 msgid "Personal"
 msgstr "개인"
 
 #. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:488
+#: lib/action.php:537
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
 msgstr "당신의 메일, 아바타, 비밀 번호, 프로필을 변경하세요."
 
 #. TRANS: Main menu option when logged in for access to user settings
-#: lib/action.php:491
+#: lib/action.php:540
 msgid "Account"
 msgstr "계정"
 
 #. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:493
+#: lib/action.php:542
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "연결"
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:496
+#: lib/action.php:545
 msgid "Connect"
 msgstr "연결"
 
 #. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:499
+#: lib/action.php:548
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "메일 주소 확인"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:502 lib/groupnav.php:117
+#: lib/action.php:551 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "관리"
 
 #. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:506
+#: lib/action.php:555
 #, fuzzy, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "%s에 친구를 가입시키기 위해 친구와 동료를 초대합니다."
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:509
+#: lib/action.php:558
 msgctxt "MENU"
 msgid "Invite"
 msgstr "초대"
 
 #. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:515
+#: lib/action.php:564
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "이 사이트에서 로그아웃"
 
 #. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:518
+#: lib/action.php:567
 msgctxt "MENU"
 msgid "Logout"
 msgstr "로그아웃"
 
 #. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:523
+#: lib/action.php:572
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "새 계정 만들기"
 
 #. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:526
+#: lib/action.php:575
 msgctxt "MENU"
 msgid "Register"
 msgstr "등록"
 
 #. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:529
+#: lib/action.php:578
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "이 사이트에 로그인"
 
 #. TRANS: Main menu option when not logged in to log in
-#: lib/action.php:532
+#: lib/action.php:581
 msgctxt "MENU"
 msgid "Login"
 msgstr "로그인"
 
 #. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:535
+#: lib/action.php:584
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "도움말"
 
 #. TRANS: Main menu option for help on the StatusNet site
-#: lib/action.php:538
+#: lib/action.php:587
 msgctxt "MENU"
 msgid "Help"
 msgstr "도움말"
 
 #. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:541
+#: lib/action.php:590
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr "사람이나 단어 검색"
 
 #. TRANS: Main menu option when logged in or when the StatusNet instance is not private
-#: lib/action.php:544
+#: lib/action.php:593
 msgctxt "MENU"
 msgid "Search"
 msgstr "검색"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:566 lib/adminpanelaction.php:387
+#: lib/action.php:615 lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "사이트 공지"
 
 #. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:633
+#: lib/action.php:682
 msgid "Local views"
 msgstr "로컬 뷰"
 
 #. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:703
+#: lib/action.php:752
 msgid "Page notice"
 msgstr "페이지 공지"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:804
+#: lib/action.php:853
 msgid "Secondary site navigation"
 msgstr "보조 사이트 네비게이션"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:810
+#: lib/action.php:859
 msgid "Help"
 msgstr "도움말"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:813
+#: lib/action.php:862
 msgid "About"
 msgstr "정보"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:816
+#: lib/action.php:865
 msgid "FAQ"
 msgstr "자주 묻는 질문"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:821
+#: lib/action.php:870
 msgid "TOS"
 msgstr "서비스 약관"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:825
+#: lib/action.php:874
 msgid "Privacy"
 msgstr "개인정보 취급방침"
 
-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:828
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+#: lib/action.php:877
 msgid "Source"
 msgstr "소스 코드"
 
-#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:834
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+#: lib/action.php:884
 msgid "Contact"
 msgstr "연락하기"
 
-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:837
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+#: lib/action.php:887
 msgid "Badge"
 msgstr "배지"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:866
+#: lib/action.php:916
 msgid "StatusNet software license"
 msgstr "StatusNet 소프트웨어 라이선스"
 
@@ -6272,7 +6353,7 @@ msgstr "StatusNet 소프트웨어 라이선스"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:873
+#: lib/action.php:923
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -6282,7 +6363,7 @@ msgstr ""
 "공하는 마이크로블로깅서비스입니다."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:876
+#: lib/action.php:926
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** 는 마이크로블로깅서비스입니다."
@@ -6291,7 +6372,7 @@ msgstr "**%%site.name%%** 는 마이크로블로깅서비스입니다."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:883
+#: lib/action.php:933
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -6303,51 +6384,51 @@ msgstr ""
 "fsf.org/licensing/licenses/agpl-3.0.html) 라이선스에 따라 사용할 수 있습니다."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:899
+#: lib/action.php:949
 msgid "Site content license"
 msgstr "사이트 컨텐츠 라이선스"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:906
+#: lib/action.php:956
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "%1$s의 컨텐츠와 데이터는 외부 유출을 금지합니다."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:913
+#: lib/action.php:963
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr "컨텐츠와 데이터의 저작권은 %1$s의 소유입니다. All rights reserved."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:917
+#: lib/action.php:967
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "컨텐츠와 데이터의 저작권은 각 이용자의 소유입니다. All rights reserved."
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:949
+#: lib/action.php:999
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr "%1$s의 모든 컨텐츠와 데이터는 %2$s 라이선스에 따라 이용할 수 있습니다."
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1285
+#: lib/action.php:1335
 msgid "Pagination"
 msgstr "페이지수"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1296
+#: lib/action.php:1346
 msgid "After"
 msgstr "뒷 페이지"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1306
+#: lib/action.php:1356
 msgid "Before"
 msgstr "앞 페이지"
 
@@ -6696,7 +6777,7 @@ msgid "AJAX error"
 msgstr "Ajax 에러입니다."
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:233 lib/mailhandler.php:142
+#: lib/channel.php:233 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "실행 완료"
 
@@ -6713,7 +6794,7 @@ msgstr "해당 id의 프로필이 없습니다."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:626
+#: lib/command.php:99 lib/command.php:630
 #, fuzzy
 msgid "User has no last notice."
 msgstr "이용자의 지속적인 게시글이 없습니다."
@@ -6780,6 +6861,14 @@ msgstr ""
 msgid "%1$s left group %2$s."
 msgstr ""
 
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: lib/command.php:426
+#, fuzzy, php-format
+msgctxt "WHOIS"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
 #. TRANS: Whois output. %s is the full name of the queried user.
 #: lib/command.php:430
 #, php-format
@@ -6817,129 +6906,131 @@ msgid ""
 "same server."
 msgstr ""
 
-#. TRANS: Message given if content is too long.
+#. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
 #: lib/command.php:488
 #, fuzzy, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr "당신이 보낸 메시지가 너무 길어요. 최대 140글자까지입니다."
+msgid "Message too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] "당신이 보낸 메시지가 너무 길어요. 최대 140글자까지입니다."
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:514
+#: lib/command.php:516
 msgid "Error sending direct message."
 msgstr "직접 메시지 보내기 오류."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:551
+#: lib/command.php:553
 #, fuzzy, php-format
 msgid "Notice from %s repeated."
 msgstr "게시글이 등록되었습니다."
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:554
+#: lib/command.php:556
 msgid "Error repeating notice."
 msgstr "사용자 세팅 오류"
 
-#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:589
+#: lib/command.php:591
 #, fuzzy, php-format
-msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
-msgstr "당신이 보낸 메시지가 너무 길어요. 최대 140글자까지입니다."
+msgid "Notice too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] "당신이 보낸 메시지가 너무 길어요. 최대 140글자까지입니다."
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:600
+#: lib/command.php:604
 #, fuzzy, php-format
 msgid "Reply to %s sent."
 msgstr "이 게시글에 대해 답장하기"
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:603
+#: lib/command.php:607
 msgid "Error saving notice."
 msgstr "사용자 세팅 오류"
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:650
+#: lib/command.php:654
 #, fuzzy
 msgid "Specify the name of the user to subscribe to."
 msgstr "구독하려는 사용자의 이름을 지정하십시오."
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:659
+#: lib/command.php:663
 #, fuzzy
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "당신은 이 프로필에 구독되지 않고있습니다."
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:667
+#: lib/command.php:671
 #, php-format
 msgid "Subscribed to %s."
 msgstr ""
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:688 lib/command.php:799
+#: lib/command.php:692 lib/command.php:803
 #, fuzzy
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "구독을 해제하려는 사용자의 이름을 지정하십시오."
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:699
+#: lib/command.php:703
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:719 lib/command.php:745
+#: lib/command.php:723 lib/command.php:749
 msgid "Command not yet implemented."
 msgstr "명령이 아직 실행되지 않았습니다."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:723
+#: lib/command.php:727
 msgid "Notification off."
 msgstr "알림끄기."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:726
+#: lib/command.php:730
 msgid "Can't turn off notification."
 msgstr "알림을 끌 수 없습니다."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:749
+#: lib/command.php:753
 msgid "Notification on."
 msgstr "알림이 켜졌습니다."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:752
+#: lib/command.php:756
 msgid "Can't turn on notification."
 msgstr "알림을 켤 수 없습니다."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:766
+#: lib/command.php:770
 msgid "Login command is disabled."
 msgstr ""
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:779
+#: lib/command.php:783
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:808
+#: lib/command.php:812
 #, php-format
 msgid "Unsubscribed %s."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:826
+#: lib/command.php:830
 #, fuzzy
 msgid "You are not subscribed to anyone."
 msgstr "당신은 이 프로필에 구독되지 않고있습니다."
@@ -6947,14 +7038,14 @@ msgstr "당신은 이 프로필에 구독되지 않고있습니다."
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:831
+#: lib/command.php:835
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "당신은 다음 사용자를 이미 구독하고 있습니다."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:853
+#: lib/command.php:857
 #, fuzzy
 msgid "No one is subscribed to you."
 msgstr "다른 사람을 구독 하실 수 없습니다."
@@ -6962,14 +7053,14 @@ msgstr "다른 사람을 구독 하실 수 없습니다."
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:858
+#: lib/command.php:862
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "다른 사람을 구독 하실 수 없습니다."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:880
+#: lib/command.php:884
 #, fuzzy
 msgid "You are not a member of any groups."
 msgstr "당신은 해당 그룹의 멤버가 아닙니다."
@@ -6977,13 +7068,13 @@ msgstr "당신은 해당 그룹의 멤버가 아닙니다."
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:885
+#: lib/command.php:889
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "당신은 해당 그룹의 멤버가 아닙니다."
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:900
+#: lib/command.php:904
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -7176,7 +7267,8 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64자 사이에 영소문자, 숫자로만 씁니다. 기호나 공백을 쓰면 안 됩니다."
 
 #: lib/groupeditform.php:163
-msgid "URL of the homepage or blog of the group or topic"
+#, fuzzy
+msgid "URL of the homepage or blog of the group or topic."
 msgstr "그룹 혹은 토픽의 홈페이지나 블로그 URL"
 
 #: lib/groupeditform.php:168
@@ -7185,18 +7277,25 @@ msgstr "응용프로그램 삭제"
 
 #: lib/groupeditform.php:170
 #, fuzzy, php-format
-msgid "Describe the group or topic in %d characters"
-msgstr "140글자로 그룹이나 토픽 설명하기"
+msgid "Describe the group or topic in %d character or less"
+msgid_plural "Describe the group or topic in %d characters or less"
+msgstr[0] "140글자로 그룹이나 토픽 설명하기"
 
-#: lib/groupeditform.php:179
+#: lib/groupeditform.php:182
+#, fuzzy
 msgid ""
-"Location for the group, if any, like \"City, State (or Region), Country\""
+"Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr "그룹의 위치, \"시/군/구, 도, 국가\""
 
-#: lib/groupeditform.php:187
+#: lib/groupeditform.php:190
 #, php-format
-msgid "Extra nicknames for the group, comma- or space- separated, max %d"
-msgstr ""
+msgid ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"alias allowed."
+msgid_plural ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"aliases allowed."
+msgstr[0] ""
 
 #. TRANS: Menu item in the group navigation page.
 #: lib/groupnav.php:86
@@ -7651,7 +7750,7 @@ msgstr "죄송합니다. 귀하의 이메일이 아닙니다."
 msgid "Sorry, no incoming email allowed."
 msgstr "죄송합니다. 이메일이 허용되지 않습니다."
 
-#: lib/mailhandler.php:228
+#: lib/mailhandler.php:229
 #, fuzzy, php-format
 msgid "Unsupported message type: %s"
 msgstr "지원하지 않는 그림 파일 형식입니다."
@@ -7999,16 +8098,17 @@ msgid "Sandbox this user"
 msgstr "이 사용자를 차단해제합니다."
 
 #. TRANS: Fieldset legend for the search form.
-#: lib/searchaction.php:121
+#: lib/searchaction.php:120
 msgid "Search site"
 msgstr "검색 도움말"
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
-#: lib/searchaction.php:129
+#: lib/searchaction.php:128
 msgid "Keyword(s)"
 msgstr "검색어"
 
+#. TRANS: Button text for searching site.
 #: lib/searchaction.php:130
 msgctxt "BUTTON"
 msgid "Search"
@@ -8099,8 +8199,8 @@ msgid "The theme file is missing or the upload failed."
 msgstr ""
 
 #: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:278 lib/themeuploader.php:282
-#: lib/themeuploader.php:290 lib/themeuploader.php:297
+#: lib/themeuploader.php:279 lib/themeuploader.php:283
+#: lib/themeuploader.php:291 lib/themeuploader.php:298
 #, fuzzy
 msgid "Failed saving theme."
 msgstr "아바타 업데이트 실패"
@@ -8111,29 +8211,31 @@ msgstr ""
 
 #: lib/themeuploader.php:166
 #, php-format
-msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
-msgstr ""
+msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
+msgid_plural ""
+"Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr[0] ""
 
-#: lib/themeuploader.php:178
+#: lib/themeuploader.php:179
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr ""
 
-#: lib/themeuploader.php:218
+#: lib/themeuploader.php:219
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
 msgstr ""
 
-#: lib/themeuploader.php:224
+#: lib/themeuploader.php:225
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr ""
 
-#: lib/themeuploader.php:241
+#: lib/themeuploader.php:242
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr ""
 
-#: lib/themeuploader.php:259
+#: lib/themeuploader.php:260
 msgid "Error opening theme archive."
 msgstr "차단 제거 에러!"
 
@@ -8311,23 +8413,39 @@ msgid "Message too long. Maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
 msgstr[0] "당신이 보낸 메시지가 너무 길어요. 최대 140글자까지입니다."
 
-#: scripts/restoreuser.php:82
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: scripts/restoreuser.php:61
 #, php-format
-msgid "Backup file for user %s (%s)"
+msgid "Getting backup from file '%s'."
 msgstr ""
 
-#: scripts/restoreuser.php:88
+#. TRANS: Commandline script output.
+#: scripts/restoreuser.php:91
 #, fuzzy
 msgid "No user specified; using backup user."
 msgstr "프로필을 지정하지 않았습니다."
 
-#: scripts/restoreuser.php:94
+#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
+#: scripts/restoreuser.php:98
 #, php-format
-msgid "%d entries in backup."
-msgstr ""
+msgid "%d entry in backup."
+msgid_plural "%d entries in backup."
+msgstr[0] ""
 
-#~ msgid "Description is too long (max %d chars)."
-#~ msgstr "설명이 너무 깁니다. (최대 %d 글자)"
+#, fuzzy
+#~ msgid "Name is too long (maximum 255 chars)."
+#~ msgstr "실명이 너무 깁니다. (최대 255글자)"
 
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "별명이 너무 많습니다! 최대 %d개."
+#, fuzzy
+#~ msgid "Organization is too long (maximum 255 chars)."
+#~ msgstr "기관 이름이 너무 깁니다. (최대 255글자)"
+
+#~ msgid "That's too long. Max notice size is %d chars."
+#~ msgstr "너무 깁니다. 통지의 최대 길이는 %d 글자 입니다."
+
+#~ msgid "Max notice size is %d chars, including attachment URL."
+#~ msgstr "소식의 최대 길이는 첨부 URL을 포함하여 %d 글자입니다."
+
+#, fuzzy
+#~ msgid " tagged %s"
+#~ msgstr "%s 태그된 통지"
diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po
index dc06bfc24..1b5c5fa08 100644
--- a/locale/mk/LC_MESSAGES/statusnet.po
+++ b/locale/mk/LC_MESSAGES/statusnet.po
@@ -10,17 +10,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-30 23:18+0000\n"
-"PO-Revision-Date: 2010-10-30 23:20:35+0000\n"
+"POT-Creation-Date: 2010-11-02 22:51+0000\n"
+"PO-Revision-Date: 2010-11-02 22:53:31+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r75708); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r75875); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
-"X-POT-Import-Date: 2010-10-30 09:48:40+0000\n"
+"X-POT-Import-Date: 2010-10-30 23:42:01+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -79,15 +79,20 @@ msgstr "Зачувај нагодувања на пристап"
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
+#. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
+#. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #: actions/accessadminpanel.php:193 actions/emailsettings.php:228
-#: actions/imsettings.php:187 actions/pathsadminpanel.php:512
-#: actions/profilesettings.php:201 actions/smssettings.php:209
-#: actions/subscriptions.php:246 lib/applicationeditform.php:355
+#: actions/imsettings.php:187 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: lib/applicationeditform.php:355 lib/groupeditform.php:207
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Зачувај"
@@ -138,7 +143,7 @@ msgstr "Нема таква страница."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:495 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Нема таков корисник."
@@ -210,7 +215,9 @@ msgstr ""
 
 #. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:208
+#. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -568,8 +575,11 @@ msgstr "Полното име е предолго (највеќе 255 знаци
 #. TRANS: Group edit form validation error.
 #. TRANS: Form validation error in New application form.
 #. TRANS: %d is the maximum number of characters for the description.
+#. TRANS: Group create form validation error.
+#. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:220 actions/editapplication.php:201
 #: actions/editgroup.php:216 actions/newapplication.php:178
+#: actions/newgroup.php:152
 #, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -725,14 +735,14 @@ msgstr "Жетонот за барање е веќе овластен."
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:172 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:74
 #: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
 #: actions/groupunblock.php:65 actions/imsettings.php:230
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
-#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/othersettings.php:153 actions/passwordsettings.php:138
 #: actions/profilesettings.php:221 actions/recoverpassword.php:350
 #: actions/register.php:172 actions/remotesubscribe.php:77
 #: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
@@ -910,20 +920,21 @@ msgstr "Не можете да избришете статус на друг к�
 
 #. TRANS: Client error displayed trying to repeat a non-existing notice through the API.
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
+#. TRANS: Error message displayed trying to delete a non-existing notice.
 #: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/deletenotice.php:58 actions/shownotice.php:92
+#: actions/deletenotice.php:61 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "Нема таква забелешка."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:535
+#: actions/apistatusesretweet.php:83 lib/command.php:537
 msgid "Cannot repeat your own notice."
 msgstr "Не можете да ја повторувате сопствената забелешка."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:541
+#: actions/apistatusesretweet.php:92 lib/command.php:543
 msgid "Already repeated that notice."
 msgstr "Забелешката е веќе повторена."
 
@@ -944,7 +955,8 @@ msgstr "Клиентот мора да укаже вредност за пара
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#: actions/apistatusesupdate.php:244
+#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
+#: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
@@ -958,7 +970,7 @@ msgstr "Матичната забелешка не е пронајдена."
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
-#: actions/apistatusesupdate.php:308
+#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
 #, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
@@ -1139,21 +1151,18 @@ msgstr "Преглед"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
 #: actions/avatarsettings.php:155
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Delete"
-msgstr "Бриши"
+msgstr "Избриши"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
 #: actions/avatarsettings.php:173
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Подигни"
 
 #. TRANS: Button on avatar upload crop form to confirm a selected crop as avatar.
 #: actions/avatarsettings.php:243
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Crop"
 msgstr "Отсечи"
@@ -1173,17 +1182,18 @@ msgstr "Одберете квадратна површина од сликата
 msgid "Lost our file data."
 msgstr "Податоците за податотеката се изгубени."
 
-#: actions/avatarsettings.php:384
+#. TRANS: Success message for having updated a user avatar.
+#: actions/avatarsettings.php:385
 msgid "Avatar updated."
 msgstr "Аватарот е подновен."
 
 #. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
-#: actions/avatarsettings.php:388
+#: actions/avatarsettings.php:389
 msgid "Failed updating avatar."
 msgstr "Подновата на аватарот не успеа."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:412
+#: actions/avatarsettings.php:413
 msgid "Avatar deleted."
 msgstr "Аватарот е избришан."
 
@@ -1216,8 +1226,8 @@ msgstr ""
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:154 actions/deleteapplication.php:154
-#: actions/deletegroup.php:220 actions/deletenotice.php:150
+#: actions/block.php:154 actions/deleteapplication.php:157
+#: actions/deletegroup.php:220 actions/deletenotice.php:155
 #: actions/deleteuser.php:152 actions/groupblock.php:178
 msgctxt "BUTTON"
 msgid "No"
@@ -1235,8 +1245,8 @@ msgstr "Не го блокирај корисников"
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:161 actions/deleteapplication.php:161
-#: actions/deletegroup.php:227 actions/deletenotice.php:157
+#: actions/block.php:161 actions/deleteapplication.php:164
+#: actions/deletegroup.php:227 actions/deletenotice.php:162
 #: actions/deleteuser.php:159 actions/groupblock.php:185
 msgctxt "BUTTON"
 msgid "Yes"
@@ -1304,7 +1314,6 @@ msgstr "Одблокирај корисник од група"
 
 #. TRANS: Button text for unblocking a user from a group.
 #: actions/blockedfromgroup.php:323
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Unblock"
 msgstr "Одблокирај"
@@ -1353,12 +1362,13 @@ msgstr "Оваа адреса веќе е потврдена."
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
 #. TRANS: Server error thrown on database error updating IM preferences.
 #. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
 #. TRANS: Server error thrown when user profile settings could not be updated.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #: actions/confirmaddress.php:118 actions/emailsettings.php:331
 #: actions/emailsettings.php:477 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:174
+#: actions/imsettings.php:442 actions/othersettings.php:184
 #: actions/profilesettings.php:326 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
@@ -1367,9 +1377,8 @@ msgstr "Не можев да го подновам корисникот."
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
 #: actions/confirmaddress.php:132
-#, fuzzy
 msgid "Could not delete address confirmation."
-msgstr "Не можев да ја избришам потврдата на IM."
+msgstr "Не можев да ја избришам потврдата на адреса."
 
 #. TRANS: Title for the contact address confirmation action.
 #: actions/confirmaddress.php:150
@@ -1394,16 +1403,19 @@ msgstr "Разговор"
 msgid "Notices"
 msgstr "Забелешки"
 
-#: actions/deleteapplication.php:63
+#. TRANS: Client error displayed trying to delete an application while not logged in.
+#: actions/deleteapplication.php:62
 msgid "You must be logged in to delete an application."
 msgstr "Мора да сте најавени за да можете да избришете програм."
 
+#. TRANS: Client error displayed trying to delete an application that does not exist.
 #: actions/deleteapplication.php:71
 msgid "Application not found."
 msgstr "Програмот не е пронајден."
 
+#. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
-#: actions/deleteapplication.php:78 actions/editapplication.php:78
+#: actions/deleteapplication.php:79 actions/editapplication.php:78
 #: actions/showapplication.php:94
 msgid "You are not the owner of this application."
 msgstr "Не сте сопственик на овој програм."
@@ -1411,15 +1423,18 @@ msgstr "Не сте сопственик на овој програм."
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
 #: actions/newapplication.php:114 actions/showapplication.php:118
-#: lib/action.php:1354
+#: lib/action.php:1404
 msgid "There was a problem with your session token."
 msgstr "Се појави проблем со Вашиот сесиски жетон."
 
-#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+#. TRANS: Title for delete application page.
+#. TRANS: Fieldset legend on delete application page.
+#: actions/deleteapplication.php:124 actions/deleteapplication.php:149
 msgid "Delete application"
 msgstr "Избриши програм"
 
-#: actions/deleteapplication.php:149
+#. TRANS: Confirmation text on delete application page.
+#: actions/deleteapplication.php:152
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
 "about the application from the database, including all existing user "
@@ -1430,12 +1445,12 @@ msgstr ""
 "поврзувања."
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:158
+#: actions/deleteapplication.php:161
 msgid "Do not delete this application"
 msgstr "Не го бриши овој програм"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:164
+#: actions/deleteapplication.php:167
 msgid "Delete this application"
 msgstr "Избриши го програмов"
 
@@ -1469,12 +1484,13 @@ msgstr "Не можев да ја избришам групата %s."
 msgid "Deleted group %s"
 msgstr "Групата %s е избришана"
 
-#. TRANS: Title.
+#. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
 #: actions/deletegroup.php:176 actions/deletegroup.php:202
 msgid "Delete group"
 msgstr "Избриши група"
 
+#. TRANS: Warning in form for deleleting a group.
 #: actions/deletegroup.php:206
 msgid ""
 "Are you sure you want to delete this group? This will clear all data about "
@@ -1495,10 +1511,11 @@ msgstr "Не ја бриши групава"
 msgid "Delete this group"
 msgstr "Избриши ја групава"
 
+#. TRANS: Error message displayed trying to delete a notice while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1508,11 +1525,13 @@ msgstr "Избриши ја групава"
 msgid "Not logged in."
 msgstr "Не сте најавени."
 
-#: actions/deletenotice.php:74
+#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
+#: actions/deletenotice.php:78
 msgid "Can't delete this notice."
 msgstr "Не може да се избрише оваа забелешка."
 
-#: actions/deletenotice.php:106
+#. TRANS: Instructions for deleting a notice.
+#: actions/deletenotice.php:110
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
@@ -1520,21 +1539,24 @@ msgstr ""
 "На пат сте да избришете забелешка засекогаш. Откако ќе го направите тоа, "
 "постапката нема да може да се врати."
 
-#: actions/deletenotice.php:112 actions/deletenotice.php:144
+#. TRANS: Page title when deleting a notice.
+#. TRANS: Fieldset legend for the delete notice form.
+#: actions/deletenotice.php:117 actions/deletenotice.php:148
 msgid "Delete notice"
 msgstr "Бриши забелешка"
 
-#: actions/deletenotice.php:147
+#. TRANS: Message for the delete notice form.
+#: actions/deletenotice.php:152
 msgid "Are you sure you want to delete this notice?"
 msgstr "Дали сте сигурни дека сакате да ја избришете оваа заблешка?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:154
+#: actions/deletenotice.php:159
 msgid "Do not delete this notice"
 msgstr "Не ја бриши оваа забелешка"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:161 lib/noticelist.php:667
+#: actions/deletenotice.php:166 lib/noticelist.php:667
 msgid "Delete this notice"
 msgstr "Бриши ја оваа забелешка"
 
@@ -1696,11 +1718,9 @@ msgstr "Врати по основно"
 
 #. TRANS: Submit button title.
 #: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
-#: actions/othersettings.php:126 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: actions/useradminpanel.php:295 lib/applicationeditform.php:357
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: lib/applicationeditform.php:357 lib/designsettings.php:256
 msgid "Save"
 msgstr "Зачувај"
 
@@ -1748,8 +1768,9 @@ msgid "Name is required."
 msgstr "Треба име."
 
 #. TRANS: Validation error shown when providing too long a name in the "Edit application" form.
-#: actions/editapplication.php:188
-msgid "Name is too long (max 255 characters)."
+#: actions/editapplication.php:188 actions/newapplication.php:169
+#, fuzzy
+msgid "Name is too long (maximum 255 characters)."
 msgstr "Името е предолго (највеќе 255 знаци)."
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
@@ -1778,7 +1799,7 @@ msgid "Organization is required."
 msgstr "Треба организација."
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#: actions/editapplication.php:223
+#: actions/editapplication.php:223 actions/newapplication.php:199
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "Името на организацијата е предолго (највеќе 255 знаци)."
 
@@ -2580,7 +2601,7 @@ msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Објави MicroID за мојата адреса на Jabber/GTalk."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:180
+#: actions/imsettings.php:290 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "Нагодувањата се зачувани."
 
@@ -2704,10 +2725,9 @@ msgstr[1] "Веќе сте претплатени на овие корисниц
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#. TRANS: Whois output.
-#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:145 actions/invite.php:159 lib/command.php:426
-#, php-format
+#: actions/invite.php:145 actions/invite.php:159
+#, fuzzy, php-format
+msgctxt "INVITE"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
@@ -2891,7 +2911,8 @@ msgstr ""
 "Сите права задржани."
 
 #: actions/licenseadminpanel.php:156
-msgid "Invalid license title. Max length is 255 characters."
+#, fuzzy
+msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "Неважечки наслов на лиценцата. Дозволени се највеќе 255 знаци."
 
 #: actions/licenseadminpanel.php:168
@@ -3067,18 +3088,10 @@ msgstr "Мора да сте најавени за да можете да рег
 msgid "Use this form to register a new application."
 msgstr "Овој образец служи за регистрирање на нов програм."
 
-#: actions/newapplication.php:169
-msgid "Name is too long (maximum 255 chars)."
-msgstr "Името е предолго (највеќе 255 знаци)."
-
 #: actions/newapplication.php:184
 msgid "Source URL is required."
 msgstr "Треба изворна URL-адреса."
 
-#: actions/newapplication.php:199
-msgid "Organization is too long (maximum 255 chars)."
-msgstr "Организацијата е предолга (дозволени се највеќе 255 знаци)."
-
 #: actions/newapplication.php:266 actions/newapplication.php:275
 msgid "Could not create application."
 msgstr "Не можеше да се создаде програмот."
@@ -3098,14 +3111,14 @@ msgid "New message"
 msgstr "Нова порака"
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:499
+#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501
 msgid "You can't send a message to this user."
 msgstr "Не можете да испратите порака до овојо корисник."
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
 #: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
-#: lib/command.php:579
+#: lib/command.php:581
 msgid "No content!"
 msgstr "Нема содржина!"
 
@@ -3114,7 +3127,7 @@ msgid "No recipient specified."
 msgstr "Нема назначено примач."
 
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:503
+#: actions/newmessage.php:167 lib/command.php:505
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -3127,12 +3140,12 @@ msgstr "Пораката е испратена"
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:511
+#: actions/newmessage.php:188 lib/command.php:513
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Директната порака до %s е испратена."
 
-#: actions/newmessage.php:213 actions/newnotice.php:263
+#: actions/newmessage.php:213 actions/newnotice.php:264
 msgid "Ajax Error"
 msgstr "Ajax-грешка"
 
@@ -3140,19 +3153,7 @@ msgstr "Ajax-грешка"
 msgid "New notice"
 msgstr "Ново забелешка"
 
-#: actions/newnotice.php:159 lib/mailhandler.php:60
-#, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr "Ова е предолго. Максималната дозволена должина изнесува %d знаци."
-
-#: actions/newnotice.php:183
-#, php-format
-msgid "Max notice size is %d chars, including attachment URL."
-msgstr ""
-"Максималната големина на забелешката е %d знаци, вклучувајќи ја URL-адресата "
-"на прилогот."
-
-#: actions/newnotice.php:229
+#: actions/newnotice.php:230
 msgid "Notice posted"
 msgstr "Забелешката е објавена"
 
@@ -3324,36 +3325,46 @@ msgstr "Пребарување на луѓе"
 msgid "Notice Search"
 msgstr "Пребарување на забелешки"
 
-#: actions/othersettings.php:60
+#: actions/othersettings.php:59
 msgid "Other settings"
 msgstr "Други нагодувања"
 
+#. TRANS: Instructions for tab "Other" in user profile settings.
 #: actions/othersettings.php:71
 msgid "Manage various other options."
 msgstr "Раководење со разни други можности."
 
-#: actions/othersettings.php:108
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/othersettings.php:111
 msgid " (free service)"
-msgstr "(бесплатна услуга)"
+msgstr " (бесплатна услуга)"
 
-#: actions/othersettings.php:116
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/othersettings.php:120
 msgid "Shorten URLs with"
 msgstr "Скратувај URL-адреси со"
 
-#: actions/othersettings.php:117
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/othersettings.php:122
 msgid "Automatic shortening service to use."
 msgstr "Која автоматска служба за скратување да се користи."
 
-#: actions/othersettings.php:122
+#. TRANS: Label for checkbox.
+#: actions/othersettings.php:128
 msgid "View profile designs"
 msgstr "Види изгледи на профилот"
 
-#: actions/othersettings.php:123
+#. TRANS: Tooltip for checkbox.
+#: actions/othersettings.php:130
 msgid "Show or hide profile designs."
 msgstr "Прикажи или сокриј профилни изгледи."
 
-#: actions/othersettings.php:153
-msgid "URL shortening service is too long (max 50 chars)."
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/othersettings.php:162
+#, fuzzy
+msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "Услугата за скратување на URL-адреси е предолга (највеќе до 50 знаци)."
 
 #: actions/otp.php:69
@@ -3827,7 +3838,7 @@ msgstr "Биографија"
 #. TRANS: Label for group location (dt). Text hidden by default.
 #: actions/profilesettings.php:149 actions/register.php:485
 #: actions/showgroup.php:267 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:177
+#: actions/userauthorization.php:166 lib/groupeditform.php:180
 #: lib/userprofile.php:165
 msgid "Location"
 msgstr "Местоположба"
@@ -4170,7 +4181,8 @@ msgid "Unexpected password reset."
 msgstr "Неочекувано подновување на лозинката."
 
 #: actions/recoverpassword.php:365
-msgid "Password must be 6 chars or more."
+#, fuzzy
+msgid "Password must be 6 characters or more."
 msgstr "Лозинката мора да биде од најмалку 6 знаци."
 
 #: actions/recoverpassword.php:369
@@ -4549,7 +4561,7 @@ msgstr "Организација"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:172
+#: lib/applicationeditform.php:208 lib/groupeditform.php:175
 msgid "Description"
 msgstr "Опис"
 
@@ -4702,7 +4714,7 @@ msgid "Note"
 msgstr "Забелешка"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:298 lib/groupeditform.php:184
+#: actions/showgroup.php:298 lib/groupeditform.php:187
 msgid "Aliases"
 msgstr "Алијаси"
 
@@ -4754,14 +4766,12 @@ msgstr "Сите членови"
 
 #. TRANS: Label for creation date in statistics on group page.
 #: actions/showgroup.php:458
-#, fuzzy
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Создадено"
 
 #. TRANS: Label for member count in statistics on group page.
 #: actions/showgroup.php:466
-#, fuzzy
 msgctxt "LABEL"
 msgid "Members"
 msgstr "Членови"
@@ -4835,47 +4845,67 @@ msgstr "Порака од %1$s на %2$s"
 msgid "Notice deleted."
 msgstr "Избришана забелешка"
 
-#: actions/showstream.php:72
-#, php-format
-msgid " tagged %s"
-msgstr "  означено со %s"
+#. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
+#: actions/showstream.php:70
+#, fuzzy, php-format
+msgid "%1$s tagged %2$s"
+msgstr "%1$s, стр. %2$d"
 
-#: actions/showstream.php:78
+#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#: actions/showstream.php:74
+#, fuzzy, php-format
+msgid "%1$s tagged %2$s, page %3$d"
+msgstr "Забелешки означени со %1$s, стр. %2$d"
+
+#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$d is the page number.
+#: actions/showstream.php:82
 #, php-format
 msgid "%1$s, page %2$d"
 msgstr "%1$s, стр. %2$d"
 
-#: actions/showstream.php:120
+#. TRANS: Title for link to notice feed.
+#. TRANS: %1$s is a user nickname, %2$s is a hashtag.
+#: actions/showstream.php:127
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Канал со забелешки за %1$s означен со %2$s (RSS 1.0)"
 
-#: actions/showstream.php:127
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:136
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "Канал со забелешки за %s (RSS 1.0)"
 
-#: actions/showstream.php:134
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:145
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "Канал со забелешки за %s (RSS 2.0)"
 
-#: actions/showstream.php:141
+#: actions/showstream.php:152
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "Канал со забелешки за %s (Atom)"
 
-#: actions/showstream.php:146
+#. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
+#. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
+#: actions/showstream.php:159
 #, php-format
 msgid "FOAF for %s"
 msgstr "FOAF за %s"
 
-#: actions/showstream.php:197
-#, php-format
-msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
+#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
+#: actions/showstream.php:211
+#, fuzzy, php-format
+msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr "Ова е историјата за %1$s, но %2$s сè уште нема објавено ништо."
 
-#: actions/showstream.php:202
+#. TRANS: Second sentence of empty list message for a stream for the user themselves.
+#: actions/showstream.php:217
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -4883,7 +4913,9 @@ msgstr ""
 "Имате видено нешто интересно во последно време? Сè уште немате објавено "
 "ниедна забелешка, но сега е добро време за да почнете :)"
 
-#: actions/showstream.php:204
+#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:221
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -4892,7 +4924,9 @@ msgstr ""
 "Можете да го подбуцнете корисникот %1$s или [му испратите нешто](%%%%action."
 "newnotice%%%%?status_textarea=%2$s)."
 
-#: actions/showstream.php:243
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:264
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4906,7 +4940,9 @@ msgstr ""
 "register%%%%) за да можете да ги следите забелешките на **%s** и многу "
 "повеќе! ([Прочитајте повеќе](%%%%doc.help%%%%))"
 
-#: actions/showstream.php:248
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:271
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4917,7 +4953,8 @@ msgstr ""
 "(http://mk.wikipedia.org/wiki/Микроблогирање) заснована на слободната "
 "програмска алатка [StatusNet](http://status.net/). "
 
-#: actions/showstream.php:305
+#. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
+#: actions/showstream.php:328
 #, php-format
 msgid "Repeat of %s"
 msgstr "Повторувања на %s"
@@ -5033,33 +5070,42 @@ msgstr ""
 "Колку долго треба да почекаат корисниците (во секунди) за да можат повторно "
 "да го објават истото."
 
-#: actions/sitenoticeadminpanel.php:56
+#. TRANS: Page title for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:55
 msgid "Site Notice"
 msgstr "Објава на страница"
 
-#: actions/sitenoticeadminpanel.php:67
+#. TRANS: Instructions for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:66
 msgid "Edit site-wide message"
 msgstr "Уреди објава за цело мрежно место"
 
-#: actions/sitenoticeadminpanel.php:103
+#. TRANS: Server error displayed when saving a site-wide notice was impossible.
+#: actions/sitenoticeadminpanel.php:101
 msgid "Unable to save site notice."
 msgstr "Не можам да ја зачувам објавата за мрежното место."
 
-#: actions/sitenoticeadminpanel.php:113
-msgid "Max length for the site-wide notice is 255 chars."
+#. TRANS: Client error displayed when a site-wide notice was longer than allowed.
+#: actions/sitenoticeadminpanel.php:112
+#, fuzzy
+msgid "Maximum length for the site-wide notice is 255 characters."
 msgstr "Објавата за цело мрежно место не треба да содржи повеќе од 255 знаци."
 
+#. TRANS: Label for site-wide notice text field in admin panel.
 #: actions/sitenoticeadminpanel.php:176
 msgid "Site notice text"
 msgstr "Текст на објавата за мрежното место"
 
-#: actions/sitenoticeadminpanel.php:178
-msgid "Site-wide notice text (255 chars max; HTML okay)"
+#. TRANS: Tooltip for site-wide notice text field in admin panel.
+#: actions/sitenoticeadminpanel.php:179
+#, fuzzy
+msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr ""
 "Текст за главна објава по цело мрежно место (највеќе до 255 знаци; дозволено "
 "и HTML)"
 
-#: actions/sitenoticeadminpanel.php:198
+#. TRANS: Title for button to save site notice in admin panel.
+#: actions/sitenoticeadminpanel.php:201
 msgid "Save site notice"
 msgstr "Зачувај ја објавава"
 
@@ -5524,75 +5570,93 @@ msgstr ""
 "мрежното место „%2$s“."
 
 #. TRANS: User admin panel title
-#: actions/useradminpanel.php:60
+#: actions/useradminpanel.php:58
 msgctxt "TITLE"
 msgid "User"
 msgstr "Корисник"
 
-#: actions/useradminpanel.php:71
+#. TRANS: Instruction for user admin panel.
+#: actions/useradminpanel.php:69
 msgid "User settings for this StatusNet site"
 msgstr "Кориснички нагодувања за ова StatusNet-мрежно место"
 
-#: actions/useradminpanel.php:150
+#. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
+#: actions/useradminpanel.php:147
 msgid "Invalid bio limit. Must be numeric."
 msgstr "Неважечко ограничување за биографијата. Мора да е бројчено."
 
-#: actions/useradminpanel.php:156
-msgid "Invalid welcome text. Max length is 255 characters."
+#. TRANS: Form validation error in user admin panel when welcome text is too long.
+#: actions/useradminpanel.php:154
+#, fuzzy
+msgid "Invalid welcome text. Maximum length is 255 characters."
 msgstr "Неважечки текст за добредојде. Дозволени се највеќе 255 знаци."
 
+#. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
+#. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
-#, php-format
-msgid "Invalid default subscripton: '%1$s' is not user."
+#, fuzzy, php-format
+msgid "Invalid default subscripton: '%1$s' is not a user."
 msgstr "Неважечки опис по основно: „%1$s“ не е корисник."
 
 #. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:106
+#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
 #: lib/personalgroupnav.php:109
 msgid "Profile"
 msgstr "Профил"
 
-#: actions/useradminpanel.php:223
+#. TRANS: Field label in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:220
 msgid "Bio Limit"
 msgstr "Ограничување за биографијата"
 
-#: actions/useradminpanel.php:224
+#. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:222
 msgid "Maximum length of a profile bio in characters."
 msgstr "Максимална големина на профилната биографија во знаци."
 
-#: actions/useradminpanel.php:232
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:231
 msgid "New users"
 msgstr "Нови корисници"
 
+#. TRANS: Field label in user admin panel for setting new user welcome text.
 #: actions/useradminpanel.php:236
 msgid "New user welcome"
 msgstr "Добредојде за нов корисник"
 
-#: actions/useradminpanel.php:237
-msgid "Welcome text for new users (Max 255 chars)."
+#. TRANS: Tooltip in user admin panel for setting new user welcome text.
+#: actions/useradminpanel.php:238
+#, fuzzy
+msgid "Welcome text for new users (maximum 255 characters)."
 msgstr "Текст за добредојде на нови корисници (највеќе до 255 знаци)."
 
-#: actions/useradminpanel.php:242
+#. TRANS: Field label in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:244
 msgid "Default subscription"
 msgstr "Основно-зададена претплата"
 
-#: actions/useradminpanel.php:243
+#. TRANS: Tooltip in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:246
 msgid "Automatically subscribe new users to this user."
 msgstr "Автоматски претплатувај нови корисници на овој корисник."
 
-#: actions/useradminpanel.php:252
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:256
 msgid "Invitations"
 msgstr "Покани"
 
-#: actions/useradminpanel.php:257
+#. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:262
 msgid "Invitations enabled"
 msgstr "Поканите се овозможени"
 
-#: actions/useradminpanel.php:259
+#. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:265
 msgid "Whether to allow users to invite new users."
 msgstr "Дали да им е дозволено на корисниците да канат други корисници."
 
-#: actions/useradminpanel.php:295
+#. TRANS: Title for button to save user settings in user admin panel.
+#: actions/useradminpanel.php:302
 msgid "Save user settings"
 msgstr "Зачувај кориснички нагодувања"
 
@@ -5804,7 +5868,7 @@ msgid "Plugins"
 msgstr "Приклучоци"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:831
+#: actions/version.php:198 lib/action.php:880
 msgid "Version"
 msgstr "Верзија"
 
@@ -6014,9 +6078,16 @@ msgstr "Не можев да го зачувам одговорот за %1$d, %
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
+#. TRANS: Full name of a profile or group followed by nickname in parens
+#: classes/Profile.php:164
+#, fuzzy, php-format
+msgctxt "FANCYNAME"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:791
+#: classes/Profile.php:812
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
@@ -6025,7 +6096,7 @@ msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:800
+#: classes/Profile.php:821
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6173,194 +6244,201 @@ msgstr "%1$s - %2$s"
 msgid "Untitled page"
 msgstr "Страница без наслов"
 
+#. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
+#: lib/action.php:310
+msgctxt "TOOLTIP"
+msgid "Show more"
+msgstr ""
+
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:477
+#: lib/action.php:526
 msgid "Primary site navigation"
 msgstr "Главна навигација"
 
 #. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:483
+#: lib/action.php:532
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "Личен профил и хронологија на пријатели"
 
 #. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:486
+#: lib/action.php:535
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Лично"
 
 #. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:488
+#: lib/action.php:537
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
 msgstr "Промена на е-пошта, аватар, лозинка, профил"
 
 #. TRANS: Main menu option when logged in for access to user settings
-#: lib/action.php:491
+#: lib/action.php:540
 msgid "Account"
 msgstr "Сметка"
 
 #. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:493
+#: lib/action.php:542
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "Поврзи се со услуги"
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:496
+#: lib/action.php:545
 msgid "Connect"
 msgstr "Поврзи се"
 
 #. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:499
+#: lib/action.php:548
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "Промена на поставките на мрежното место"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:502 lib/groupnav.php:117
+#: lib/action.php:551 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Админ"
 
 #. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:506
+#: lib/action.php:555
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Поканете пријатели и колеги да Ви се придружат на %s"
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:509
+#: lib/action.php:558
 msgctxt "MENU"
 msgid "Invite"
 msgstr "Покани"
 
 #. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:515
+#: lib/action.php:564
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "Одјава"
 
 #. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:518
+#: lib/action.php:567
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Одјава"
 
 #. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:523
+#: lib/action.php:572
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "Создај сметка"
 
 #. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:526
+#: lib/action.php:575
 msgctxt "MENU"
 msgid "Register"
 msgstr "Регистрација"
 
 #. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:529
+#: lib/action.php:578
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "Најава"
 
 #. TRANS: Main menu option when not logged in to log in
-#: lib/action.php:532
+#: lib/action.php:581
 msgctxt "MENU"
 msgid "Login"
 msgstr "Најава"
 
 #. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:535
+#: lib/action.php:584
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Напомош!"
 
 #. TRANS: Main menu option for help on the StatusNet site
-#: lib/action.php:538
+#: lib/action.php:587
 msgctxt "MENU"
 msgid "Help"
 msgstr "Помош"
 
 #. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:541
+#: lib/action.php:590
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr "Пребарајте луѓе или текст"
 
 #. TRANS: Main menu option when logged in or when the StatusNet instance is not private
-#: lib/action.php:544
+#: lib/action.php:593
 msgctxt "MENU"
 msgid "Search"
 msgstr "Барај"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:566 lib/adminpanelaction.php:387
+#: lib/action.php:615 lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "Напомена за мрежното место"
 
 #. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:633
+#: lib/action.php:682
 msgid "Local views"
 msgstr "Локални прегледи"
 
 #. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:703
+#: lib/action.php:752
 msgid "Page notice"
 msgstr "Напомена за страницата"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:804
+#: lib/action.php:853
 msgid "Secondary site navigation"
 msgstr "Споредна навигација"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:810
+#: lib/action.php:859
 msgid "Help"
 msgstr "Помош"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:813
+#: lib/action.php:862
 msgid "About"
 msgstr "За"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:816
+#: lib/action.php:865
 msgid "FAQ"
 msgstr "ЧПП"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:821
+#: lib/action.php:870
 msgid "TOS"
 msgstr "Услови"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:825
+#: lib/action.php:874
 msgid "Privacy"
 msgstr "Приватност"
 
-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:828
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+#: lib/action.php:877
 msgid "Source"
 msgstr "Изворен код"
 
-#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:834
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+#: lib/action.php:884
 msgid "Contact"
 msgstr "Контакт"
 
-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:837
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+#: lib/action.php:887
 msgid "Badge"
 msgstr "Значка"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:866
+#: lib/action.php:916
 msgid "StatusNet software license"
 msgstr "Лиценца на програмот StatusNet"
 
@@ -6368,7 +6446,7 @@ msgstr "Лиценца на програмот StatusNet"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:873
+#: lib/action.php:923
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -6378,7 +6456,7 @@ msgstr ""
 "%](%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:876
+#: lib/action.php:926
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** е сервис за микроблогирање."
@@ -6387,7 +6465,7 @@ msgstr "**%%site.name%%** е сервис за микроблогирање."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:883
+#: lib/action.php:933
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -6399,20 +6477,20 @@ msgstr ""
 "(http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:899
+#: lib/action.php:949
 msgid "Site content license"
 msgstr "Лиценца на содржините на мрежното место"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:906
+#: lib/action.php:956
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "Содржината и податоците на %1$s се лични и доверливи."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:913
+#: lib/action.php:963
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
@@ -6420,7 +6498,7 @@ msgstr ""
 "права задржани."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:917
+#: lib/action.php:967
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "Авторските права на содржината и податоците им припаѓаат на учесниците. Сите "
@@ -6428,25 +6506,25 @@ msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:949
+#: lib/action.php:999
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr "Сите содржини и податоци на %1$s се достапни под лиценцата %2$s."
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1285
+#: lib/action.php:1335
 msgid "Pagination"
 msgstr "Прелом на страници"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1296
+#: lib/action.php:1346
 msgid "After"
 msgstr "Следно"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1306
+#: lib/action.php:1356
 msgid "Before"
 msgstr "Претходно"
 
@@ -6791,7 +6869,7 @@ msgid "AJAX error"
 msgstr "Ajax-грешка"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:233 lib/mailhandler.php:142
+#: lib/channel.php:233 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "Наредбата е завршена"
 
@@ -6807,7 +6885,7 @@ msgstr "Не постои забелешка со таков id."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:626
+#: lib/command.php:99 lib/command.php:630
 msgid "User has no last notice."
 msgstr "Корисникот нема последна забелешка"
 
@@ -6876,6 +6954,14 @@ msgstr "%1$s се зачлени во групата %2$s."
 msgid "%1$s left group %2$s."
 msgstr "%1$s ја напушти групата %2$s."
 
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: lib/command.php:426
+#, fuzzy, php-format
+msgctxt "WHOIS"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
 #. TRANS: Whois output. %s is the full name of the queried user.
 #: lib/command.php:430
 #, php-format
@@ -6915,136 +7001,143 @@ msgstr ""
 "%s е далечински профил; можете да праќате директни пораки само до корисници "
 "на истиот опслужувач."
 
-#. TRANS: Message given if content is too long.
+#. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
 #: lib/command.php:488
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] ""
+"Пораката е предолга - дозволени се највеќе %1$d знаци, а вие испративте %2$d."
+msgstr[1] ""
 "Пораката е предолга - дозволени се највеќе %1$d знаци, а вие испративте %2$d."
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:514
+#: lib/command.php:516
 msgid "Error sending direct message."
 msgstr "Грашка при испаќањето на директната порака."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:551
+#: lib/command.php:553
 #, php-format
 msgid "Notice from %s repeated."
 msgstr "Забелешката од %s е повторена."
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:554
+#: lib/command.php:556
 msgid "Error repeating notice."
 msgstr "Грешка при повторувањето на белешката."
 
-#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:589
-#, php-format
-msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
+#: lib/command.php:591
+#, fuzzy, php-format
+msgid "Notice too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] ""
+"Забелешката е предолга - треба да нема повеќе од %1$d знаци, а Вие "
+"испративте %2$d."
+msgstr[1] ""
 "Забелешката е предолга - треба да нема повеќе од %1$d знаци, а Вие "
 "испративте %2$d."
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:600
+#: lib/command.php:604
 #, php-format
 msgid "Reply to %s sent."
 msgstr "Одговорот на %s е испратен."
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:603
+#: lib/command.php:607
 msgid "Error saving notice."
 msgstr "Грешка при зачувувањето на белешката."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:650
+#: lib/command.php:654
 msgid "Specify the name of the user to subscribe to."
 msgstr "Назначете го името на корисникот на којшто сакате да се претплатите."
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:659
+#: lib/command.php:663
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Не можете да се претплаќате на OMB профили по наредба."
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:667
+#: lib/command.php:671
 #, php-format
 msgid "Subscribed to %s."
 msgstr "Претплатено на %s."
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:688 lib/command.php:799
+#: lib/command.php:692 lib/command.php:803
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "Назначете го името на корисникот од кого откажувате претплата."
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:699
+#: lib/command.php:703
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr "Откажана претплата на %s."
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:719 lib/command.php:745
+#: lib/command.php:723 lib/command.php:749
 msgid "Command not yet implemented."
 msgstr "Наредбата сè уште не е имплементирана."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:723
+#: lib/command.php:727
 msgid "Notification off."
 msgstr "Известувањето е исклучено."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:726
+#: lib/command.php:730
 msgid "Can't turn off notification."
 msgstr "Не можам да исклучам известување."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:749
+#: lib/command.php:753
 msgid "Notification on."
 msgstr "Известувањето е вклучено."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:752
+#: lib/command.php:756
 msgid "Can't turn on notification."
 msgstr "Не можам да вклучам известување."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:766
+#: lib/command.php:770
 msgid "Login command is disabled."
 msgstr "Наредбата за најава е оневозможена."
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:779
+#: lib/command.php:783
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr "Оваа врска може да се употреби само еднаш, и трае само 2 минути: %s"
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:808
+#: lib/command.php:812
 #, php-format
 msgid "Unsubscribed %s."
 msgstr "Откажана претплата на %s."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:826
+#: lib/command.php:830
 msgid "You are not subscribed to anyone."
 msgstr "Не сте претплатени никому."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:831
+#: lib/command.php:835
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Не ни го испративте тој профил."
@@ -7052,14 +7145,14 @@ msgstr[1] "Не ни го испративте тој профил."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:853
+#: lib/command.php:857
 msgid "No one is subscribed to you."
 msgstr "Никој не е претплатен на Вас."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:858
+#: lib/command.php:862
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Оддалечена претплата"
@@ -7067,21 +7160,21 @@ msgstr[1] "Оддалечена претплата"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:880
+#: lib/command.php:884
 msgid "You are not a member of any groups."
 msgstr "Не членувате во ниедна група."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:885
+#: lib/command.php:889
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Не ни го испративте тој профил."
 msgstr[1] "Не ни го испративте тој профил."
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:900
+#: lib/command.php:904
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -7309,7 +7402,8 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 мали букви или бројки. Без интерпукциски знаци и празни места."
 
 #: lib/groupeditform.php:163
-msgid "URL of the homepage or blog of the group or topic"
+#, fuzzy
+msgid "URL of the homepage or blog of the group or topic."
 msgstr "URL на страницата или блогот на групата или темата"
 
 #: lib/groupeditform.php:168
@@ -7317,19 +7411,30 @@ msgid "Describe the group or topic"
 msgstr "Опишете ја групата или темата"
 
 #: lib/groupeditform.php:170
-#, php-format
-msgid "Describe the group or topic in %d characters"
-msgstr "Опишете ја групата или темата со %d знаци"
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d character or less"
+msgid_plural "Describe the group or topic in %d characters or less"
+msgstr[0] "Опишете ја групата или темата со %d знаци"
+msgstr[1] "Опишете ја групата или темата со %d знаци"
 
-#: lib/groupeditform.php:179
+#: lib/groupeditform.php:182
+#, fuzzy
 msgid ""
-"Location for the group, if any, like \"City, State (or Region), Country\""
+"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/groupeditform.php:190
+#, fuzzy, php-format
+msgid ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"alias allowed."
+msgid_plural ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"aliases allowed."
+msgstr[0] ""
+"Дополнителни прекари за групата, одделени со запирка или празно место, "
+"највеќе до %d"
+msgstr[1] ""
 "Дополнителни прекари за групата, одделени со запирка или празно место, "
 "највеќе до %d"
 
@@ -7461,27 +7566,27 @@ msgstr "Непознат тип на податотека"
 
 #. TRANS: Number of megabytes. %d is the number.
 #: lib/imagefile.php:248
-#, fuzzy, php-format
+#, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
-msgstr[0] "МБ"
-msgstr[1] "МБ"
+msgstr[0] "%d МБ"
+msgstr[1] "%d МБ"
 
 #. TRANS: Number of kilobytes. %d is the number.
 #: lib/imagefile.php:252
-#, fuzzy, php-format
+#, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
-msgstr[0] "кб"
-msgstr[1] "кб"
+msgstr[0] "%d кБ"
+msgstr[1] "%d кБ"
 
 #. TRANS: Number of bytes. %d is the number.
 #: lib/imagefile.php:255
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d Б"
+msgstr[1] "%d Б"
 
 #: lib/jabber.php:387
 #, php-format
@@ -7888,7 +7993,7 @@ msgstr "Жалиме, но тоа не е Вашата приемна е-пош�
 msgid "Sorry, no incoming email allowed."
 msgstr "Жалиме, приемната пошта не е дозволена."
 
-#: lib/mailhandler.php:228
+#: lib/mailhandler.php:229
 #, php-format
 msgid "Unsupported message type: %s"
 msgstr "Неподдржан формат на порака: %s"
@@ -8238,16 +8343,17 @@ msgid "Sandbox this user"
 msgstr "Стави го корисников во песочен режим"
 
 #. TRANS: Fieldset legend for the search form.
-#: lib/searchaction.php:121
+#: lib/searchaction.php:120
 msgid "Search site"
 msgstr "Пребарај по мрежното место"
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
-#: lib/searchaction.php:129
+#: lib/searchaction.php:128
 msgid "Keyword(s)"
 msgstr "Клучен збор"
 
+#. TRANS: Button text for searching site.
 #: lib/searchaction.php:130
 msgctxt "BUTTON"
 msgid "Search"
@@ -8338,8 +8444,8 @@ msgid "The theme file is missing or the upload failed."
 msgstr "Податотеката за изгледот недостасува или подигањето не успеало."
 
 #: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:278 lib/themeuploader.php:282
-#: lib/themeuploader.php:290 lib/themeuploader.php:297
+#: lib/themeuploader.php:279 lib/themeuploader.php:283
+#: lib/themeuploader.php:291 lib/themeuploader.php:298
 msgid "Failed saving theme."
 msgstr "Зачувувањето на мотивот не успеа."
 
@@ -8348,16 +8454,20 @@ msgid "Invalid theme: bad directory structure."
 msgstr "Неважечки изглед: лош состав на папката."
 
 #: lib/themeuploader.php:166
-#, php-format
-msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
-msgstr ""
+#, fuzzy, php-format
+msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
+msgid_plural ""
+"Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr[0] ""
+"Подигнатиот изглед е преголем; мора да биде помал од %d бајти (незбиен)."
+msgstr[1] ""
 "Подигнатиот изглед е преголем; мора да биде помал од %d бајти (незбиен)."
 
-#: lib/themeuploader.php:178
+#: lib/themeuploader.php:179
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr "Неважечки архив за изглеедот: недостасува податотеката css/display.css"
 
-#: lib/themeuploader.php:218
+#: lib/themeuploader.php:219
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
@@ -8365,16 +8475,16 @@ msgstr ""
 "Изгледот содржи неважечки назив на податотека или папка. Дозволени се само "
 "ASCII-букви, бројки, долна црта и знак за минус."
 
-#: lib/themeuploader.php:224
+#: lib/themeuploader.php:225
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr "Овој изглед содржи небезбедни податотечни наставки."
 
-#: lib/themeuploader.php:241
+#: lib/themeuploader.php:242
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr "Изгледот содржи податотека од типот „.%s“, која не е дозволена."
 
-#: lib/themeuploader.php:259
+#: lib/themeuploader.php:260
 msgid "Error opening theme archive."
 msgstr "Грешка при отворањето на архивот за мотив."
 
@@ -8384,7 +8494,6 @@ msgstr "Најактивни објавувачи"
 
 #. TRANS: Title for the form to unblock a user.
 #: lib/unblockform.php:67
-#, fuzzy
 msgctxt "TITLE"
 msgid "Unblock"
 msgstr "Одблокирај"
@@ -8558,22 +8667,41 @@ msgstr[0] ""
 msgstr[1] ""
 "Пораката е предолга - дозволени се највеќе %1$d знаци, а вие испративте %2$d."
 
-#: scripts/restoreuser.php:82
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: scripts/restoreuser.php:61
 #, php-format
-msgid "Backup file for user %s (%s)"
-msgstr "Резервна податотека за корисникот %s (%s)"
+msgid "Getting backup from file '%s'."
+msgstr ""
 
-#: scripts/restoreuser.php:88
+#. TRANS: Commandline script output.
+#: scripts/restoreuser.php:91
 msgid "No user specified; using backup user."
 msgstr "Нема назначено корисник. Ќе го употребам резервниот корисник."
 
-#: scripts/restoreuser.php:94
-#, php-format
-msgid "%d entries in backup."
-msgstr "%d резервни ставки."
+#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
+#: scripts/restoreuser.php:98
+#, fuzzy, php-format
+msgid "%d entry in backup."
+msgid_plural "%d entries in backup."
+msgstr[0] "%d резервни ставки."
+msgstr[1] "%d резервни ставки."
+
+#~ msgid "Name is too long (maximum 255 chars)."
+#~ msgstr "Името е предолго (највеќе 255 знаци)."
+
+#~ msgid "Organization is too long (maximum 255 chars)."
+#~ msgstr "Организацијата е предолга (дозволени се највеќе 255 знаци)."
+
+#~ msgid "That's too long. Max notice size is %d chars."
+#~ msgstr "Ова е предолго. Максималната дозволена должина изнесува %d знаци."
+
+#~ msgid "Max notice size is %d chars, including attachment URL."
+#~ msgstr ""
+#~ "Максималната големина на забелешката е %d знаци, вклучувајќи ја URL-"
+#~ "адресата на прилогот."
 
-#~ msgid "Description is too long (max %d chars)."
-#~ msgstr "Описот е предолг (дозволено е највеќе %d знаци)."
+#~ msgid " tagged %s"
+#~ msgstr "  означено со %s"
 
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "Премногу алијаси! Дозволено е највеќе %d."
+#~ msgid "Backup file for user %s (%s)"
+#~ msgstr "Резервна податотека за корисникот %s (%s)"
diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po
index 370ad9cbb..00033d67e 100644
--- a/locale/nb/LC_MESSAGES/statusnet.po
+++ b/locale/nb/LC_MESSAGES/statusnet.po
@@ -10,17 +10,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-30 23:18+0000\n"
-"PO-Revision-Date: 2010-10-30 23:20:38+0000\n"
+"POT-Creation-Date: 2010-11-02 22:51+0000\n"
+"PO-Revision-Date: 2010-11-02 22:53:35+0000\n"
 "Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r75708); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r75875); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2010-10-30 09:48:40+0000\n"
+"X-POT-Import-Date: 2010-10-30 23:42:01+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -77,15 +77,20 @@ msgstr "Lagre tilgangsinnstillinger"
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
+#. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
+#. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #: actions/accessadminpanel.php:193 actions/emailsettings.php:228
-#: actions/imsettings.php:187 actions/pathsadminpanel.php:512
-#: actions/profilesettings.php:201 actions/smssettings.php:209
-#: actions/subscriptions.php:246 lib/applicationeditform.php:355
+#: actions/imsettings.php:187 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: lib/applicationeditform.php:355 lib/groupeditform.php:207
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Lagre"
@@ -136,7 +141,7 @@ msgstr "Ingen slik side."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:495 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Ingen slik bruker."
@@ -207,7 +212,9 @@ msgstr ""
 
 #. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:208
+#. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -564,8 +571,11 @@ msgstr "Beklager, navnet er for langt (max 250 tegn)."
 #. TRANS: Group edit form validation error.
 #. TRANS: Form validation error in New application form.
 #. TRANS: %d is the maximum number of characters for the description.
+#. TRANS: Group create form validation error.
+#. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:220 actions/editapplication.php:201
 #: actions/editgroup.php:216 actions/newapplication.php:178
+#: actions/newgroup.php:152
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -725,14 +735,14 @@ msgstr "Du er ikke autorisert."
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:172 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:74
 #: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
 #: actions/groupunblock.php:65 actions/imsettings.php:230
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
-#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/othersettings.php:153 actions/passwordsettings.php:138
 #: actions/profilesettings.php:221 actions/recoverpassword.php:350
 #: actions/register.php:172 actions/remotesubscribe.php:77
 #: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
@@ -912,20 +922,21 @@ msgstr "Du kan ikke slette statusen til en annen bruker."
 
 #. TRANS: Client error displayed trying to repeat a non-existing notice through the API.
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
+#. TRANS: Error message displayed trying to delete a non-existing notice.
 #: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/deletenotice.php:58 actions/shownotice.php:92
+#: actions/deletenotice.php:61 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "Ingen slik notis."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:535
+#: actions/apistatusesretweet.php:83 lib/command.php:537
 msgid "Cannot repeat your own notice."
 msgstr "Kan ikke gjenta din egen notis."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:541
+#: actions/apistatusesretweet.php:92 lib/command.php:543
 msgid "Already repeated that notice."
 msgstr "Allerede gjentatt den notisen."
 
@@ -946,7 +957,8 @@ msgstr ""
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#: actions/apistatusesupdate.php:244
+#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
+#: lib/mailhandler.php:60
 #, fuzzy, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
@@ -961,7 +973,7 @@ msgstr "API-metode ikke funnet!"
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
-#: actions/apistatusesupdate.php:308
+#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
 #, fuzzy, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
@@ -1172,17 +1184,18 @@ msgstr "Velg et kvadratisk utsnitt av bildet som din avatar."
 msgid "Lost our file data."
 msgstr "Mistet våre fildata."
 
-#: actions/avatarsettings.php:384
+#. TRANS: Success message for having updated a user avatar.
+#: actions/avatarsettings.php:385
 msgid "Avatar updated."
 msgstr "Brukerbildet har blitt oppdatert."
 
 #. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
-#: actions/avatarsettings.php:388
+#: actions/avatarsettings.php:389
 msgid "Failed updating avatar."
 msgstr "Oppdatering av avatar mislyktes."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:412
+#: actions/avatarsettings.php:413
 msgid "Avatar deleted."
 msgstr "Avatar slettet."
 
@@ -1214,8 +1227,8 @@ msgstr ""
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:154 actions/deleteapplication.php:154
-#: actions/deletegroup.php:220 actions/deletenotice.php:150
+#: actions/block.php:154 actions/deleteapplication.php:157
+#: actions/deletegroup.php:220 actions/deletenotice.php:155
 #: actions/deleteuser.php:152 actions/groupblock.php:178
 msgctxt "BUTTON"
 msgid "No"
@@ -1233,8 +1246,8 @@ msgstr "Ikke blokker denne brukeren"
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:161 actions/deleteapplication.php:161
-#: actions/deletegroup.php:227 actions/deletenotice.php:157
+#: actions/block.php:161 actions/deleteapplication.php:164
+#: actions/deletegroup.php:227 actions/deletenotice.php:162
 #: actions/deleteuser.php:159 actions/groupblock.php:185
 msgctxt "BUTTON"
 msgid "Yes"
@@ -1351,12 +1364,13 @@ msgstr "Den adressen har allerede blitt bekreftet."
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
 #. TRANS: Server error thrown on database error updating IM preferences.
 #. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
 #. TRANS: Server error thrown when user profile settings could not be updated.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #: actions/confirmaddress.php:118 actions/emailsettings.php:331
 #: actions/emailsettings.php:477 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:174
+#: actions/imsettings.php:442 actions/othersettings.php:184
 #: actions/profilesettings.php:326 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
@@ -1392,16 +1406,19 @@ msgstr "Samtale"
 msgid "Notices"
 msgstr "Notiser"
 
-#: actions/deleteapplication.php:63
+#. TRANS: Client error displayed trying to delete an application while not logged in.
+#: actions/deleteapplication.php:62
 msgid "You must be logged in to delete an application."
 msgstr "Du må være innlogget for å slette et program."
 
+#. TRANS: Client error displayed trying to delete an application that does not exist.
 #: actions/deleteapplication.php:71
 msgid "Application not found."
 msgstr "Program ikke funnet."
 
+#. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
-#: actions/deleteapplication.php:78 actions/editapplication.php:78
+#: actions/deleteapplication.php:79 actions/editapplication.php:78
 #: actions/showapplication.php:94
 msgid "You are not the owner of this application."
 msgstr "Du er ikke eieren av dette programmet."
@@ -1409,16 +1426,19 @@ msgstr "Du er ikke eieren av dette programmet."
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
 #: actions/newapplication.php:114 actions/showapplication.php:118
-#: lib/action.php:1354
+#: lib/action.php:1404
 #, fuzzy
 msgid "There was a problem with your session token."
 msgstr "Det var et problem med din sesjons-autentisering. Prøv igjen."
 
-#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+#. TRANS: Title for delete application page.
+#. TRANS: Fieldset legend on delete application page.
+#: actions/deleteapplication.php:124 actions/deleteapplication.php:149
 msgid "Delete application"
 msgstr "Slett program"
 
-#: actions/deleteapplication.php:149
+#. TRANS: Confirmation text on delete application page.
+#: actions/deleteapplication.php:152
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
 "about the application from the database, including all existing user "
@@ -1429,12 +1449,12 @@ msgstr ""
 "brukertilkoblinger."
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:158
+#: actions/deleteapplication.php:161
 msgid "Do not delete this application"
 msgstr "Ikke slett dette programmet"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:164
+#: actions/deleteapplication.php:167
 msgid "Delete this application"
 msgstr "Slett dette programmet"
 
@@ -1470,13 +1490,14 @@ msgstr "Kunne ikke oppdatere gruppe."
 msgid "Deleted group %s"
 msgstr "%1$s forlot gruppe %2$s"
 
-#. TRANS: Title.
+#. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
 #: actions/deletegroup.php:176 actions/deletegroup.php:202
 #, fuzzy
 msgid "Delete group"
 msgstr "Slett bruker"
 
+#. TRANS: Warning in form for deleleting a group.
 #: actions/deletegroup.php:206
 #, fuzzy
 msgid ""
@@ -1499,10 +1520,11 @@ msgstr "Ikke slett denne notisen"
 msgid "Delete this group"
 msgstr "Slett denne brukeren"
 
+#. TRANS: Error message displayed trying to delete a notice while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1512,11 +1534,13 @@ msgstr "Slett denne brukeren"
 msgid "Not logged in."
 msgstr "Ikke logget inn."
 
-#: actions/deletenotice.php:74
+#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
+#: actions/deletenotice.php:78
 msgid "Can't delete this notice."
 msgstr "Kan ikke slette notisen."
 
-#: actions/deletenotice.php:106
+#. TRANS: Instructions for deleting a notice.
+#: actions/deletenotice.php:110
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
@@ -1524,21 +1548,24 @@ msgstr ""
 "Du er i ferd med å slette en notis permanent. Når dette er gjort kan det "
 "ikke gjøres om."
 
-#: actions/deletenotice.php:112 actions/deletenotice.php:144
+#. TRANS: Page title when deleting a notice.
+#. TRANS: Fieldset legend for the delete notice form.
+#: actions/deletenotice.php:117 actions/deletenotice.php:148
 msgid "Delete notice"
 msgstr "Slett notis"
 
-#: actions/deletenotice.php:147
+#. TRANS: Message for the delete notice form.
+#: actions/deletenotice.php:152
 msgid "Are you sure you want to delete this notice?"
 msgstr "Er du sikker på at du vil slette denne notisen?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:154
+#: actions/deletenotice.php:159
 msgid "Do not delete this notice"
 msgstr "Ikke slett denne notisen"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:161 lib/noticelist.php:667
+#: actions/deletenotice.php:166 lib/noticelist.php:667
 msgid "Delete this notice"
 msgstr "Slett denne notisen"
 
@@ -1701,11 +1728,9 @@ msgstr "Tilbakestill til standardverdier"
 
 #. TRANS: Submit button title.
 #: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
-#: actions/othersettings.php:126 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: actions/useradminpanel.php:295 lib/applicationeditform.php:357
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: lib/applicationeditform.php:357 lib/designsettings.php:256
 msgid "Save"
 msgstr "Lagre"
 
@@ -1753,9 +1778,9 @@ msgid "Name is required."
 msgstr "Navn kreves."
 
 #. TRANS: Validation error shown when providing too long a name in the "Edit application" form.
-#: actions/editapplication.php:188
+#: actions/editapplication.php:188 actions/newapplication.php:169
 #, fuzzy
-msgid "Name is too long (max 255 characters)."
+msgid "Name is too long (maximum 255 characters)."
 msgstr "Navn er for langt (maks 250 tegn)."
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
@@ -1784,7 +1809,7 @@ msgid "Organization is required."
 msgstr "Organisasjon kreves."
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#: actions/editapplication.php:223
+#: actions/editapplication.php:223 actions/newapplication.php:199
 #, fuzzy
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "Organisasjon er for lang (maks 255 tegn)."
@@ -2576,7 +2601,7 @@ msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Publiser en MicroID for min Jabber/Gtalk-adresse."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:180
+#: actions/imsettings.php:290 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "Innstillinger lagret."
 
@@ -2700,10 +2725,9 @@ msgstr[1] "Du abonnerer allerede på disse brukerne:"
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#. TRANS: Whois output.
-#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:145 actions/invite.php:159 lib/command.php:426
-#, php-format
+#: actions/invite.php:145 actions/invite.php:159
+#, fuzzy, php-format
+msgctxt "INVITE"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
@@ -2883,8 +2907,9 @@ msgid ""
 msgstr ""
 
 #: actions/licenseadminpanel.php:156
-msgid "Invalid license title. Max length is 255 characters."
-msgstr ""
+#, fuzzy
+msgid "Invalid license title. Maximum length is 255 characters."
+msgstr "Ugyldig velkomsttekst. Maks lengde er 255 tegn."
 
 #: actions/licenseadminpanel.php:168
 msgid "Invalid license URL."
@@ -3056,20 +3081,10 @@ msgstr "Du må være logget inn for å registrere et program."
 msgid "Use this form to register a new application."
 msgstr "Bruk dette skjemaet for å registrere et nytt program."
 
-#: actions/newapplication.php:169
-#, fuzzy
-msgid "Name is too long (maximum 255 chars)."
-msgstr "Navn er for langt (maks 250 tegn)."
-
 #: actions/newapplication.php:184
 msgid "Source URL is required."
 msgstr "Nettadresse til kilde kreves."
 
-#: actions/newapplication.php:199
-#, fuzzy
-msgid "Organization is too long (maximum 255 chars)."
-msgstr "Organisasjon er for lang (maks 255 tegn)."
-
 #: actions/newapplication.php:266 actions/newapplication.php:275
 msgid "Could not create application."
 msgstr "Kunne ikke opprette program."
@@ -3089,14 +3104,14 @@ msgid "New message"
 msgstr "Ny melding"
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:499
+#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501
 msgid "You can't send a message to this user."
 msgstr "Du kan ikke sende en melding til denne brukeren."
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
 #: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
-#: lib/command.php:579
+#: lib/command.php:581
 msgid "No content!"
 msgstr "Inget innhold."
 
@@ -3105,7 +3120,7 @@ msgid "No recipient specified."
 msgstr "Ingen mottaker oppgitt."
 
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:503
+#: actions/newmessage.php:167 lib/command.php:505
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -3117,12 +3132,12 @@ msgstr "Melding sendt"
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:511
+#: actions/newmessage.php:188 lib/command.php:513
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Direktemelding til %s sendt."
 
-#: actions/newmessage.php:213 actions/newnotice.php:263
+#: actions/newmessage.php:213 actions/newnotice.php:264
 msgid "Ajax Error"
 msgstr "Ajax-feil"
 
@@ -3130,17 +3145,7 @@ msgstr "Ajax-feil"
 msgid "New notice"
 msgstr "Ny notis"
 
-#: actions/newnotice.php:159 lib/mailhandler.php:60
-#, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr "Det er for langt. Maks notisstørrelse er %d tegn."
-
-#: actions/newnotice.php:183
-#, php-format
-msgid "Max notice size is %d chars, including attachment URL."
-msgstr "Maks notisstørrelse er %d tegn, inklusive vedleggs-URL."
-
-#: actions/newnotice.php:229
+#: actions/newnotice.php:230
 msgid "Notice posted"
 msgstr "Notis postet"
 
@@ -3310,36 +3315,46 @@ msgstr "Personsøk"
 msgid "Notice Search"
 msgstr "Notissøk"
 
-#: actions/othersettings.php:60
+#: actions/othersettings.php:59
 msgid "Other settings"
 msgstr "Andre innstillinger"
 
+#. TRANS: Instructions for tab "Other" in user profile settings.
 #: actions/othersettings.php:71
 msgid "Manage various other options."
 msgstr "Håndter diverse andre alternativ."
 
-#: actions/othersettings.php:108
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/othersettings.php:111
 msgid " (free service)"
-msgstr "  (gratis tjeneste)"
+msgstr " (gratis tjeneste)"
 
-#: actions/othersettings.php:116
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/othersettings.php:120
 msgid "Shorten URLs with"
 msgstr "Forkort nettadresser med"
 
-#: actions/othersettings.php:117
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/othersettings.php:122
 msgid "Automatic shortening service to use."
 msgstr "Automatisk fortkortelsestjeneste å bruke."
 
-#: actions/othersettings.php:122
+#. TRANS: Label for checkbox.
+#: actions/othersettings.php:128
 msgid "View profile designs"
 msgstr "Vis profilutseender"
 
-#: actions/othersettings.php:123
+#. TRANS: Tooltip for checkbox.
+#: actions/othersettings.php:130
 msgid "Show or hide profile designs."
 msgstr "Vis eller skjul profilutseender."
 
-#: actions/othersettings.php:153
-msgid "URL shortening service is too long (max 50 chars)."
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/othersettings.php:162
+#, fuzzy
+msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "Navnet på nettadresseforkortelsestjenesten er for lang (maks 50 tegn)."
 
 #: actions/otp.php:69
@@ -3828,7 +3843,7 @@ msgstr "Om meg"
 #. TRANS: Label for group location (dt). Text hidden by default.
 #: actions/profilesettings.php:149 actions/register.php:485
 #: actions/showgroup.php:267 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:177
+#: actions/userauthorization.php:166 lib/groupeditform.php:180
 #: lib/userprofile.php:165
 msgid "Location"
 msgstr "Plassering"
@@ -4168,7 +4183,8 @@ msgid "Unexpected password reset."
 msgstr "Uventet tilbakestilling av passord."
 
 #: actions/recoverpassword.php:365
-msgid "Password must be 6 chars or more."
+#, fuzzy
+msgid "Password must be 6 characters or more."
 msgstr "Passordet må bestå av 6 eller flere tegn."
 
 #: actions/recoverpassword.php:369
@@ -4541,7 +4557,7 @@ msgstr "Organisasjon"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:172
+#: lib/applicationeditform.php:208 lib/groupeditform.php:175
 msgid "Description"
 msgstr "Beskrivelse"
 
@@ -4694,7 +4710,7 @@ msgid "Note"
 msgstr "Merk"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:298 lib/groupeditform.php:184
+#: actions/showgroup.php:298 lib/groupeditform.php:187
 msgid "Aliases"
 msgstr "Alias"
 
@@ -4827,47 +4843,67 @@ msgstr "Melding fra %1$s på %2$s"
 msgid "Notice deleted."
 msgstr "Notis slettet."
 
-#: actions/showstream.php:72
-#, php-format
-msgid " tagged %s"
-msgstr " merket %s"
+#. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
+#: actions/showstream.php:70
+#, fuzzy, php-format
+msgid "%1$s tagged %2$s"
+msgstr "%1$s, side %2$d"
+
+#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#: actions/showstream.php:74
+#, fuzzy, php-format
+msgid "%1$s tagged %2$s, page %3$d"
+msgstr "Brukere som har merket seg selv med %1$s - side %2$d"
 
-#: actions/showstream.php:78
+#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$d is the page number.
+#: actions/showstream.php:82
 #, php-format
 msgid "%1$s, page %2$d"
 msgstr "%1$s, side %2$d"
 
-#: actions/showstream.php:120
+#. TRANS: Title for link to notice feed.
+#. TRANS: %1$s is a user nickname, %2$s is a hashtag.
+#: actions/showstream.php:127
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Notismating for %1$s merket %2$s (RSS 1.0)"
 
-#: actions/showstream.php:127
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:136
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "Notismating for %s (RSS 1.0)"
 
-#: actions/showstream.php:134
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:145
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "Notismating for %s (RSS 2.0)"
 
-#: actions/showstream.php:141
+#: actions/showstream.php:152
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "Notismating for %s (Atom)"
 
-#: actions/showstream.php:146
+#. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
+#. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
+#: actions/showstream.php:159
 #, php-format
 msgid "FOAF for %s"
 msgstr "FOAF for %s"
 
-#: actions/showstream.php:197
-#, php-format
-msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
+#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
+#: actions/showstream.php:211
+#, fuzzy, php-format
+msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr "Dette er tidslinjen for %1$s men %2$s har ikke postet noe ennå."
 
-#: actions/showstream.php:202
+#. TRANS: Second sentence of empty list message for a stream for the user themselves.
+#: actions/showstream.php:217
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -4875,7 +4911,9 @@ msgstr ""
 "Sett noe interessant nylig? Du har ikke postet noen notiser ennå, så hvorfor "
 "ikke begynne nå? :)"
 
-#: actions/showstream.php:204
+#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:221
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -4884,7 +4922,9 @@ msgstr ""
 "Vær den første til å [poste om dette emnet](%%%%action.newnotice%%%%?"
 "status_textarea=%s)!"
 
-#: actions/showstream.php:243
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:264
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4897,7 +4937,9 @@ msgstr ""
 "[StatusNet](http://status.net/). [Bli med nå](%%%%action.register%%%%) for å "
 "følge **%s** og mange flere sine notiser. ([Les mer](%%%%doc.help%%%%))"
 
-#: actions/showstream.php:248
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:271
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4908,7 +4950,8 @@ msgstr ""
 "no.wikipedia.org/wiki/Mikroblogg) basert på det frie programvareverktøyet "
 "[StatusNet](http://status.net/). "
 
-#: actions/showstream.php:305
+#. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
+#: actions/showstream.php:328
 #, php-format
 msgid "Repeat of %s"
 msgstr "Repetisjon av %s"
@@ -5019,32 +5062,40 @@ msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 "Hvor lenge en bruker må vente (i sekund) for å poste den samme tingen igjen."
 
-#: actions/sitenoticeadminpanel.php:56
+#. TRANS: Page title for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:55
 msgid "Site Notice"
 msgstr "Nettstedsnotis"
 
-#: actions/sitenoticeadminpanel.php:67
+#. TRANS: Instructions for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:66
 #, fuzzy
 msgid "Edit site-wide message"
 msgstr "Ny melding"
 
-#: actions/sitenoticeadminpanel.php:103
+#. TRANS: Server error displayed when saving a site-wide notice was impossible.
+#: actions/sitenoticeadminpanel.php:101
 msgid "Unable to save site notice."
 msgstr "Kunne ikke lagre nettstedsnotis."
 
-#: actions/sitenoticeadminpanel.php:113
-msgid "Max length for the site-wide notice is 255 chars."
-msgstr ""
+#. TRANS: Client error displayed when a site-wide notice was longer than allowed.
+#: actions/sitenoticeadminpanel.php:112
+#, fuzzy
+msgid "Maximum length for the site-wide notice is 255 characters."
+msgstr "Maks lengde på en profilbiografi i tegn."
 
+#. TRANS: Label for site-wide notice text field in admin panel.
 #: actions/sitenoticeadminpanel.php:176
 msgid "Site notice text"
 msgstr "Tekst for nettstedsnotis"
 
-#: actions/sitenoticeadminpanel.php:178
-msgid "Site-wide notice text (255 chars max; HTML okay)"
+#. TRANS: Tooltip for site-wide notice text field in admin panel.
+#: actions/sitenoticeadminpanel.php:179
+msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:198
+#. TRANS: Title for button to save site notice in admin panel.
+#: actions/sitenoticeadminpanel.php:201
 msgid "Save site notice"
 msgstr "Lagre nettstedsnotis"
 
@@ -5510,75 +5561,93 @@ msgid ""
 msgstr "Notislisensen ‘%1$s’ er ikke kompatibel med nettstedslisensen ‘%2$s’."
 
 #. TRANS: User admin panel title
-#: actions/useradminpanel.php:60
+#: actions/useradminpanel.php:58
 msgctxt "TITLE"
 msgid "User"
 msgstr "Bruker"
 
-#: actions/useradminpanel.php:71
+#. TRANS: Instruction for user admin panel.
+#: actions/useradminpanel.php:69
 msgid "User settings for this StatusNet site"
 msgstr ""
 
-#: actions/useradminpanel.php:150
+#. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
+#: actions/useradminpanel.php:147
 msgid "Invalid bio limit. Must be numeric."
 msgstr "Ugyldig biografigrense. Må være numerisk."
 
-#: actions/useradminpanel.php:156
-msgid "Invalid welcome text. Max length is 255 characters."
+#. TRANS: Form validation error in user admin panel when welcome text is too long.
+#: actions/useradminpanel.php:154
+#, fuzzy
+msgid "Invalid welcome text. Maximum length is 255 characters."
 msgstr "Ugyldig velkomsttekst. Maks lengde er 255 tegn."
 
+#. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
+#. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
-#, php-format
-msgid "Invalid default subscripton: '%1$s' is not user."
+#, fuzzy, php-format
+msgid "Invalid default subscripton: '%1$s' is not a user."
 msgstr "Ugyldig standardabonnement: '%1$s' er ikke bruker."
 
 #. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:106
+#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
 #: lib/personalgroupnav.php:109
 msgid "Profile"
 msgstr "Profil"
 
-#: actions/useradminpanel.php:223
+#. TRANS: Field label in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:220
 msgid "Bio Limit"
 msgstr "Biografigrense"
 
-#: actions/useradminpanel.php:224
+#. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:222
 msgid "Maximum length of a profile bio in characters."
 msgstr "Maks lengde på en profilbiografi i tegn."
 
-#: actions/useradminpanel.php:232
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:231
 msgid "New users"
 msgstr "Nye brukere"
 
+#. TRANS: Field label in user admin panel for setting new user welcome text.
 #: actions/useradminpanel.php:236
 msgid "New user welcome"
 msgstr "Velkomst av ny bruker"
 
-#: actions/useradminpanel.php:237
-msgid "Welcome text for new users (Max 255 chars)."
+#. TRANS: Tooltip in user admin panel for setting new user welcome text.
+#: actions/useradminpanel.php:238
+#, fuzzy
+msgid "Welcome text for new users (maximum 255 characters)."
 msgstr "Velkomsttekst for nye brukere (Maks 255 tegn)."
 
-#: actions/useradminpanel.php:242
+#. TRANS: Field label in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:244
 msgid "Default subscription"
 msgstr "Standardabonnement"
 
-#: actions/useradminpanel.php:243
+#. TRANS: Tooltip in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:246
 msgid "Automatically subscribe new users to this user."
 msgstr "Legger automatisk til et abonnement på denne brukeren til nye brukere."
 
-#: actions/useradminpanel.php:252
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:256
 msgid "Invitations"
 msgstr "Invitasjoner"
 
-#: actions/useradminpanel.php:257
+#. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:262
 msgid "Invitations enabled"
 msgstr "Invitasjoner aktivert"
 
-#: actions/useradminpanel.php:259
+#. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:265
 msgid "Whether to allow users to invite new users."
 msgstr "Hvorvidt brukere tillates å invitere nye brukere."
 
-#: actions/useradminpanel.php:295
+#. TRANS: Title for button to save user settings in user admin panel.
+#: actions/useradminpanel.php:302
 msgid "Save user settings"
 msgstr ""
 
@@ -5773,7 +5842,7 @@ msgid "Plugins"
 msgstr "Programtillegg"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:831
+#: actions/version.php:198 lib/action.php:880
 msgid "Version"
 msgstr "Versjon"
 
@@ -5979,16 +6048,23 @@ msgstr "Kunne ikke lagre lokal gruppeinformasjon."
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
+#. TRANS: Full name of a profile or group followed by nickname in parens
+#: classes/Profile.php:164
+#, fuzzy, php-format
+msgctxt "FANCYNAME"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:791
+#: classes/Profile.php:812
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:800
+#: classes/Profile.php:821
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6137,197 +6213,204 @@ msgstr "%1$s - %2$s"
 msgid "Untitled page"
 msgstr "Side uten tittel"
 
+#. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
+#: lib/action.php:310
+msgctxt "TOOLTIP"
+msgid "Show more"
+msgstr ""
+
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:477
+#: lib/action.php:526
 #, fuzzy
 msgid "Primary site navigation"
 msgstr "Endre nettstedskonfigurasjon"
 
 #. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:483
+#: lib/action.php:532
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr ""
 
 #. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:486
+#: lib/action.php:535
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Personlig"
 
 #. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:488
+#: lib/action.php:537
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
 msgstr "Endre e-posten, avateren, passordet og profilen din"
 
 #. TRANS: Main menu option when logged in for access to user settings
-#: lib/action.php:491
+#: lib/action.php:540
 msgid "Account"
 msgstr "Konto"
 
 #. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:493
+#: lib/action.php:542
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "Koble til tjenester"
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:496
+#: lib/action.php:545
 msgid "Connect"
 msgstr "Koble til"
 
 #. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:499
+#: lib/action.php:548
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "Endre nettstedskonfigurasjon"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:502 lib/groupnav.php:117
+#: lib/action.php:551 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Administrator"
 
 #. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:506
+#: lib/action.php:555
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Inviter venner og kollegaer til å bli med deg på %s"
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:509
+#: lib/action.php:558
 msgctxt "MENU"
 msgid "Invite"
 msgstr "Inviter"
 
 #. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:515
+#: lib/action.php:564
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "Logg ut fra nettstedet"
 
 #. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:518
+#: lib/action.php:567
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Logg ut"
 
 #. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:523
+#: lib/action.php:572
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "Opprett en konto"
 
 #. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:526
+#: lib/action.php:575
 msgctxt "MENU"
 msgid "Register"
 msgstr "Registrer"
 
 #. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:529
+#: lib/action.php:578
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "Log inn på nettstedet"
 
 #. TRANS: Main menu option when not logged in to log in
-#: lib/action.php:532
+#: lib/action.php:581
 msgctxt "MENU"
 msgid "Login"
 msgstr "Logg inn"
 
 #. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:535
+#: lib/action.php:584
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Hjelp meg."
 
 #. TRANS: Main menu option for help on the StatusNet site
-#: lib/action.php:538
+#: lib/action.php:587
 msgctxt "MENU"
 msgid "Help"
 msgstr "Hjelp"
 
 #. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:541
+#: lib/action.php:590
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr "Søk etter personer eller tekst"
 
 #. TRANS: Main menu option when logged in or when the StatusNet instance is not private
-#: lib/action.php:544
+#: lib/action.php:593
 msgctxt "MENU"
 msgid "Search"
 msgstr "Søk"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:566 lib/adminpanelaction.php:387
+#: lib/action.php:615 lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "Nettstedsnotis"
 
 #. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:633
+#: lib/action.php:682
 msgid "Local views"
 msgstr "Lokale visninger"
 
 #. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:703
+#: lib/action.php:752
 msgid "Page notice"
 msgstr "Sidenotis"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:804
+#: lib/action.php:853
 msgid "Secondary site navigation"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:810
+#: lib/action.php:859
 msgid "Help"
 msgstr "Hjelp"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:813
+#: lib/action.php:862
 msgid "About"
 msgstr "Om"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:816
+#: lib/action.php:865
 msgid "FAQ"
 msgstr "OSS/FAQ"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:821
+#: lib/action.php:870
 msgid "TOS"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:825
+#: lib/action.php:874
 #, fuzzy
 msgid "Privacy"
 msgstr "Privat"
 
-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:828
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+#: lib/action.php:877
 msgid "Source"
 msgstr "Kilde"
 
-#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:834
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+#: lib/action.php:884
 msgid "Contact"
 msgstr "Kontakt"
 
-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:837
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+#: lib/action.php:887
 #, fuzzy
 msgid "Badge"
 msgstr "Knuff"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:866
+#: lib/action.php:916
 msgid "StatusNet software license"
 msgstr "Programvarelisens for StatusNet"
 
@@ -6335,7 +6418,7 @@ msgstr "Programvarelisens for StatusNet"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:873
+#: lib/action.php:923
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -6345,7 +6428,7 @@ msgstr ""
 "broughtby%%](%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:876
+#: lib/action.php:926
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** er en mikrobloggingtjeneste."
@@ -6354,7 +6437,7 @@ msgstr "**%%site.name%%** er en mikrobloggingtjeneste."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:883
+#: lib/action.php:933
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -6363,52 +6446,52 @@ msgid ""
 msgstr ""
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:899
+#: lib/action.php:949
 #, fuzzy
 msgid "Site content license"
 msgstr "Programvarelisens for StatusNet"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:906
+#: lib/action.php:956
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:913
+#: lib/action.php:963
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:917
+#: lib/action.php:967
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:949
+#: lib/action.php:999
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1285
+#: lib/action.php:1335
 #, fuzzy
 msgid "Pagination"
 msgstr "Registrering"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1296
+#: lib/action.php:1346
 msgid "After"
 msgstr "Etter"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1306
+#: lib/action.php:1356
 msgid "Before"
 msgstr "Før"
 
@@ -6761,7 +6844,7 @@ msgid "AJAX error"
 msgstr "Ajax-feil"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:233 lib/mailhandler.php:142
+#: lib/channel.php:233 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "Kommando fullført"
 
@@ -6777,7 +6860,7 @@ msgstr ""
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:626
+#: lib/command.php:99 lib/command.php:630
 #, fuzzy
 msgid "User has no last notice."
 msgstr "Brukeren har ingen profil."
@@ -6847,6 +6930,14 @@ msgstr ""
 msgid "%1$s left group %2$s."
 msgstr ""
 
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: lib/command.php:426
+#, fuzzy, php-format
+msgctxt "WHOIS"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
 #. TRANS: Whois output. %s is the full name of the queried user.
 #: lib/command.php:430
 #, php-format
@@ -6884,130 +6975,134 @@ msgid ""
 "same server."
 msgstr ""
 
-#. TRANS: Message given if content is too long.
+#. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
 #: lib/command.php:488
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr "Melding for lang - maks er %1$d tegn, du sendte %2$d."
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] "Melding for lang - maks er %1$d tegn, du sendte %2$d."
+msgstr[1] "Melding for lang - maks er %1$d tegn, du sendte %2$d."
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:514
+#: lib/command.php:516
 msgid "Error sending direct message."
 msgstr "Feil ved sending av direktemelding."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:551
+#: lib/command.php:553
 #, fuzzy, php-format
 msgid "Notice from %s repeated."
 msgstr "Nytt nick"
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:554
+#: lib/command.php:556
 msgid "Error repeating notice."
 msgstr "Feil ved repetering av notis."
 
-#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:589
-#, php-format
-msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
+#: lib/command.php:591
+#, fuzzy, php-format
+msgid "Notice too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] "Melding for lang - maks er %1$d tegn, du sendte %2$d."
+msgstr[1] "Melding for lang - maks er %1$d tegn, du sendte %2$d."
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:600
+#: lib/command.php:604
 #, fuzzy, php-format
 msgid "Reply to %s sent."
 msgstr "Svar til %s"
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:603
+#: lib/command.php:607
 msgid "Error saving notice."
 msgstr "Feil ved lagring av notis."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:650
+#: lib/command.php:654
 msgid "Specify the name of the user to subscribe to."
 msgstr ""
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:659
+#: lib/command.php:663
 msgid "Can't subscribe to OMB profiles by command."
 msgstr ""
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:667
+#: lib/command.php:671
 #, php-format
 msgid "Subscribed to %s."
 msgstr ""
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:688 lib/command.php:799
+#: lib/command.php:692 lib/command.php:803
 msgid "Specify the name of the user to unsubscribe from."
 msgstr ""
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:699
+#: lib/command.php:703
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:719 lib/command.php:745
+#: lib/command.php:723 lib/command.php:749
 #, fuzzy
 msgid "Command not yet implemented."
 msgstr "Beklager, denne kommandoen er ikke implementert ennå."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:723
+#: lib/command.php:727
 #, fuzzy
 msgid "Notification off."
 msgstr "Ingen bekreftelseskode."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:726
+#: lib/command.php:730
 msgid "Can't turn off notification."
 msgstr ""
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:749
+#: lib/command.php:753
 #, fuzzy
 msgid "Notification on."
 msgstr "Ingen bekreftelseskode."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:752
+#: lib/command.php:756
 #, fuzzy
 msgid "Can't turn on notification."
 msgstr "Kan ikke gjenta din egen notis."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:766
+#: lib/command.php:770
 msgid "Login command is disabled."
 msgstr ""
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:779
+#: lib/command.php:783
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:808
+#: lib/command.php:812
 #, php-format
 msgid "Unsubscribed %s."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:826
+#: lib/command.php:830
 #, fuzzy
 msgid "You are not subscribed to anyone."
 msgstr "Ikke autorisert."
@@ -7015,7 +7110,7 @@ msgstr "Ikke autorisert."
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:831
+#: lib/command.php:835
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Ikke autorisert."
@@ -7023,7 +7118,7 @@ msgstr[1] "Ikke autorisert."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:853
+#: lib/command.php:857
 #, fuzzy
 msgid "No one is subscribed to you."
 msgstr "Svar til %s"
@@ -7031,7 +7126,7 @@ msgstr "Svar til %s"
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:858
+#: lib/command.php:862
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Svar til %s"
@@ -7039,21 +7134,21 @@ msgstr[1] "Svar til %s"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:880
+#: lib/command.php:884
 msgid "You are not a member of any groups."
 msgstr "Du er ikke et medlem av den gruppen."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:885
+#: lib/command.php:889
 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!"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:900
+#: lib/command.php:904
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -7252,7 +7347,8 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 små bokstaver eller tall, ingen punktum eller mellomrom"
 
 #: lib/groupeditform.php:163
-msgid "URL of the homepage or blog of the group or topic"
+#, fuzzy
+msgid "URL of the homepage or blog of the group or topic."
 msgstr "Nettadresse til hjemmesiden for dette programmet"
 
 #: lib/groupeditform.php:168
@@ -7260,20 +7356,28 @@ msgid "Describe the group or topic"
 msgstr "Beskriv programmet ditt"
 
 #: lib/groupeditform.php:170
-#, php-format
-msgid "Describe the group or topic in %d characters"
-msgstr "Beskriv programmet ditt med %d tegn"
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d character or less"
+msgid_plural "Describe the group or topic in %d characters or less"
+msgstr[0] "Beskriv programmet ditt med %d tegn"
+msgstr[1] "Beskriv programmet ditt med %d tegn"
 
-#: lib/groupeditform.php:179
+#: lib/groupeditform.php:182
 #, fuzzy
 msgid ""
-"Location for the group, if any, like \"City, State (or Region), Country\""
+"Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr "Hvor du er, for eksempel «By, fylke (eller region), land»"
 
-#: lib/groupeditform.php:187
+#: lib/groupeditform.php:190
 #, php-format
-msgid "Extra nicknames for the group, comma- or space- separated, max %d"
-msgstr ""
+msgid ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"alias allowed."
+msgid_plural ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"aliases allowed."
+msgstr[0] ""
+msgstr[1] ""
 
 #. TRANS: Menu item in the group navigation page.
 #: lib/groupnav.php:86
@@ -7827,7 +7931,7 @@ msgstr "Det er ikke din e-postadresse."
 msgid "Sorry, no incoming email allowed."
 msgstr "Ingen innkommende e-postadresse."
 
-#: lib/mailhandler.php:228
+#: lib/mailhandler.php:229
 #, php-format
 msgid "Unsupported message type: %s"
 msgstr "Meldingstypen støttes ikke: %s"
@@ -8177,16 +8281,17 @@ msgid "Sandbox this user"
 msgstr "Opphev blokkering av denne brukeren"
 
 #. TRANS: Fieldset legend for the search form.
-#: lib/searchaction.php:121
+#: lib/searchaction.php:120
 msgid "Search site"
 msgstr "Søk nettsted"
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
-#: lib/searchaction.php:129
+#: lib/searchaction.php:128
 msgid "Keyword(s)"
 msgstr "Nøkkelord"
 
+#. TRANS: Button text for searching site.
 #: lib/searchaction.php:130
 msgctxt "BUTTON"
 msgid "Search"
@@ -8278,8 +8383,8 @@ msgid "The theme file is missing or the upload failed."
 msgstr ""
 
 #: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:278 lib/themeuploader.php:282
-#: lib/themeuploader.php:290 lib/themeuploader.php:297
+#: lib/themeuploader.php:279 lib/themeuploader.php:283
+#: lib/themeuploader.php:291 lib/themeuploader.php:298
 #, fuzzy
 msgid "Failed saving theme."
 msgstr "Oppdatering av avatar mislyktes."
@@ -8290,29 +8395,32 @@ msgstr ""
 
 #: lib/themeuploader.php:166
 #, php-format
-msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
-msgstr ""
+msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
+msgid_plural ""
+"Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr[0] ""
+msgstr[1] ""
 
-#: lib/themeuploader.php:178
+#: lib/themeuploader.php:179
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr ""
 
-#: lib/themeuploader.php:218
+#: lib/themeuploader.php:219
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
 msgstr ""
 
-#: lib/themeuploader.php:224
+#: lib/themeuploader.php:225
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr ""
 
-#: lib/themeuploader.php:241
+#: lib/themeuploader.php:242
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr ""
 
-#: lib/themeuploader.php:259
+#: lib/themeuploader.php:260
 #, fuzzy
 msgid "Error opening theme archive."
 msgstr "Feil ved oppdatering av fjernprofil."
@@ -8498,23 +8606,39 @@ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
 msgstr[0] "Melding for lang - maks er %1$d tegn, du sendte %2$d."
 msgstr[1] "Melding for lang - maks er %1$d tegn, du sendte %2$d."
 
-#: scripts/restoreuser.php:82
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: scripts/restoreuser.php:61
 #, php-format
-msgid "Backup file for user %s (%s)"
+msgid "Getting backup from file '%s'."
 msgstr ""
 
-#: scripts/restoreuser.php:88
+#. TRANS: Commandline script output.
+#: scripts/restoreuser.php:91
 #, fuzzy
 msgid "No user specified; using backup user."
 msgstr "Ingen bruker-ID spesifisert."
 
-#: scripts/restoreuser.php:94
+#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
+#: scripts/restoreuser.php:98
 #, php-format
-msgid "%d entries in backup."
-msgstr ""
+msgid "%d entry in backup."
+msgid_plural "%d entries in backup."
+msgstr[0] ""
+msgstr[1] ""
+
+#, fuzzy
+#~ msgid "Name is too long (maximum 255 chars)."
+#~ msgstr "Navn er for langt (maks 250 tegn)."
+
+#, fuzzy
+#~ msgid "Organization is too long (maximum 255 chars)."
+#~ msgstr "Organisasjon er for lang (maks 255 tegn)."
+
+#~ msgid "That's too long. Max notice size is %d chars."
+#~ msgstr "Det er for langt. Maks notisstørrelse er %d tegn."
 
-#~ msgid "Description is too long (max %d chars)."
-#~ msgstr "Beskrivelsen er for lang (maks %d tegn)."
+#~ msgid "Max notice size is %d chars, including attachment URL."
+#~ msgstr "Maks notisstørrelse er %d tegn, inklusive vedleggs-URL."
 
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "For mange alias! Maksimum %d."
+#~ msgid " tagged %s"
+#~ msgstr " merket %s"
diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po
index 8a0cc0cad..bfee02698 100644
--- a/locale/nl/LC_MESSAGES/statusnet.po
+++ b/locale/nl/LC_MESSAGES/statusnet.po
@@ -12,17 +12,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-30 23:18+0000\n"
-"PO-Revision-Date: 2010-10-30 23:20:36+0000\n"
+"POT-Creation-Date: 2010-11-02 22:51+0000\n"
+"PO-Revision-Date: 2010-11-02 22:53:32+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r75708); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r75875); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2010-10-30 09:48:40+0000\n"
+"X-POT-Import-Date: 2010-10-30 23:42:01+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -79,15 +79,20 @@ msgstr "Toegangsinstellingen opslaan"
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
+#. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
+#. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #: actions/accessadminpanel.php:193 actions/emailsettings.php:228
-#: actions/imsettings.php:187 actions/pathsadminpanel.php:512
-#: actions/profilesettings.php:201 actions/smssettings.php:209
-#: actions/subscriptions.php:246 lib/applicationeditform.php:355
+#: actions/imsettings.php:187 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: lib/applicationeditform.php:355 lib/groupeditform.php:207
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Opslaan"
@@ -138,7 +143,7 @@ msgstr "Deze pagina bestaat niet."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:495 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Onbekende gebruiker."
@@ -212,7 +217,9 @@ msgstr ""
 
 #. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:208
+#. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -573,8 +580,11 @@ msgstr "De volledige naam is te lang (maximaal 255 tekens)."
 #. TRANS: Group edit form validation error.
 #. TRANS: Form validation error in New application form.
 #. TRANS: %d is the maximum number of characters for the description.
+#. TRANS: Group create form validation error.
+#. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:220 actions/editapplication.php:201
 #: actions/editgroup.php:216 actions/newapplication.php:178
+#: actions/newgroup.php:152
 #, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -730,14 +740,14 @@ msgstr "Het verzoektoken is al geautoriseerd."
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:172 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:74
 #: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
 #: actions/groupunblock.php:65 actions/imsettings.php:230
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
-#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/othersettings.php:153 actions/passwordsettings.php:138
 #: actions/profilesettings.php:221 actions/recoverpassword.php:350
 #: actions/register.php:172 actions/remotesubscribe.php:77
 #: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
@@ -919,20 +929,21 @@ msgstr "U kunt de status van een andere gebruiker niet verwijderen."
 
 #. TRANS: Client error displayed trying to repeat a non-existing notice through the API.
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
+#. TRANS: Error message displayed trying to delete a non-existing notice.
 #: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/deletenotice.php:58 actions/shownotice.php:92
+#: actions/deletenotice.php:61 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "De mededeling bestaat niet."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:535
+#: actions/apistatusesretweet.php:83 lib/command.php:537
 msgid "Cannot repeat your own notice."
 msgstr "U kunt uw eigen mededeling niet herhalen."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:541
+#: actions/apistatusesretweet.php:92 lib/command.php:543
 msgid "Already repeated that notice."
 msgstr "U hebt die mededeling al herhaald."
 
@@ -953,7 +964,8 @@ msgstr "De client moet een parameter \"status\" met een waarde opgeven."
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#: actions/apistatusesupdate.php:244
+#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
+#: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
@@ -967,7 +979,7 @@ msgstr "De bovenliggende mededeling is niet aangetroffen."
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
-#: actions/apistatusesupdate.php:308
+#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
 #, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
@@ -1148,21 +1160,18 @@ msgstr "Voorvertoning"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
 #: actions/avatarsettings.php:155
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "Verwijderen"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
 #: actions/avatarsettings.php:173
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Uploaden"
 
 #. TRANS: Button on avatar upload crop form to confirm a selected crop as avatar.
 #: actions/avatarsettings.php:243
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Crop"
 msgstr "Uitsnijden"
@@ -1183,17 +1192,18 @@ msgstr ""
 msgid "Lost our file data."
 msgstr "Ons bestand is verloren gegaan."
 
-#: actions/avatarsettings.php:384
+#. TRANS: Success message for having updated a user avatar.
+#: actions/avatarsettings.php:385
 msgid "Avatar updated."
 msgstr "De avatar is bijgewerkt."
 
 #. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
-#: actions/avatarsettings.php:388
+#: actions/avatarsettings.php:389
 msgid "Failed updating avatar."
 msgstr "Het bijwerken van de avatar is mislukt."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:412
+#: actions/avatarsettings.php:413
 msgid "Avatar deleted."
 msgstr "De avatar is verwijderd."
 
@@ -1225,8 +1235,8 @@ msgstr ""
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:154 actions/deleteapplication.php:154
-#: actions/deletegroup.php:220 actions/deletenotice.php:150
+#: actions/block.php:154 actions/deleteapplication.php:157
+#: actions/deletegroup.php:220 actions/deletenotice.php:155
 #: actions/deleteuser.php:152 actions/groupblock.php:178
 msgctxt "BUTTON"
 msgid "No"
@@ -1244,8 +1254,8 @@ msgstr "Gebruiker niet blokkeren"
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:161 actions/deleteapplication.php:161
-#: actions/deletegroup.php:227 actions/deletenotice.php:157
+#: actions/block.php:161 actions/deleteapplication.php:164
+#: actions/deletegroup.php:227 actions/deletenotice.php:162
 #: actions/deleteuser.php:159 actions/groupblock.php:185
 msgctxt "BUTTON"
 msgid "Yes"
@@ -1313,7 +1323,6 @@ msgstr "Deze gebruiker weer toegang geven tot de groep"
 
 #. TRANS: Button text for unblocking a user from a group.
 #: actions/blockedfromgroup.php:323
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Unblock"
 msgstr "Deblokkeren"
@@ -1362,12 +1371,13 @@ msgstr "Dit adres is al bevestigd."
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
 #. TRANS: Server error thrown on database error updating IM preferences.
 #. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
 #. TRANS: Server error thrown when user profile settings could not be updated.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #: actions/confirmaddress.php:118 actions/emailsettings.php:331
 #: actions/emailsettings.php:477 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:174
+#: actions/imsettings.php:442 actions/othersettings.php:184
 #: actions/profilesettings.php:326 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
@@ -1376,9 +1386,8 @@ msgstr "De gebruiker kon gebruiker niet bijwerkt worden."
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
 #: actions/confirmaddress.php:132
-#, fuzzy
 msgid "Could not delete address confirmation."
-msgstr "De IM-bevestiging kon niet verwijderd worden."
+msgstr "De adresbevestiging kon niet verwijderd worden."
 
 #. TRANS: Title for the contact address confirmation action.
 #: actions/confirmaddress.php:150
@@ -1403,16 +1412,19 @@ msgstr "Dialoog"
 msgid "Notices"
 msgstr "Mededelingen"
 
-#: actions/deleteapplication.php:63
+#. TRANS: Client error displayed trying to delete an application while not logged in.
+#: actions/deleteapplication.php:62
 msgid "You must be logged in to delete an application."
 msgstr "U moet aangemeld zijn om een applicatie te kunnen verwijderen."
 
+#. TRANS: Client error displayed trying to delete an application that does not exist.
 #: actions/deleteapplication.php:71
 msgid "Application not found."
 msgstr "De applicatie is niet gevonden."
 
+#. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
-#: actions/deleteapplication.php:78 actions/editapplication.php:78
+#: actions/deleteapplication.php:79 actions/editapplication.php:78
 #: actions/showapplication.php:94
 msgid "You are not the owner of this application."
 msgstr "U bent niet de eigenaar van deze applicatie."
@@ -1420,15 +1432,18 @@ msgstr "U bent niet de eigenaar van deze applicatie."
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
 #: actions/newapplication.php:114 actions/showapplication.php:118
-#: lib/action.php:1354
+#: lib/action.php:1404
 msgid "There was a problem with your session token."
 msgstr "Er is een probleem met uw sessietoken."
 
-#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+#. TRANS: Title for delete application page.
+#. TRANS: Fieldset legend on delete application page.
+#: actions/deleteapplication.php:124 actions/deleteapplication.php:149
 msgid "Delete application"
 msgstr "Applicatie verwijderen"
 
-#: actions/deleteapplication.php:149
+#. TRANS: Confirmation text on delete application page.
+#: actions/deleteapplication.php:152
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
 "about the application from the database, including all existing user "
@@ -1439,12 +1454,12 @@ msgstr ""
 "inclusief alle bestaande gebruikersverbindingen."
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:158
+#: actions/deleteapplication.php:161
 msgid "Do not delete this application"
 msgstr "Deze applicatie niet verwijderen"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:164
+#: actions/deleteapplication.php:167
 msgid "Delete this application"
 msgstr "Deze applicatie verwijderen"
 
@@ -1478,12 +1493,13 @@ msgstr "Het was niet mogelijk de groep %s te verwijderen."
 msgid "Deleted group %s"
 msgstr "De groep %s is verwijderd."
 
-#. TRANS: Title.
+#. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
 #: actions/deletegroup.php:176 actions/deletegroup.php:202
 msgid "Delete group"
 msgstr "Groep verwijderen"
 
+#. TRANS: Warning in form for deleleting a group.
 #: actions/deletegroup.php:206
 msgid ""
 "Are you sure you want to delete this group? This will clear all data about "
@@ -1505,10 +1521,11 @@ msgstr "Verwijder deze groep niet"
 msgid "Delete this group"
 msgstr "Groep verwijderen"
 
+#. TRANS: Error message displayed trying to delete a notice while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1518,11 +1535,13 @@ msgstr "Groep verwijderen"
 msgid "Not logged in."
 msgstr "Niet aangemeld."
 
-#: actions/deletenotice.php:74
+#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
+#: actions/deletenotice.php:78
 msgid "Can't delete this notice."
 msgstr "Deze mededeling kan niet verwijderd worden."
 
-#: actions/deletenotice.php:106
+#. TRANS: Instructions for deleting a notice.
+#: actions/deletenotice.php:110
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
@@ -1530,21 +1549,24 @@ msgstr ""
 "U staat op het punt een mededeling permanent te verwijderen. Als dit "
 "uitgevoerd is, kan het niet ongedaan gemaakt worden."
 
-#: actions/deletenotice.php:112 actions/deletenotice.php:144
+#. TRANS: Page title when deleting a notice.
+#. TRANS: Fieldset legend for the delete notice form.
+#: actions/deletenotice.php:117 actions/deletenotice.php:148
 msgid "Delete notice"
 msgstr "Mededeling verwijderen"
 
-#: actions/deletenotice.php:147
+#. TRANS: Message for the delete notice form.
+#: actions/deletenotice.php:152
 msgid "Are you sure you want to delete this notice?"
 msgstr "Weet u zeker dat u deze aankondiging wilt verwijderen?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:154
+#: actions/deletenotice.php:159
 msgid "Do not delete this notice"
 msgstr "Deze mededeling niet verwijderen"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:161 lib/noticelist.php:667
+#: actions/deletenotice.php:166 lib/noticelist.php:667
 msgid "Delete this notice"
 msgstr "Deze mededeling verwijderen"
 
@@ -1707,11 +1729,9 @@ msgstr "Standaardinstellingen toepassen"
 
 #. TRANS: Submit button title.
 #: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
-#: actions/othersettings.php:126 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: actions/useradminpanel.php:295 lib/applicationeditform.php:357
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: lib/applicationeditform.php:357 lib/designsettings.php:256
 msgid "Save"
 msgstr "Opslaan"
 
@@ -1759,8 +1779,9 @@ msgid "Name is required."
 msgstr "Een naam is verplicht."
 
 #. TRANS: Validation error shown when providing too long a name in the "Edit application" form.
-#: actions/editapplication.php:188
-msgid "Name is too long (max 255 characters)."
+#: actions/editapplication.php:188 actions/newapplication.php:169
+#, fuzzy
+msgid "Name is too long (maximum 255 characters)."
 msgstr "De naam is te lang (maximaal 255 tekens)."
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
@@ -1789,7 +1810,7 @@ msgid "Organization is required."
 msgstr "Organisatie is verplicht."
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#: actions/editapplication.php:223
+#: actions/editapplication.php:223 actions/newapplication.php:199
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "De organisatienaam is te lang (maximaal 255 tekens)."
 
@@ -2597,7 +2618,7 @@ msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Een MicroID voor mijn Jabber/GTalk-adres publiceren."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:180
+#: actions/imsettings.php:290 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "Uw voorkeuren zijn opgeslagen."
 
@@ -2720,10 +2741,9 @@ msgstr[1] "U bent al geabonneerd op deze gebruikers:"
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#. TRANS: Whois output.
-#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:145 actions/invite.php:159 lib/command.php:426
-#, php-format
+#: actions/invite.php:145 actions/invite.php:159
+#, fuzzy, php-format
+msgctxt "INVITE"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
@@ -2908,7 +2928,8 @@ msgstr ""
 "voorbehouden\" gebruikt."
 
 #: actions/licenseadminpanel.php:156
-msgid "Invalid license title. Max length is 255 characters."
+#, fuzzy
+msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "Ongeldige licentienaam. De maximale lengte is 255 tekens."
 
 #: actions/licenseadminpanel.php:168
@@ -3082,18 +3103,10 @@ msgstr "U moet aangemeld zijn om een applicatie te kunnen registreren."
 msgid "Use this form to register a new application."
 msgstr "Gebruik dit formulier om een nieuwe applicatie te registreren."
 
-#: actions/newapplication.php:169
-msgid "Name is too long (maximum 255 chars)."
-msgstr "De naam is te lang (maximaal 255 tekens)."
-
 #: actions/newapplication.php:184
 msgid "Source URL is required."
 msgstr "Een bron-URL is verplicht."
 
-#: actions/newapplication.php:199
-msgid "Organization is too long (maximum 255 chars)."
-msgstr "De organisatienaam is te lang (maximaal 255 tekens)."
-
 #: actions/newapplication.php:266 actions/newapplication.php:275
 msgid "Could not create application."
 msgstr "Het was niet mogelijk de applicatie aan te maken."
@@ -3113,14 +3126,14 @@ msgid "New message"
 msgstr "Nieuw bericht"
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:499
+#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501
 msgid "You can't send a message to this user."
 msgstr "U kunt geen bericht naar deze gebruiker zenden."
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
 #: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
-#: lib/command.php:579
+#: lib/command.php:581
 msgid "No content!"
 msgstr "Geen inhoud!"
 
@@ -3129,7 +3142,7 @@ msgid "No recipient specified."
 msgstr "Er is geen ontvanger aangegeven."
 
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:503
+#: actions/newmessage.php:167 lib/command.php:505
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "Stuur geen berichten naar uzelf. Zeg het gewoon in uw hoofd."
@@ -3140,12 +3153,12 @@ msgstr "Bericht verzonden."
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:511
+#: actions/newmessage.php:188 lib/command.php:513
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Het directe bericht aan %s is verzonden."
 
-#: actions/newmessage.php:213 actions/newnotice.php:263
+#: actions/newmessage.php:213 actions/newnotice.php:264
 msgid "Ajax Error"
 msgstr "Er is een Ajax-fout opgetreden"
 
@@ -3153,19 +3166,7 @@ msgstr "Er is een Ajax-fout opgetreden"
 msgid "New notice"
 msgstr "Nieuw bericht"
 
-#: actions/newnotice.php:159 lib/mailhandler.php:60
-#, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr "De mededeling is te lang. Gebruik maximaal %d tekens."
-
-#: actions/newnotice.php:183
-#, php-format
-msgid "Max notice size is %d chars, including attachment URL."
-msgstr ""
-"De maximale mededelingenlengte is %d tekens, inclusief de URL voor de "
-"bijlage."
-
-#: actions/newnotice.php:229
+#: actions/newnotice.php:230
 msgid "Notice posted"
 msgstr "De mededeling is verzonden"
 
@@ -3343,36 +3344,46 @@ msgstr "Mensen zoeken"
 msgid "Notice Search"
 msgstr "Mededeling zoeken"
 
-#: actions/othersettings.php:60
+#: actions/othersettings.php:59
 msgid "Other settings"
 msgstr "Overige instellingen"
 
+#. TRANS: Instructions for tab "Other" in user profile settings.
 #: actions/othersettings.php:71
 msgid "Manage various other options."
 msgstr "Overige instellingen beheren."
 
-#: actions/othersettings.php:108
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/othersettings.php:111
 msgid " (free service)"
 msgstr " (gratis dienst)"
 
-#: actions/othersettings.php:116
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/othersettings.php:120
 msgid "Shorten URLs with"
 msgstr "URL's inkorten met"
 
-#: actions/othersettings.php:117
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/othersettings.php:122
 msgid "Automatic shortening service to use."
 msgstr "Te gebruiken automatische verkortingsdienst."
 
-#: actions/othersettings.php:122
+#. TRANS: Label for checkbox.
+#: actions/othersettings.php:128
 msgid "View profile designs"
 msgstr "Profielontwerpen gebruiken"
 
-#: actions/othersettings.php:123
+#. TRANS: Tooltip for checkbox.
+#: actions/othersettings.php:130
 msgid "Show or hide profile designs."
 msgstr "Profielontwerpen weergeven of verbergen"
 
-#: actions/othersettings.php:153
-msgid "URL shortening service is too long (max 50 chars)."
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/othersettings.php:162
+#, fuzzy
+msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "De URL voor de verkortingdienst is te lang (maximaal 50 tekens)."
 
 #: actions/otp.php:69
@@ -3843,7 +3854,7 @@ msgstr "Beschrijving"
 #. TRANS: Label for group location (dt). Text hidden by default.
 #: actions/profilesettings.php:149 actions/register.php:485
 #: actions/showgroup.php:267 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:177
+#: actions/userauthorization.php:166 lib/groupeditform.php:180
 #: lib/userprofile.php:165
 msgid "Location"
 msgstr "Locatie"
@@ -4191,7 +4202,8 @@ msgid "Unexpected password reset."
 msgstr "Het wachtwoord is onverwacht opnieuw ingesteld."
 
 #: actions/recoverpassword.php:365
-msgid "Password must be 6 chars or more."
+#, fuzzy
+msgid "Password must be 6 characters or more."
 msgstr "Het wachtwoord moet uit zes of meer tekens bestaan."
 
 #: actions/recoverpassword.php:369
@@ -4567,7 +4579,7 @@ msgstr "Organisatie"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:172
+#: lib/applicationeditform.php:208 lib/groupeditform.php:175
 msgid "Description"
 msgstr "Beschrijving"
 
@@ -4721,7 +4733,7 @@ msgid "Note"
 msgstr "Opmerking"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:298 lib/groupeditform.php:184
+#: actions/showgroup.php:298 lib/groupeditform.php:187
 msgid "Aliases"
 msgstr "Aliassen"
 
@@ -4773,14 +4785,12 @@ msgstr "Alle leden"
 
 #. TRANS: Label for creation date in statistics on group page.
 #: actions/showgroup.php:458
-#, fuzzy
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Aangemaakt"
 
 #. TRANS: Label for member count in statistics on group page.
 #: actions/showgroup.php:466
-#, fuzzy
 msgctxt "LABEL"
 msgid "Members"
 msgstr "Leden"
@@ -4854,48 +4864,68 @@ msgstr "Bericht van %1$s op %2$s"
 msgid "Notice deleted."
 msgstr "Deze mededeling is verwijderd."
 
-#: actions/showstream.php:72
-#, php-format
-msgid " tagged %s"
-msgstr " met het label %s"
+#. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
+#: actions/showstream.php:70
+#, fuzzy, php-format
+msgid "%1$s tagged %2$s"
+msgstr "%1$s, pagina %2$d"
 
-#: actions/showstream.php:78
+#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#: actions/showstream.php:74
+#, fuzzy, php-format
+msgid "%1$s tagged %2$s, page %3$d"
+msgstr "Mededelingen met het label %1$s, pagina %2$d"
+
+#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$d is the page number.
+#: actions/showstream.php:82
 #, php-format
 msgid "%1$s, page %2$d"
 msgstr "%1$s, pagina %2$d"
 
-#: actions/showstream.php:120
+#. TRANS: Title for link to notice feed.
+#. TRANS: %1$s is a user nickname, %2$s is a hashtag.
+#: actions/showstream.php:127
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Mededelingenfeed voor %1$s met het label %2$s (RSS 1.0)"
 
-#: actions/showstream.php:127
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:136
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "Mededelingenfeed voor %s (RSS 1.0)"
 
-#: actions/showstream.php:134
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:145
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "Mededelingenfeed voor %s (RSS 2.0)"
 
-#: actions/showstream.php:141
+#: actions/showstream.php:152
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "Mededelingenfeed voor %s (Atom)"
 
-#: actions/showstream.php:146
+#. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
+#. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
+#: actions/showstream.php:159
 #, php-format
 msgid "FOAF for %s"
 msgstr "Vriend van een vriend (FOAF) voor %s"
 
-#: actions/showstream.php:197
-#, php-format
-msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
+#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
+#: actions/showstream.php:211
+#, fuzzy, php-format
+msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr ""
 "Dit is de tijdlijn voor %1$s, maar %2$s heeft nog geen berichten verzonden."
 
-#: actions/showstream.php:202
+#. TRANS: Second sentence of empty list message for a stream for the user themselves.
+#: actions/showstream.php:217
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -4903,7 +4933,9 @@ msgstr ""
 "Hebt u recentelijk iets interessants gezien? U hebt nog geen mededelingen "
 "verstuurd, dus dit is een ideaal moment om daarmee te beginnen!"
 
-#: actions/showstream.php:204
+#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:221
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -4912,7 +4944,9 @@ msgstr ""
 "U kunt proberen %1$s te porren of [een bericht aan die gebruiker sturen](%%%%"
 "action.newnotice%%%%?status_textarea=%2$s)."
 
-#: actions/showstream.php:243
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:264
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4926,7 +4960,9 @@ msgstr ""
 "abonneren op de mededelingen van **%s** en nog veel meer! [Meer lezen...](%%%"
 "%doc.help%%%%)"
 
-#: actions/showstream.php:248
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:271
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4937,7 +4973,8 @@ msgstr ""
 "(http://en.wikipedia.org/wiki/Micro-blogging) gebaseerd op de Vrije Software "
 "[StatusNet](http://status.net/). "
 
-#: actions/showstream.php:305
+#. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
+#: actions/showstream.php:328
 #, php-format
 msgid "Repeat of %s"
 msgstr "Herhaald van %s"
@@ -5056,33 +5093,42 @@ msgstr ""
 "Hoe lang gebruikers moeten wachten (in seconden) voor ze hetzelfde kunnen "
 "zenden."
 
-#: actions/sitenoticeadminpanel.php:56
+#. TRANS: Page title for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:55
 msgid "Site Notice"
 msgstr "Websitebrede mededeling"
 
-#: actions/sitenoticeadminpanel.php:67
+#. TRANS: Instructions for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:66
 msgid "Edit site-wide message"
 msgstr "Websitebrede mededeling bewerken"
 
-#: actions/sitenoticeadminpanel.php:103
+#. TRANS: Server error displayed when saving a site-wide notice was impossible.
+#: actions/sitenoticeadminpanel.php:101
 msgid "Unable to save site notice."
 msgstr "Het was niet mogelijk om de websitebrede mededeling op te slaan."
 
-#: actions/sitenoticeadminpanel.php:113
-msgid "Max length for the site-wide notice is 255 chars."
+#. TRANS: Client error displayed when a site-wide notice was longer than allowed.
+#: actions/sitenoticeadminpanel.php:112
+#, fuzzy
+msgid "Maximum length for the site-wide notice is 255 characters."
 msgstr "De maximale lengte voor de websitebrede aankondiging is 255 tekens."
 
+#. TRANS: Label for site-wide notice text field in admin panel.
 #: actions/sitenoticeadminpanel.php:176
 msgid "Site notice text"
 msgstr "Tekst voor websitebrede mededeling"
 
-#: actions/sitenoticeadminpanel.php:178
-msgid "Site-wide notice text (255 chars max; HTML okay)"
+#. TRANS: Tooltip for site-wide notice text field in admin panel.
+#: actions/sitenoticeadminpanel.php:179
+#, fuzzy
+msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr ""
 "Tekst voor websitebrede aankondiging (maximaal 255 tekens - HTML is "
 "toegestaan)"
 
-#: actions/sitenoticeadminpanel.php:198
+#. TRANS: Title for button to save site notice in admin panel.
+#: actions/sitenoticeadminpanel.php:201
 msgid "Save site notice"
 msgstr "Websitebrede mededeling opslaan"
 
@@ -5551,75 +5597,93 @@ msgstr ""
 "de sitelicentie \"%2$s\"."
 
 #. TRANS: User admin panel title
-#: actions/useradminpanel.php:60
+#: actions/useradminpanel.php:58
 msgctxt "TITLE"
 msgid "User"
 msgstr "Gebruiker"
 
-#: actions/useradminpanel.php:71
+#. TRANS: Instruction for user admin panel.
+#: actions/useradminpanel.php:69
 msgid "User settings for this StatusNet site"
 msgstr "Gebruikersinstellingen voor deze StatusNet-website"
 
-#: actions/useradminpanel.php:150
+#. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
+#: actions/useradminpanel.php:147
 msgid "Invalid bio limit. Must be numeric."
 msgstr "Ongeldige beschrijvingslimiet. Het moet een getal zijn."
 
-#: actions/useradminpanel.php:156
-msgid "Invalid welcome text. Max length is 255 characters."
+#. TRANS: Form validation error in user admin panel when welcome text is too long.
+#: actions/useradminpanel.php:154
+#, fuzzy
+msgid "Invalid welcome text. Maximum length is 255 characters."
 msgstr "Ongeldige welkomsttekst. De maximale lengte is 255 tekens."
 
+#. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
+#. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
-#, php-format
-msgid "Invalid default subscripton: '%1$s' is not user."
+#, fuzzy, php-format
+msgid "Invalid default subscripton: '%1$s' is not a user."
 msgstr "Ongeldig standaardabonnement: \"%1$s\" is geen gebruiker."
 
 #. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:106
+#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
 #: lib/personalgroupnav.php:109
 msgid "Profile"
 msgstr "Profiel"
 
-#: actions/useradminpanel.php:223
+#. TRANS: Field label in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:220
 msgid "Bio Limit"
 msgstr "Profiellimiet"
 
-#: actions/useradminpanel.php:224
+#. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:222
 msgid "Maximum length of a profile bio in characters."
 msgstr "De maximale lengte van de profieltekst in tekens."
 
-#: actions/useradminpanel.php:232
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:231
 msgid "New users"
 msgstr "Nieuwe gebruikers"
 
+#. TRANS: Field label in user admin panel for setting new user welcome text.
 #: actions/useradminpanel.php:236
 msgid "New user welcome"
 msgstr "Welkom voor nieuwe gebruikers"
 
-#: actions/useradminpanel.php:237
-msgid "Welcome text for new users (Max 255 chars)."
+#. TRANS: Tooltip in user admin panel for setting new user welcome text.
+#: actions/useradminpanel.php:238
+#, fuzzy
+msgid "Welcome text for new users (maximum 255 characters)."
 msgstr "Welkomsttekst voor nieuwe gebruikers. Maximaal 255 tekens."
 
-#: actions/useradminpanel.php:242
+#. TRANS: Field label in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:244
 msgid "Default subscription"
 msgstr "Standaardabonnement"
 
-#: actions/useradminpanel.php:243
+#. TRANS: Tooltip in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:246
 msgid "Automatically subscribe new users to this user."
 msgstr "Nieuwe gebruikers automatisch op deze gebruiker abonneren"
 
-#: actions/useradminpanel.php:252
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:256
 msgid "Invitations"
 msgstr "Uitnodigingen"
 
-#: actions/useradminpanel.php:257
+#. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:262
 msgid "Invitations enabled"
 msgstr "Uitnodigingen ingeschakeld"
 
-#: actions/useradminpanel.php:259
+#. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:265
 msgid "Whether to allow users to invite new users."
 msgstr "Of gebruikers nieuwe gebruikers kunnen uitnodigen."
 
-#: actions/useradminpanel.php:295
+#. TRANS: Title for button to save user settings in user admin panel.
+#: actions/useradminpanel.php:302
 msgid "Save user settings"
 msgstr "Gebruikersinstellingen opslaan"
 
@@ -5832,7 +5896,7 @@ msgid "Plugins"
 msgstr "Plug-ins"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:831
+#: actions/version.php:198 lib/action.php:880
 msgid "Version"
 msgstr "Versie"
 
@@ -6050,9 +6114,16 @@ msgstr "Het was niet mogelijk antwoord %1$d voor %2$d op te slaan."
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
+#. TRANS: Full name of a profile or group followed by nickname in parens
+#: classes/Profile.php:164
+#, fuzzy, php-format
+msgctxt "FANCYNAME"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:791
+#: classes/Profile.php:812
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
@@ -6061,7 +6132,7 @@ msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:800
+#: classes/Profile.php:821
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6210,194 +6281,201 @@ msgstr "%1$s - %2$s"
 msgid "Untitled page"
 msgstr "Naamloze pagina"
 
+#. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
+#: lib/action.php:310
+msgctxt "TOOLTIP"
+msgid "Show more"
+msgstr ""
+
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:477
+#: lib/action.php:526
 msgid "Primary site navigation"
 msgstr "Primaire sitenavigatie"
 
 #. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:483
+#: lib/action.php:532
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "Persoonlijk profiel en tijdlijn van vrienden"
 
 #. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:486
+#: lib/action.php:535
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Persoonlijk"
 
 #. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:488
+#: lib/action.php:537
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
 msgstr "Uw e-mailadres, avatar, wachtwoord of profiel wijzigen"
 
 #. TRANS: Main menu option when logged in for access to user settings
-#: lib/action.php:491
+#: lib/action.php:540
 msgid "Account"
 msgstr "Gebruiker"
 
 #. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:493
+#: lib/action.php:542
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "Met andere diensten koppelen"
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:496
+#: lib/action.php:545
 msgid "Connect"
 msgstr "Koppelen"
 
 #. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:499
+#: lib/action.php:548
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "Websiteinstellingen wijzigen"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:502 lib/groupnav.php:117
+#: lib/action.php:551 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Beheer"
 
 #. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:506
+#: lib/action.php:555
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Vrienden en collega's uitnodigen om u te vergezellen op %s"
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:509
+#: lib/action.php:558
 msgctxt "MENU"
 msgid "Invite"
 msgstr "Uitnodigingen"
 
 #. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:515
+#: lib/action.php:564
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "Gebruiker afmelden"
 
 #. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:518
+#: lib/action.php:567
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Afmelden"
 
 #. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:523
+#: lib/action.php:572
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "Gebruiker aanmaken"
 
 #. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:526
+#: lib/action.php:575
 msgctxt "MENU"
 msgid "Register"
 msgstr "Registreren"
 
 #. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:529
+#: lib/action.php:578
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "Gebruiker aanmelden"
 
 #. TRANS: Main menu option when not logged in to log in
-#: lib/action.php:532
+#: lib/action.php:581
 msgctxt "MENU"
 msgid "Login"
 msgstr "Aanmelden"
 
 #. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:535
+#: lib/action.php:584
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Help me!"
 
 #. TRANS: Main menu option for help on the StatusNet site
-#: lib/action.php:538
+#: lib/action.php:587
 msgctxt "MENU"
 msgid "Help"
 msgstr "Help"
 
 #. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:541
+#: lib/action.php:590
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr "Naar gebruikers of tekst zoeken"
 
 #. TRANS: Main menu option when logged in or when the StatusNet instance is not private
-#: lib/action.php:544
+#: lib/action.php:593
 msgctxt "MENU"
 msgid "Search"
 msgstr "Zoeken"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:566 lib/adminpanelaction.php:387
+#: lib/action.php:615 lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "Mededeling van de website"
 
 #. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:633
+#: lib/action.php:682
 msgid "Local views"
 msgstr "Lokale weergaven"
 
 #. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:703
+#: lib/action.php:752
 msgid "Page notice"
 msgstr "Mededeling van de pagina"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:804
+#: lib/action.php:853
 msgid "Secondary site navigation"
 msgstr "Secundaire sitenavigatie"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:810
+#: lib/action.php:859
 msgid "Help"
 msgstr "Help"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:813
+#: lib/action.php:862
 msgid "About"
 msgstr "Over"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:816
+#: lib/action.php:865
 msgid "FAQ"
 msgstr "Veel gestelde vragen"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:821
+#: lib/action.php:870
 msgid "TOS"
 msgstr "Gebruiksvoorwaarden"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:825
+#: lib/action.php:874
 msgid "Privacy"
 msgstr "Privacy"
 
-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:828
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+#: lib/action.php:877
 msgid "Source"
 msgstr "Broncode"
 
-#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:834
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+#: lib/action.php:884
 msgid "Contact"
 msgstr "Contact"
 
-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:837
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+#: lib/action.php:887
 msgid "Badge"
 msgstr "Widget"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:866
+#: lib/action.php:916
 msgid "StatusNet software license"
 msgstr "Licentie van de StatusNet-software"
 
@@ -6405,7 +6483,7 @@ msgstr "Licentie van de StatusNet-software"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:873
+#: lib/action.php:923
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -6415,7 +6493,7 @@ msgstr ""
 "broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:876
+#: lib/action.php:926
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** is een microblogdienst."
@@ -6424,7 +6502,7 @@ msgstr "**%%site.name%%** is een microblogdienst."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:883
+#: lib/action.php:933
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -6436,20 +6514,20 @@ msgstr ""
 "www.fsf.org/licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:899
+#: lib/action.php:949
 msgid "Site content license"
 msgstr "Licentie voor siteinhoud"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:906
+#: lib/action.php:956
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "Inhoud en gegevens van %1$s zijn persoonlijk en vertrouwelijk."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:913
+#: lib/action.php:963
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
@@ -6457,7 +6535,7 @@ msgstr ""
 "voorbehouden."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:917
+#: lib/action.php:967
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "Auteursrechten op inhoud en gegevens rusten bij de respectievelijke "
@@ -6465,26 +6543,26 @@ msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:949
+#: lib/action.php:999
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 "Alle inhoud en gegevens van %1$s zijn beschikbaar onder de licentie %2$s."
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1285
+#: lib/action.php:1335
 msgid "Pagination"
 msgstr "Paginering"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1296
+#: lib/action.php:1346
 msgid "After"
 msgstr "Later"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1306
+#: lib/action.php:1356
 msgid "Before"
 msgstr "Eerder"
 
@@ -6828,7 +6906,7 @@ msgid "AJAX error"
 msgstr "Er is een Ajax-fout opgetreden"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:233 lib/mailhandler.php:142
+#: lib/channel.php:233 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "Het commando is uitgevoerd"
 
@@ -6844,7 +6922,7 @@ msgstr "Er bestaat geen mededeling met dat ID."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:626
+#: lib/command.php:99 lib/command.php:630
 msgid "User has no last notice."
 msgstr "Deze gebruiker heeft geen laatste mededeling."
 
@@ -6913,6 +6991,14 @@ msgstr "%1$s is lid geworden van de groep %2$s."
 msgid "%1$s left group %2$s."
 msgstr "%1$s heeft de groep %2$s verlaten."
 
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: lib/command.php:426
+#, fuzzy, php-format
+msgctxt "WHOIS"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
 #. TRANS: Whois output. %s is the full name of the queried user.
 #: lib/command.php:430
 #, php-format
@@ -6952,118 +7038,126 @@ msgstr ""
 "%s is een profiel op afstand. U kunt alle privéberichten verzenden aan "
 "gebruikers op dezelfde server."
 
-#. TRANS: Message given if content is too long.
+#. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
 #: lib/command.php:488
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] ""
+"Het bericht te is lang. De maximale lengte is %1$d tekens. De lengte van uw "
+"bericht was %2$d."
+msgstr[1] ""
 "Het bericht te is lang. De maximale lengte is %1$d tekens. De lengte van uw "
 "bericht was %2$d."
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:514
+#: lib/command.php:516
 msgid "Error sending direct message."
 msgstr "Er is een fout opgetreden bij het verzonden van het directe bericht."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:551
+#: lib/command.php:553
 #, php-format
 msgid "Notice from %s repeated."
 msgstr "De mededeling van %s is herhaald."
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:554
+#: lib/command.php:556
 msgid "Error repeating notice."
 msgstr "Er is een fout opgetreden bij het herhalen van de mededeling."
 
-#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:589
-#, php-format
-msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
+#: lib/command.php:591
+#, fuzzy, php-format
+msgid "Notice too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] ""
+"De mededeling is te lang. De maximale lengte is %1$d tekens. Uw mededeling "
+"bevatte %2$d tekens."
+msgstr[1] ""
 "De mededeling is te lang. De maximale lengte is %1$d tekens. Uw mededeling "
 "bevatte %2$d tekens."
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:600
+#: lib/command.php:604
 #, php-format
 msgid "Reply to %s sent."
 msgstr "Het antwoord aan %s is verzonden."
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:603
+#: lib/command.php:607
 msgid "Error saving notice."
 msgstr "Er is een fout opgetreden bij het opslaan van de mededeling."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:650
+#: lib/command.php:654
 msgid "Specify the name of the user to subscribe to."
 msgstr "Geef de naam op van de gebruiker waarop u zich wilt abonneren."
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:659
+#: lib/command.php:663
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Abonneren op OMB-profielen op commando is niet mogelijk."
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:667
+#: lib/command.php:671
 #, php-format
 msgid "Subscribed to %s."
 msgstr "Geabonneerd op %s."
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:688 lib/command.php:799
+#: lib/command.php:692 lib/command.php:803
 msgid "Specify the name of the user to unsubscribe from."
 msgstr ""
 "Geef de naam op van de gebruiker waarop u het abonnement wilt opzeggen."
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:699
+#: lib/command.php:703
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr "Uw abonnement op %s is opgezegd."
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:719 lib/command.php:745
+#: lib/command.php:723 lib/command.php:749
 msgid "Command not yet implemented."
 msgstr "Dit commando is nog niet geïmplementeerd."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:723
+#: lib/command.php:727
 msgid "Notification off."
 msgstr "Notificaties uitgeschakeld."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:726
+#: lib/command.php:730
 msgid "Can't turn off notification."
 msgstr "Het is niet mogelijk de mededelingen uit te schakelen."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:749
+#: lib/command.php:753
 msgid "Notification on."
 msgstr "Notificaties ingeschakeld."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:752
+#: lib/command.php:756
 msgid "Can't turn on notification."
 msgstr "Het is niet mogelijk de notificatie uit te schakelen."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:766
+#: lib/command.php:770
 msgid "Login command is disabled."
 msgstr "Het aanmeldcommando is uitgeschakeld."
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:779
+#: lib/command.php:783
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
@@ -7072,20 +7166,20 @@ msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:808
+#: lib/command.php:812
 #, php-format
 msgid "Unsubscribed %s."
 msgstr "Het abonnement van %s is opgeheven."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:826
+#: lib/command.php:830
 msgid "You are not subscribed to anyone."
 msgstr "U bent op geen enkele gebruiker geabonneerd."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:831
+#: lib/command.php:835
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "U bent geabonneerd op deze gebruiker:"
@@ -7093,14 +7187,14 @@ msgstr[1] "U bent geabonneerd op deze gebruikers:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:853
+#: lib/command.php:857
 msgid "No one is subscribed to you."
 msgstr "Niemand heeft een abonnenment op u."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:858
+#: lib/command.php:862
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Deze gebruiker is op u geabonneerd:"
@@ -7108,21 +7202,21 @@ msgstr[1] "Deze gebruikers zijn op u geabonneerd:"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:880
+#: lib/command.php:884
 msgid "You are not a member of any groups."
 msgstr "U bent lid van geen enkele groep."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:885
+#: lib/command.php:889
 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:"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:900
+#: lib/command.php:904
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -7351,7 +7445,8 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 kleine letters of cijfers, geen leestekens of spaties"
 
 #: lib/groupeditform.php:163
-msgid "URL of the homepage or blog of the group or topic"
+#, fuzzy
+msgid "URL of the homepage or blog of the group or topic."
 msgstr "De URL van de thuispagina of de blog van de groep of het onderwerp"
 
 #: lib/groupeditform.php:168
@@ -7359,20 +7454,30 @@ msgid "Describe the group or topic"
 msgstr "Beschrijf de groep of het onderwerp"
 
 #: lib/groupeditform.php:170
-#, php-format
-msgid "Describe the group or topic in %d characters"
-msgstr "Beschrijf de groep of het onderwerp in %d tekens"
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d character or less"
+msgid_plural "Describe the group or topic in %d characters or less"
+msgstr[0] "Beschrijf de groep of het onderwerp in %d tekens"
+msgstr[1] "Beschrijf de groep of het onderwerp in %d tekens"
 
-#: lib/groupeditform.php:179
+#: lib/groupeditform.php:182
+#, fuzzy
 msgid ""
-"Location for the group, if any, like \"City, State (or Region), Country\""
+"Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr ""
 "Locatie voor de groep - als relevant. Iets als \"Plaats, regio, land\"."
 
-#: lib/groupeditform.php:187
-#, php-format
-msgid "Extra nicknames for the group, comma- or space- separated, max %d"
-msgstr ""
+#: lib/groupeditform.php:190
+#, fuzzy, php-format
+msgid ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"alias allowed."
+msgid_plural ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"aliases allowed."
+msgstr[0] ""
+"Extra namen voor de groep, gescheiden door komma's of spaties. Maximaal %d."
+msgstr[1] ""
 "Extra namen voor de groep, gescheiden door komma's of spaties. Maximaal %d."
 
 #. TRANS: Menu item in the group navigation page.
@@ -7503,27 +7608,27 @@ msgstr "Onbekend bestandstype"
 
 #. TRANS: Number of megabytes. %d is the number.
 #: lib/imagefile.php:248
-#, fuzzy, php-format
+#, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
-msgstr[0] "MB"
-msgstr[1] "MB"
+msgstr[0] "%d MB"
+msgstr[1] "%d MB"
 
 #. TRANS: Number of kilobytes. %d is the number.
 #: lib/imagefile.php:252
-#, fuzzy, php-format
+#, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
-msgstr[0] "kB"
-msgstr[1] "kB"
+msgstr[0] "%d kB"
+msgstr[1] "%d kB"
 
 #. TRANS: Number of bytes. %d is the number.
 #: lib/imagefile.php:255
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d byte"
+msgstr[1] "%d bytes"
 
 #: lib/jabber.php:387
 #, php-format
@@ -7930,7 +8035,7 @@ msgstr "Dit is niet uw inkomende e-mailadres."
 msgid "Sorry, no incoming email allowed."
 msgstr "Inkomende e-mail is niet toegestaan."
 
-#: lib/mailhandler.php:228
+#: lib/mailhandler.php:229
 #, php-format
 msgid "Unsupported message type: %s"
 msgstr "Niet ondersteund berichttype: %s"
@@ -8280,16 +8385,17 @@ msgid "Sandbox this user"
 msgstr "Deze gebruiker in de zandbak plaatsen"
 
 #. TRANS: Fieldset legend for the search form.
-#: lib/searchaction.php:121
+#: lib/searchaction.php:120
 msgid "Search site"
 msgstr "Site doorzoeken"
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
-#: lib/searchaction.php:129
+#: lib/searchaction.php:128
 msgid "Keyword(s)"
 msgstr "Term(en)"
 
+#. TRANS: Button text for searching site.
 #: lib/searchaction.php:130
 msgctxt "BUTTON"
 msgid "Search"
@@ -8381,8 +8487,8 @@ msgid "The theme file is missing or the upload failed."
 msgstr "Het vormgevingsbestand ontbreekt of is de upload mislukt."
 
 #: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:278 lib/themeuploader.php:282
-#: lib/themeuploader.php:290 lib/themeuploader.php:297
+#: lib/themeuploader.php:279 lib/themeuploader.php:283
+#: lib/themeuploader.php:291 lib/themeuploader.php:298
 msgid "Failed saving theme."
 msgstr "Het opslaan van de vormgeving is mislukt."
 
@@ -8391,18 +8497,23 @@ msgid "Invalid theme: bad directory structure."
 msgstr "Ongeldige vormgeving: de mappenstructuur is onjuist."
 
 #: lib/themeuploader.php:166
-#, php-format
-msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
-msgstr ""
+#, fuzzy, php-format
+msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
+msgid_plural ""
+"Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr[0] ""
+"De toegevoegde vormgeving is te groot. Deze moet uitgepakt kleiner zijn dan %"
+"d bytes."
+msgstr[1] ""
 "De toegevoegde vormgeving is te groot. Deze moet uitgepakt kleiner zijn dan %"
 "d bytes."
 
-#: lib/themeuploader.php:178
+#: lib/themeuploader.php:179
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr ""
 "Ongeldig bestand met vormgeving: het bestand css/display.css is niet aanwezig"
 
-#: lib/themeuploader.php:218
+#: lib/themeuploader.php:219
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
@@ -8410,17 +8521,17 @@ msgstr ""
 "De vormgeving bevat een ongeldige bestandsnaam of mapnaam. Gebruik alleen "
 "maar ASCII-letters, getallen, liggende streepjes en het minteken."
 
-#: lib/themeuploader.php:224
+#: lib/themeuploader.php:225
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr "Het uiterlijk bevat onveilige namen voor bestandsextensies."
 
-#: lib/themeuploader.php:241
+#: lib/themeuploader.php:242
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr ""
 "De vormgeving bevat een bestand van het type \".%s\". Dit is niet toegestaan."
 
-#: lib/themeuploader.php:259
+#: lib/themeuploader.php:260
 msgid "Error opening theme archive."
 msgstr ""
 "Er is een fout opgetreden tijdens het openen van het archiefbestand met de "
@@ -8432,7 +8543,6 @@ msgstr "Meest actieve gebruikers"
 
 #. TRANS: Title for the form to unblock a user.
 #: lib/unblockform.php:67
-#, fuzzy
 msgctxt "TITLE"
 msgid "Unblock"
 msgstr "Deblokkeren"
@@ -8608,22 +8718,41 @@ msgstr[1] ""
 "Het bericht te is lang. De maximale lengte is %1$d tekens. De lengte van uw "
 "bericht was %2$d."
 
-#: scripts/restoreuser.php:82
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: scripts/restoreuser.php:61
 #, php-format
-msgid "Backup file for user %s (%s)"
-msgstr "Back-upbestand voor gebruiker %s (%s)"
+msgid "Getting backup from file '%s'."
+msgstr ""
 
-#: scripts/restoreuser.php:88
+#. TRANS: Commandline script output.
+#: scripts/restoreuser.php:91
 msgid "No user specified; using backup user."
 msgstr "Geen gebruiker opgegeven; de back-upgebruiker wordt gebruikt."
 
-#: scripts/restoreuser.php:94
-#, php-format
-msgid "%d entries in backup."
-msgstr "%d regels in de back-up."
+#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
+#: scripts/restoreuser.php:98
+#, fuzzy, php-format
+msgid "%d entry in backup."
+msgid_plural "%d entries in backup."
+msgstr[0] "%d regels in de back-up."
+msgstr[1] "%d regels in de back-up."
+
+#~ msgid "Name is too long (maximum 255 chars)."
+#~ msgstr "De naam is te lang (maximaal 255 tekens)."
+
+#~ msgid "Organization is too long (maximum 255 chars)."
+#~ msgstr "De organisatienaam is te lang (maximaal 255 tekens)."
+
+#~ msgid "That's too long. Max notice size is %d chars."
+#~ msgstr "De mededeling is te lang. Gebruik maximaal %d tekens."
+
+#~ msgid "Max notice size is %d chars, including attachment URL."
+#~ msgstr ""
+#~ "De maximale mededelingenlengte is %d tekens, inclusief de URL voor de "
+#~ "bijlage."
 
-#~ msgid "Description is too long (max %d chars)."
-#~ msgstr "De beschrijving is te lang (maximaal %d tekens)."
+#~ msgid " tagged %s"
+#~ msgstr " met het label %s"
 
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "Te veel aliassen! Het maximale aantal is %d."
+#~ msgid "Backup file for user %s (%s)"
+#~ msgstr "Back-upbestand voor gebruiker %s (%s)"
diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po
index f77a7a17a..3a3110bbf 100644
--- a/locale/nn/LC_MESSAGES/statusnet.po
+++ b/locale/nn/LC_MESSAGES/statusnet.po
@@ -10,17 +10,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-30 23:18+0000\n"
-"PO-Revision-Date: 2010-10-30 23:20:37+0000\n"
+"POT-Creation-Date: 2010-11-02 22:51+0000\n"
+"PO-Revision-Date: 2010-11-02 22:53:34+0000\n"
 "Language-Team: Norwegian Nynorsk <http://translatewiki.net/wiki/Portal:nn>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r75708); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r75875); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nn\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2010-10-30 09:48:40+0000\n"
+"X-POT-Import-Date: 2010-10-30 23:42:01+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -84,15 +84,20 @@ msgstr "Avatar-innstillingar"
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
+#. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
+#. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #: actions/accessadminpanel.php:193 actions/emailsettings.php:228
-#: actions/imsettings.php:187 actions/pathsadminpanel.php:512
-#: actions/profilesettings.php:201 actions/smssettings.php:209
-#: actions/subscriptions.php:246 lib/applicationeditform.php:355
+#: actions/imsettings.php:187 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: lib/applicationeditform.php:355 lib/groupeditform.php:207
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Save"
@@ -145,7 +150,7 @@ msgstr "Dette emneord finst ikkje."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:495 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Brukaren finst ikkje."
@@ -212,7 +217,9 @@ msgstr ""
 
 #. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:208
+#. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -571,8 +578,11 @@ msgstr "Ditt fulle namn er for langt (maksimalt 255 teikn)."
 #. TRANS: Group edit form validation error.
 #. TRANS: Form validation error in New application form.
 #. TRANS: %d is the maximum number of characters for the description.
+#. TRANS: Group create form validation error.
+#. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:220 actions/editapplication.php:201
 #: actions/editgroup.php:216 actions/newapplication.php:178
+#: actions/newgroup.php:152
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -735,14 +745,14 @@ msgstr "Du tingar ikkje oppdateringar til den profilen."
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:172 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:74
 #: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
 #: actions/groupunblock.php:65 actions/imsettings.php:230
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
-#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/othersettings.php:153 actions/passwordsettings.php:138
 #: actions/profilesettings.php:221 actions/recoverpassword.php:350
 #: actions/register.php:172 actions/remotesubscribe.php:77
 #: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
@@ -917,21 +927,22 @@ msgstr "Du kan ikkje sletta statusen til ein annan brukar."
 
 #. TRANS: Client error displayed trying to repeat a non-existing notice through the API.
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
+#. TRANS: Error message displayed trying to delete a non-existing notice.
 #: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/deletenotice.php:58 actions/shownotice.php:92
+#: actions/deletenotice.php:61 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "Denne notisen finst ikkje."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:535
+#: actions/apistatusesretweet.php:83 lib/command.php:537
 #, fuzzy
 msgid "Cannot repeat your own notice."
 msgstr "Kan ikkje slå på notifikasjon."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:541
+#: actions/apistatusesretweet.php:92 lib/command.php:543
 msgid "Already repeated that notice."
 msgstr "Kan ikkje sletta notisen."
 
@@ -953,7 +964,8 @@ msgstr ""
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#: actions/apistatusesupdate.php:244
+#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
+#: lib/mailhandler.php:60
 #, fuzzy, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
@@ -968,7 +980,7 @@ msgstr "Fann ikkje API-metode."
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
-#: actions/apistatusesupdate.php:308
+#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
 #, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
@@ -1180,17 +1192,18 @@ msgstr "Velg eit utvalg av bildet som vil blir din avatar."
 msgid "Lost our file data."
 msgstr "Fant ikkje igjen fil data."
 
-#: actions/avatarsettings.php:384
+#. TRANS: Success message for having updated a user avatar.
+#: actions/avatarsettings.php:385
 msgid "Avatar updated."
 msgstr "Lasta opp brukarbilete."
 
 #. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
-#: actions/avatarsettings.php:388
+#: actions/avatarsettings.php:389
 msgid "Failed updating avatar."
 msgstr "Feil ved oppdatering av brukarbilete."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:412
+#: actions/avatarsettings.php:413
 #, fuzzy
 msgid "Avatar deleted."
 msgstr "Lasta opp brukarbilete."
@@ -1220,8 +1233,8 @@ msgstr ""
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:154 actions/deleteapplication.php:154
-#: actions/deletegroup.php:220 actions/deletenotice.php:150
+#: actions/block.php:154 actions/deleteapplication.php:157
+#: actions/deletegroup.php:220 actions/deletenotice.php:155
 #: actions/deleteuser.php:152 actions/groupblock.php:178
 msgctxt "BUTTON"
 msgid "No"
@@ -1240,8 +1253,8 @@ msgstr "Lås opp brukaren"
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:161 actions/deleteapplication.php:161
-#: actions/deletegroup.php:227 actions/deletenotice.php:157
+#: actions/block.php:161 actions/deleteapplication.php:164
+#: actions/deletegroup.php:227 actions/deletenotice.php:162
 #: actions/deleteuser.php:159 actions/groupblock.php:185
 #, fuzzy
 msgctxt "BUTTON"
@@ -1361,12 +1374,13 @@ msgstr "Den addressa har alt blitt bekrefta."
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
 #. TRANS: Server error thrown on database error updating IM preferences.
 #. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
 #. TRANS: Server error thrown when user profile settings could not be updated.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #: actions/confirmaddress.php:118 actions/emailsettings.php:331
 #: actions/emailsettings.php:477 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:174
+#: actions/imsettings.php:442 actions/othersettings.php:184
 #: actions/profilesettings.php:326 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
@@ -1403,16 +1417,19 @@ msgstr "Stadfestingskode"
 msgid "Notices"
 msgstr "Notisar"
 
-#: actions/deleteapplication.php:63
+#. TRANS: Client error displayed trying to delete an application while not logged in.
+#: actions/deleteapplication.php:62
 msgid "You must be logged in to delete an application."
 msgstr "Du må være innlogga for å melde deg ut av ei gruppe."
 
+#. TRANS: Client error displayed trying to delete an application that does not exist.
 #: actions/deleteapplication.php:71
 msgid "Application not found."
 msgstr "Fann ikkje stadfestingskode."
 
+#. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
-#: actions/deleteapplication.php:78 actions/editapplication.php:78
+#: actions/deleteapplication.php:79 actions/editapplication.php:78
 #: actions/showapplication.php:94
 #, fuzzy
 msgid "You are not the owner of this application."
@@ -1421,16 +1438,19 @@ msgstr "Du er ikkje medlem av den gruppa."
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
 #: actions/newapplication.php:114 actions/showapplication.php:118
-#: lib/action.php:1354
+#: lib/action.php:1404
 msgid "There was a problem with your session token."
 msgstr "Det var eit problem med sesjons billetten din."
 
-#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+#. TRANS: Title for delete application page.
+#. TRANS: Fieldset legend on delete application page.
+#: actions/deleteapplication.php:124 actions/deleteapplication.php:149
 #, fuzzy
 msgid "Delete application"
 msgstr "Denne notisen finst ikkje."
 
-#: actions/deleteapplication.php:149
+#. TRANS: Confirmation text on delete application page.
+#: actions/deleteapplication.php:152
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
 "about the application from the database, including all existing user "
@@ -1438,13 +1458,13 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:158
+#: actions/deleteapplication.php:161
 #, fuzzy
 msgid "Do not delete this application"
 msgstr "Kan ikkje sletta notisen."
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:164
+#: actions/deleteapplication.php:167
 #, fuzzy
 msgid "Delete this application"
 msgstr "Slett denne notisen"
@@ -1482,13 +1502,14 @@ msgstr "Kann ikkje oppdatera gruppa."
 msgid "Deleted group %s"
 msgstr "%1$s sin status på %2$s"
 
-#. TRANS: Title.
+#. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
 #: actions/deletegroup.php:176 actions/deletegroup.php:202
 #, fuzzy
 msgid "Delete group"
 msgstr "Slett"
 
+#. TRANS: Warning in form for deleleting a group.
 #: actions/deletegroup.php:206
 msgid ""
 "Are you sure you want to delete this group? This will clear all data about "
@@ -1508,10 +1529,11 @@ msgstr "Kan ikkje sletta notisen."
 msgid "Delete this group"
 msgstr "Slett denne notisen"
 
+#. TRANS: Error message displayed trying to delete a notice while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1521,11 +1543,13 @@ msgstr "Slett denne notisen"
 msgid "Not logged in."
 msgstr "Ikkje logga inn"
 
-#: actions/deletenotice.php:74
+#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
+#: actions/deletenotice.php:78
 msgid "Can't delete this notice."
 msgstr "Kan ikkje sletta notisen."
 
-#: actions/deletenotice.php:106
+#. TRANS: Instructions for deleting a notice.
+#: actions/deletenotice.php:110
 #, fuzzy
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
@@ -1534,22 +1558,25 @@ msgstr ""
 "Du er i ferd med å sletta ei melding.  Når den fyrst er sletta, kann du "
 "ikkje finne ho att."
 
-#: actions/deletenotice.php:112 actions/deletenotice.php:144
+#. TRANS: Page title when deleting a notice.
+#. TRANS: Fieldset legend for the delete notice form.
+#: actions/deletenotice.php:117 actions/deletenotice.php:148
 msgid "Delete notice"
 msgstr "Slett notis"
 
-#: actions/deletenotice.php:147
+#. TRANS: Message for the delete notice form.
+#: actions/deletenotice.php:152
 msgid "Are you sure you want to delete this notice?"
 msgstr "Sikker på at du vil sletta notisen?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:154
+#: actions/deletenotice.php:159
 #, fuzzy
 msgid "Do not delete this notice"
 msgstr "Kan ikkje sletta notisen."
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:161 lib/noticelist.php:667
+#: actions/deletenotice.php:166 lib/noticelist.php:667
 msgid "Delete this notice"
 msgstr "Slett denne notisen"
 
@@ -1721,11 +1748,9 @@ msgstr ""
 
 #. TRANS: Submit button title.
 #: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
-#: actions/othersettings.php:126 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: actions/useradminpanel.php:295 lib/applicationeditform.php:357
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: lib/applicationeditform.php:357 lib/designsettings.php:256
 msgid "Save"
 msgstr "Lagra"
 
@@ -1777,9 +1802,9 @@ msgid "Name is required."
 msgstr "Samme som passord over. Påkrevd."
 
 #. TRANS: Validation error shown when providing too long a name in the "Edit application" form.
-#: actions/editapplication.php:188
+#: actions/editapplication.php:188 actions/newapplication.php:169
 #, fuzzy
-msgid "Name is too long (max 255 characters)."
+msgid "Name is too long (maximum 255 characters)."
 msgstr "Ditt fulle namn er for langt (maksimalt 255 teikn)."
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
@@ -1811,7 +1836,7 @@ msgid "Organization is required."
 msgstr ""
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#: actions/editapplication.php:223
+#: actions/editapplication.php:223 actions/newapplication.php:199
 #, fuzzy
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "Plassering er for lang (maksimalt 255 teikn)."
@@ -2613,7 +2638,7 @@ msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Publiser ein MicroID for Jabber/GTalk addressene mine"
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:180
+#: actions/imsettings.php:290 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "Lagra brukarval."
 
@@ -2737,10 +2762,9 @@ msgstr[1] "Du tingar allereie oppdatering frå desse brukarane:"
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#. TRANS: Whois output.
-#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:145 actions/invite.php:159 lib/command.php:426
-#, php-format
+#: actions/invite.php:145 actions/invite.php:159
+#, fuzzy, php-format
+msgctxt "INVITE"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
@@ -2921,8 +2945,9 @@ msgid ""
 msgstr ""
 
 #: actions/licenseadminpanel.php:156
-msgid "Invalid license title. Max length is 255 characters."
-msgstr ""
+#, fuzzy
+msgid "Invalid license title. Maximum length is 255 characters."
+msgstr "Plassering er for lang (maksimalt 255 teikn)."
 
 #: actions/licenseadminpanel.php:168
 msgid "Invalid license URL."
@@ -3101,20 +3126,10 @@ msgstr "Du må være logga inn for å lage ei gruppe."
 msgid "Use this form to register a new application."
 msgstr "Bruk dette skjemaet for å lage ein ny gruppe."
 
-#: actions/newapplication.php:169
-#, fuzzy
-msgid "Name is too long (maximum 255 chars)."
-msgstr "Ditt fulle namn er for langt (maksimalt 255 teikn)."
-
 #: actions/newapplication.php:184
 msgid "Source URL is required."
 msgstr ""
 
-#: actions/newapplication.php:199
-#, fuzzy
-msgid "Organization is too long (maximum 255 chars)."
-msgstr "Plassering er for lang (maksimalt 255 teikn)."
-
 #: actions/newapplication.php:266 actions/newapplication.php:275
 #, fuzzy
 msgid "Could not create application."
@@ -3135,14 +3150,14 @@ msgid "New message"
 msgstr "Ny melding"
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:499
+#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501
 msgid "You can't send a message to this user."
 msgstr "Du kan ikkje sende melding til denne brukaren."
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
 #: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
-#: lib/command.php:579
+#: lib/command.php:581
 msgid "No content!"
 msgstr "Ingen innhald."
 
@@ -3151,7 +3166,7 @@ msgid "No recipient specified."
 msgstr "Ingen mottakar spesifisert."
 
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:503
+#: actions/newmessage.php:167 lib/command.php:505
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -3165,12 +3180,12 @@ msgstr "Melding"
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:511
+#: actions/newmessage.php:188 lib/command.php:513
 #, fuzzy, php-format
 msgid "Direct message to %s sent."
 msgstr "Direkte melding til %s sendt"
 
-#: actions/newmessage.php:213 actions/newnotice.php:263
+#: actions/newmessage.php:213 actions/newnotice.php:264
 msgid "Ajax Error"
 msgstr "Ajax feil"
 
@@ -3178,17 +3193,7 @@ msgstr "Ajax feil"
 msgid "New notice"
 msgstr "Ny notis"
 
-#: actions/newnotice.php:159 lib/mailhandler.php:60
-#, fuzzy, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr "Du kan lasta opp ein logo for gruppa."
-
-#: actions/newnotice.php:183
-#, php-format
-msgid "Max notice size is %d chars, including attachment URL."
-msgstr ""
-
-#: actions/newnotice.php:229
+#: actions/newnotice.php:230
 msgid "Notice posted"
 msgstr "Melding lagra"
 
@@ -3355,37 +3360,47 @@ msgstr "Søk etter folk"
 msgid "Notice Search"
 msgstr "Notissøk"
 
-#: actions/othersettings.php:60
+#: actions/othersettings.php:59
 msgid "Other settings"
 msgstr "Avatar-innstillingar"
 
+#. TRANS: Instructions for tab "Other" in user profile settings.
 #: actions/othersettings.php:71
 msgid "Manage various other options."
 msgstr "Velikehald andre innstillingar"
 
-#: actions/othersettings.php:108
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/othersettings.php:111
 msgid " (free service)"
 msgstr ""
 
-#: actions/othersettings.php:116
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/othersettings.php:120
 msgid "Shorten URLs with"
 msgstr ""
 
-#: actions/othersettings.php:117
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/othersettings.php:122
 msgid "Automatic shortening service to use."
 msgstr "Den automatisk forkortingstenesta du vil bruke"
 
-#: actions/othersettings.php:122
+#. TRANS: Label for checkbox.
+#: actions/othersettings.php:128
 #, fuzzy
 msgid "View profile designs"
 msgstr "Profilinnstillingar"
 
-#: actions/othersettings.php:123
+#. TRANS: Tooltip for checkbox.
+#: actions/othersettings.php:130
 msgid "Show or hide profile designs."
 msgstr ""
 
-#: actions/othersettings.php:153
-msgid "URL shortening service is too long (max 50 chars)."
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/othersettings.php:162
+#, fuzzy
+msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "Adressa til forkortingstenesta er for lang (maksimalt 50 teikn)."
 
 #: actions/otp.php:69
@@ -3880,7 +3895,7 @@ msgstr "Om meg"
 #. TRANS: Label for group location (dt). Text hidden by default.
 #: actions/profilesettings.php:149 actions/register.php:485
 #: actions/showgroup.php:267 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:177
+#: actions/userauthorization.php:166 lib/groupeditform.php:180
 #: lib/userprofile.php:165
 msgid "Location"
 msgstr "Plassering"
@@ -4216,7 +4231,8 @@ msgid "Unexpected password reset."
 msgstr "Uventa passordnullstilling."
 
 #: actions/recoverpassword.php:365
-msgid "Password must be 6 chars or more."
+#, fuzzy
+msgid "Password must be 6 characters or more."
 msgstr "Passord må vera 6 tekn eller meir."
 
 #: actions/recoverpassword.php:369
@@ -4600,7 +4616,7 @@ msgstr "Paginering"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:172
+#: lib/applicationeditform.php:208 lib/groupeditform.php:175
 msgid "Description"
 msgstr "Beskriving"
 
@@ -4743,7 +4759,7 @@ msgid "Note"
 msgstr "Merknad"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:298 lib/groupeditform.php:184
+#: actions/showgroup.php:298 lib/groupeditform.php:187
 msgid "Aliases"
 msgstr ""
 
@@ -4870,60 +4886,84 @@ msgstr "Melding fra %1$s på %2$s"
 msgid "Notice deleted."
 msgstr "Melding lagra"
 
-#: actions/showstream.php:72
+#. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
+#: actions/showstream.php:70
 #, fuzzy, php-format
-msgid " tagged %s"
+msgid "%1$s tagged %2$s"
+msgstr "Grupper, side %d"
+
+#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#: actions/showstream.php:74
+#, fuzzy, php-format
+msgid "%1$s tagged %2$s, page %3$d"
 msgstr "Notisar merka med %s"
 
-#: actions/showstream.php:78
+#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$d is the page number.
+#: actions/showstream.php:82
 #, php-format
 msgid "%1$s, page %2$d"
 msgstr "Grupper, side %d"
 
-#: actions/showstream.php:120
+#. TRANS: Title for link to notice feed.
+#. TRANS: %1$s is a user nickname, %2$s is a hashtag.
+#: actions/showstream.php:127
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Straum for vener av %s"
 
-#: actions/showstream.php:127
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:136
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "Straum for vener av %s"
 
-#: actions/showstream.php:134
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:145
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "Straum for vener av %s"
 
-#: actions/showstream.php:141
+#: actions/showstream.php:152
 #, fuzzy, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "Notisstraum for %s"
 
-#: actions/showstream.php:146
+#. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
+#. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
+#: actions/showstream.php:159
 #, fuzzy, php-format
 msgid "FOAF for %s"
 msgstr "Utboks for %s"
 
-#: actions/showstream.php:197
+#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
+#: actions/showstream.php:211
 #, php-format
-msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
+msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr ""
 
-#: actions/showstream.php:202
+#. TRANS: Second sentence of empty list message for a stream for the user themselves.
+#: actions/showstream.php:217
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
 msgstr ""
 
-#: actions/showstream.php:204
+#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:221
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
 "%?status_textarea=%2$s)."
 msgstr ""
 
-#: actions/showstream.php:243
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:264
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4932,7 +4972,9 @@ msgid ""
 "follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
 
-#: actions/showstream.php:248
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:271
 #, fuzzy, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4942,7 +4984,8 @@ msgstr ""
 "**%s** har ein konto på %%%%site.name%%%%, ei [mikroblogging](http://en."
 "wikipedia.org/wiki/Micro-blogging)-teneste"
 
-#: actions/showstream.php:305
+#. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
+#: actions/showstream.php:328
 #, fuzzy, php-format
 msgid "Repeat of %s"
 msgstr "Svar til %s"
@@ -5058,35 +5101,42 @@ msgstr ""
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:56
+#. TRANS: Page title for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:55
 #, fuzzy
 msgid "Site Notice"
 msgstr "Statusmelding"
 
-#: actions/sitenoticeadminpanel.php:67
+#. TRANS: Instructions for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:66
 #, fuzzy
 msgid "Edit site-wide message"
 msgstr "Ny melding"
 
-#: actions/sitenoticeadminpanel.php:103
+#. TRANS: Server error displayed when saving a site-wide notice was impossible.
+#: actions/sitenoticeadminpanel.php:101
 #, fuzzy
 msgid "Unable to save site notice."
 msgstr "Klarte ikkje å lagra Twitter-innstillingane dine!"
 
-#: actions/sitenoticeadminpanel.php:113
-msgid "Max length for the site-wide notice is 255 chars."
+#. TRANS: Client error displayed when a site-wide notice was longer than allowed.
+#: actions/sitenoticeadminpanel.php:112
+msgid "Maximum length for the site-wide notice is 255 characters."
 msgstr ""
 
+#. TRANS: Label for site-wide notice text field in admin panel.
 #: actions/sitenoticeadminpanel.php:176
 #, fuzzy
 msgid "Site notice text"
 msgstr "Statusmelding"
 
-#: actions/sitenoticeadminpanel.php:178
-msgid "Site-wide notice text (255 chars max; HTML okay)"
+#. TRANS: Tooltip for site-wide notice text field in admin panel.
+#: actions/sitenoticeadminpanel.php:179
+msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:198
+#. TRANS: Title for button to save site notice in admin panel.
+#: actions/sitenoticeadminpanel.php:201
 #, fuzzy
 msgid "Save site notice"
 msgstr "Statusmelding"
@@ -5549,82 +5599,99 @@ msgid ""
 msgstr ""
 
 #. TRANS: User admin panel title
-#: actions/useradminpanel.php:60
+#: actions/useradminpanel.php:58
 #, fuzzy
 msgctxt "TITLE"
 msgid "User"
 msgstr "Brukar"
 
-#: actions/useradminpanel.php:71
+#. TRANS: Instruction for user admin panel.
+#: actions/useradminpanel.php:69
 msgid "User settings for this StatusNet site"
 msgstr ""
 
-#: actions/useradminpanel.php:150
+#. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
+#: actions/useradminpanel.php:147
 msgid "Invalid bio limit. Must be numeric."
 msgstr ""
 
-#: actions/useradminpanel.php:156
-msgid "Invalid welcome text. Max length is 255 characters."
+#. TRANS: Form validation error in user admin panel when welcome text is too long.
+#: actions/useradminpanel.php:154
+msgid "Invalid welcome text. Maximum length is 255 characters."
 msgstr ""
 
+#. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
+#. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
 #, php-format
-msgid "Invalid default subscripton: '%1$s' is not user."
+msgid "Invalid default subscripton: '%1$s' is not a user."
 msgstr ""
 
 #. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:106
+#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
 #: lib/personalgroupnav.php:109
 msgid "Profile"
 msgstr "Profil"
 
-#: actions/useradminpanel.php:223
+#. TRANS: Field label in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:220
 msgid "Bio Limit"
 msgstr ""
 
-#: actions/useradminpanel.php:224
+#. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:222
 msgid "Maximum length of a profile bio in characters."
 msgstr ""
 
-#: actions/useradminpanel.php:232
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:231
 #, fuzzy
 msgid "New users"
 msgstr "Invitér nye brukarar"
 
+#. TRANS: Field label in user admin panel for setting new user welcome text.
 #: actions/useradminpanel.php:236
 msgid "New user welcome"
 msgstr ""
 
-#: actions/useradminpanel.php:237
-msgid "Welcome text for new users (Max 255 chars)."
-msgstr ""
+#. TRANS: Tooltip in user admin panel for setting new user welcome text.
+#: actions/useradminpanel.php:238
+#, fuzzy
+msgid "Welcome text for new users (maximum 255 characters)."
+msgstr "Ditt fulle namn er for langt (maksimalt 255 teikn)."
 
-#: actions/useradminpanel.php:242
+#. TRANS: Field label in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:244
 #, fuzzy
 msgid "Default subscription"
 msgstr "Alle tingingar"
 
-#: actions/useradminpanel.php:243
+#. TRANS: Tooltip in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:246
 #, fuzzy
 msgid "Automatically subscribe new users to this user."
 msgstr ""
 "Automatisk ting notisane til dei som tingar mine (best for ikkje-menneskje)"
 
-#: actions/useradminpanel.php:252
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:256
 #, fuzzy
 msgid "Invitations"
 msgstr "Invitasjon(er) sendt"
 
-#: actions/useradminpanel.php:257
+#. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:262
 #, fuzzy
 msgid "Invitations enabled"
 msgstr "Invitasjon(er) sendt"
 
-#: actions/useradminpanel.php:259
+#. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:265
 msgid "Whether to allow users to invite new users."
 msgstr ""
 
-#: actions/useradminpanel.php:295
+#. TRANS: Title for button to save user settings in user admin panel.
+#: actions/useradminpanel.php:302
 msgid "Save user settings"
 msgstr ""
 
@@ -5826,7 +5893,7 @@ msgid "Plugins"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:831
+#: actions/version.php:198 lib/action.php:880
 #, fuzzy
 msgid "Version"
 msgstr "Personleg"
@@ -6041,16 +6108,23 @@ msgstr "Kunne ikkje lagra abonnement."
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
+#. TRANS: Full name of a profile or group followed by nickname in parens
+#: classes/Profile.php:164
+#, fuzzy, php-format
+msgctxt "FANCYNAME"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:791
+#: classes/Profile.php:812
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:800
+#: classes/Profile.php:821
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6201,50 +6275,56 @@ msgstr "%1$s (%2$s)"
 msgid "Untitled page"
 msgstr "Ingen tittel"
 
+#. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
+#: lib/action.php:310
+msgctxt "TOOLTIP"
+msgid "Show more"
+msgstr ""
+
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:477
+#: lib/action.php:526
 msgid "Primary site navigation"
 msgstr "Navigasjon for hovudsida"
 
 #. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:483
+#: lib/action.php:532
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "Personleg profil og oversyn over vener"
 
 #. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:486
+#: lib/action.php:535
 #, fuzzy
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Personleg"
 
 #. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:488
+#: lib/action.php:537
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
 msgstr "Endra passordet ditt"
 
 #. TRANS: Main menu option when logged in for access to user settings
-#: lib/action.php:491
+#: lib/action.php:540
 msgid "Account"
 msgstr "Konto"
 
 #. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:493
+#: lib/action.php:542
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "Klarte ikkje å omdirigera til tenaren: %s"
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:496
+#: lib/action.php:545
 msgid "Connect"
 msgstr "Kopla til"
 
 #. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:499
+#: lib/action.php:548
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
@@ -6252,85 +6332,85 @@ msgstr "Navigasjon for hovudsida"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:502 lib/groupnav.php:117
+#: lib/action.php:551 lib/groupnav.php:117
 #, fuzzy
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Administrator"
 
 #. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:506
+#: lib/action.php:555
 #, fuzzy, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Inviter vennar og kollega til å bli med deg på %s"
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:509
+#: lib/action.php:558
 #, fuzzy
 msgctxt "MENU"
 msgid "Invite"
 msgstr "Invitér"
 
 #. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:515
+#: lib/action.php:564
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "Logg inn "
 
 #. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:518
+#: lib/action.php:567
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Logo"
 
 #. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:523
+#: lib/action.php:572
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "Opprett ei ny gruppe"
 
 #. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:526
+#: lib/action.php:575
 #, fuzzy
 msgctxt "MENU"
 msgid "Register"
 msgstr "Registrér"
 
 #. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:529
+#: lib/action.php:578
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "Logg inn "
 
 #. TRANS: Main menu option when not logged in to log in
-#: lib/action.php:532
+#: lib/action.php:581
 #, fuzzy
 msgctxt "MENU"
 msgid "Login"
 msgstr "Logg inn"
 
 #. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:535
+#: lib/action.php:584
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Hjelp"
 
 #. TRANS: Main menu option for help on the StatusNet site
-#: lib/action.php:538
+#: lib/action.php:587
 msgctxt "MENU"
 msgid "Help"
 msgstr "Hjelp"
 
 #. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:541
+#: lib/action.php:590
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr "Søk etter folk eller innhald"
 
 #. TRANS: Main menu option when logged in or when the StatusNet instance is not private
-#: lib/action.php:544
+#: lib/action.php:593
 #, fuzzy
 msgctxt "MENU"
 msgid "Search"
@@ -6338,68 +6418,69 @@ msgstr "Søk"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:566 lib/adminpanelaction.php:387
+#: lib/action.php:615 lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "Statusmelding"
 
 #. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:633
+#: lib/action.php:682
 msgid "Local views"
 msgstr "Lokale syningar"
 
 #. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:703
+#: lib/action.php:752
 msgid "Page notice"
 msgstr "Sidenotis"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:804
+#: lib/action.php:853
 msgid "Secondary site navigation"
 msgstr "Andrenivås side navigasjon"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:810
+#: lib/action.php:859
 msgid "Help"
 msgstr "Hjelp"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:813
+#: lib/action.php:862
 msgid "About"
 msgstr "Om"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:816
+#: lib/action.php:865
 msgid "FAQ"
 msgstr "OSS"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:821
+#: lib/action.php:870
 msgid "TOS"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:825
+#: lib/action.php:874
 msgid "Privacy"
 msgstr "Personvern"
 
-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:828
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+#: lib/action.php:877
 msgid "Source"
 msgstr "Kjeldekode"
 
-#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:834
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+#: lib/action.php:884
 msgid "Contact"
 msgstr "Kontakt"
 
-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:837
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+#: lib/action.php:887
 #, fuzzy
 msgid "Badge"
 msgstr "Dult"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:866
+#: lib/action.php:916
 msgid "StatusNet software license"
 msgstr "StatusNets programvarelisens"
 
@@ -6407,7 +6488,7 @@ msgstr "StatusNets programvarelisens"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:873
+#: lib/action.php:923
 #, fuzzy, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -6417,7 +6498,7 @@ msgstr ""
 "broughtbyurl%%). "
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:876
+#: lib/action.php:926
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** er ei mikrobloggingteneste."
@@ -6426,7 +6507,7 @@ msgstr "**%%site.name%%** er ei mikrobloggingteneste."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:883
+#: lib/action.php:933
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -6438,51 +6519,51 @@ msgstr ""
 "org/licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:899
+#: lib/action.php:949
 #, fuzzy
 msgid "Site content license"
 msgstr "StatusNets programvarelisens"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:906
+#: lib/action.php:956
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:913
+#: lib/action.php:963
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:917
+#: lib/action.php:967
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:949
+#: lib/action.php:999
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1285
+#: lib/action.php:1335
 msgid "Pagination"
 msgstr "Paginering"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1296
+#: lib/action.php:1346
 msgid "After"
 msgstr "« Etter"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1306
+#: lib/action.php:1356
 msgid "Before"
 msgstr "Før »"
 
@@ -6844,7 +6925,7 @@ msgid "AJAX error"
 msgstr "Ajax feil"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:233 lib/mailhandler.php:142
+#: lib/channel.php:233 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "Kommandoen utførd"
 
@@ -6861,7 +6942,7 @@ msgstr "Fann ingen profil med den IDen."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:626
+#: lib/command.php:99 lib/command.php:630
 #, fuzzy
 msgid "User has no last notice."
 msgstr "Brukaren har ikkje siste notis"
@@ -6928,6 +7009,14 @@ msgstr ""
 msgid "%1$s left group %2$s."
 msgstr ""
 
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: lib/command.php:426
+#, fuzzy, php-format
+msgctxt "WHOIS"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
 #. TRANS: Whois output. %s is the full name of the queried user.
 #: lib/command.php:430
 #, php-format
@@ -6965,130 +7054,134 @@ msgid ""
 "same server."
 msgstr ""
 
-#. TRANS: Message given if content is too long.
+#. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
 #: lib/command.php:488
 #, fuzzy, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr "Melding for lang - maksimum 140 teikn, du skreiv %d"
+msgid "Message too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] "Melding for lang - maksimum 140 teikn, du skreiv %d"
+msgstr[1] "Melding for lang - maksimum 140 teikn, du skreiv %d"
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:514
+#: lib/command.php:516
 msgid "Error sending direct message."
 msgstr "Ein feil oppstod ved sending av direkte melding."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:551
+#: lib/command.php:553
 #, fuzzy, php-format
 msgid "Notice from %s repeated."
 msgstr "Melding lagra"
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:554
+#: lib/command.php:556
 msgid "Error repeating notice."
 msgstr "Feil ved å setja brukar."
 
-#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:589
+#: lib/command.php:591
 #, fuzzy, php-format
-msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
-msgstr "Melding for lang - maksimum 140 teikn, du skreiv %d"
+msgid "Notice too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] "Melding for lang - maksimum 140 teikn, du skreiv %d"
+msgstr[1] "Melding for lang - maksimum 140 teikn, du skreiv %d"
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:600
+#: lib/command.php:604
 #, fuzzy, php-format
 msgid "Reply to %s sent."
 msgstr "Svar på denne notisen"
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:603
+#: lib/command.php:607
 #, fuzzy
 msgid "Error saving notice."
 msgstr "Eit problem oppstod ved lagring av notis."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:650
+#: lib/command.php:654
 #, fuzzy
 msgid "Specify the name of the user to subscribe to."
 msgstr "Spesifer namnet til brukaren du vil tinge"
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:659
+#: lib/command.php:663
 #, fuzzy
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Du tingar ikkje oppdateringar til den profilen."
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:667
+#: lib/command.php:671
 #, php-format
 msgid "Subscribed to %s."
 msgstr ""
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:688 lib/command.php:799
+#: lib/command.php:692 lib/command.php:803
 #, fuzzy
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "Spesifer namnet til brukar du vil fjerne tinging på"
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:699
+#: lib/command.php:703
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:719 lib/command.php:745
+#: lib/command.php:723 lib/command.php:749
 msgid "Command not yet implemented."
 msgstr "Kommando ikkje implementert."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:723
+#: lib/command.php:727
 msgid "Notification off."
 msgstr "Notifikasjon av."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:726
+#: lib/command.php:730
 msgid "Can't turn off notification."
 msgstr "Kan ikkje skru av notifikasjon."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:749
+#: lib/command.php:753
 msgid "Notification on."
 msgstr "Notifikasjon på."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:752
+#: lib/command.php:756
 msgid "Can't turn on notification."
 msgstr "Kan ikkje slå på notifikasjon."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:766
+#: lib/command.php:770
 msgid "Login command is disabled."
 msgstr ""
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:779
+#: lib/command.php:783
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:808
+#: lib/command.php:812
 #, php-format
 msgid "Unsubscribed %s."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:826
+#: lib/command.php:830
 #, fuzzy
 msgid "You are not subscribed to anyone."
 msgstr "Du tingar ikkje oppdateringar til den profilen."
@@ -7096,7 +7189,7 @@ msgstr "Du tingar ikkje oppdateringar til den profilen."
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:831
+#: lib/command.php:835
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Du tingar allereie oppdatering frå desse brukarane:"
@@ -7104,7 +7197,7 @@ msgstr[1] "Du tingar allereie oppdatering frå desse brukarane:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:853
+#: lib/command.php:857
 #, fuzzy
 msgid "No one is subscribed to you."
 msgstr "Kan ikkje tinga andre til deg."
@@ -7112,7 +7205,7 @@ msgstr "Kan ikkje tinga andre til deg."
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:858
+#: lib/command.php:862
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Kan ikkje tinga andre til deg."
@@ -7120,7 +7213,7 @@ msgstr[1] "Kan ikkje tinga andre til deg."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:880
+#: lib/command.php:884
 #, fuzzy
 msgid "You are not a member of any groups."
 msgstr "Du er ikkje medlem av den gruppa."
@@ -7128,14 +7221,14 @@ msgstr "Du er ikkje medlem av den gruppa."
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:885
+#: lib/command.php:889
 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."
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:900
+#: lib/command.php:904
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -7327,7 +7420,8 @@ msgstr ""
 "1-64 små bokstavar eller tal, ingen punktum (og liknande) eller mellomrom"
 
 #: lib/groupeditform.php:163
-msgid "URL of the homepage or blog of the group or topic"
+#, fuzzy
+msgid "URL of the homepage or blog of the group or topic."
 msgstr "URL til heimesida eller bloggen for gruppa eller emnet"
 
 #: lib/groupeditform.php:168
@@ -7337,18 +7431,27 @@ msgstr "Beskriv gruppa eller emnet med 140 teikn"
 
 #: lib/groupeditform.php:170
 #, fuzzy, php-format
-msgid "Describe the group or topic in %d characters"
-msgstr "Beskriv gruppa eller emnet med 140 teikn"
+msgid "Describe the group or topic in %d character or less"
+msgid_plural "Describe the group or topic in %d characters or less"
+msgstr[0] "Beskriv gruppa eller emnet med 140 teikn"
+msgstr[1] "Beskriv gruppa eller emnet med 140 teikn"
 
-#: lib/groupeditform.php:179
+#: lib/groupeditform.php:182
+#, fuzzy
 msgid ""
-"Location for the group, if any, like \"City, State (or Region), Country\""
+"Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr "Kvar er du, t.d. «Stavanger, Rogaland, Noreg»"
 
-#: lib/groupeditform.php:187
+#: lib/groupeditform.php:190
 #, php-format
-msgid "Extra nicknames for the group, comma- or space- separated, max %d"
-msgstr ""
+msgid ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"alias allowed."
+msgid_plural ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"aliases allowed."
+msgstr[0] ""
+msgstr[1] ""
 
 #. TRANS: Menu item in the group navigation page.
 #: lib/groupnav.php:86
@@ -7815,7 +7918,7 @@ msgstr "Beklager, det er ikkje di inngåande epost addresse."
 msgid "Sorry, no incoming email allowed."
 msgstr "Beklager, inngåande epost er ikkje tillatt."
 
-#: lib/mailhandler.php:228
+#: lib/mailhandler.php:229
 #, fuzzy, php-format
 msgid "Unsupported message type: %s"
 msgstr "Støttar ikkje bileteformatet."
@@ -8170,17 +8273,18 @@ msgid "Sandbox this user"
 msgstr "Lås opp brukaren"
 
 #. TRANS: Fieldset legend for the search form.
-#: lib/searchaction.php:121
+#: lib/searchaction.php:120
 #, fuzzy
 msgid "Search site"
 msgstr "Søk"
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
-#: lib/searchaction.php:129
+#: lib/searchaction.php:128
 msgid "Keyword(s)"
 msgstr ""
 
+#. TRANS: Button text for searching site.
 #: lib/searchaction.php:130
 msgctxt "BUTTON"
 msgid "Search"
@@ -8273,8 +8377,8 @@ msgid "The theme file is missing or the upload failed."
 msgstr ""
 
 #: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:278 lib/themeuploader.php:282
-#: lib/themeuploader.php:290 lib/themeuploader.php:297
+#: lib/themeuploader.php:279 lib/themeuploader.php:283
+#: lib/themeuploader.php:291 lib/themeuploader.php:298
 #, fuzzy
 msgid "Failed saving theme."
 msgstr "Feil ved oppdatering av brukarbilete."
@@ -8285,29 +8389,32 @@ msgstr ""
 
 #: lib/themeuploader.php:166
 #, php-format
-msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
-msgstr ""
+msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
+msgid_plural ""
+"Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr[0] ""
+msgstr[1] ""
 
-#: lib/themeuploader.php:178
+#: lib/themeuploader.php:179
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr ""
 
-#: lib/themeuploader.php:218
+#: lib/themeuploader.php:219
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
 msgstr ""
 
-#: lib/themeuploader.php:224
+#: lib/themeuploader.php:225
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr ""
 
-#: lib/themeuploader.php:241
+#: lib/themeuploader.php:242
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr ""
 
-#: lib/themeuploader.php:259
+#: lib/themeuploader.php:260
 msgid "Error opening theme archive."
 msgstr "Feil ved fjerning av blokka."
 
@@ -8494,20 +8601,38 @@ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
 msgstr[0] "Melding for lang - maksimum 140 teikn, du skreiv %d"
 msgstr[1] "Melding for lang - maksimum 140 teikn, du skreiv %d"
 
-#: scripts/restoreuser.php:82
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: scripts/restoreuser.php:61
 #, php-format
-msgid "Backup file for user %s (%s)"
+msgid "Getting backup from file '%s'."
 msgstr ""
 
-#: scripts/restoreuser.php:88
+#. TRANS: Commandline script output.
+#: scripts/restoreuser.php:91
 #, fuzzy
 msgid "No user specified; using backup user."
 msgstr "Ingen vald profil."
 
-#: scripts/restoreuser.php:94
+#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
+#: scripts/restoreuser.php:98
 #, php-format
-msgid "%d entries in backup."
-msgstr ""
+msgid "%d entry in backup."
+msgid_plural "%d entries in backup."
+msgstr[0] ""
+msgstr[1] ""
+
+#, fuzzy
+#~ msgid "Name is too long (maximum 255 chars)."
+#~ msgstr "Ditt fulle namn er for langt (maksimalt 255 teikn)."
 
-#~ msgid "Description is too long (max %d chars)."
+#, fuzzy
+#~ msgid "Organization is too long (maximum 255 chars)."
 #~ msgstr "Plassering er for lang (maksimalt 255 teikn)."
+
+#, fuzzy
+#~ msgid "That's too long. Max notice size is %d chars."
+#~ msgstr "Du kan lasta opp ein logo for gruppa."
+
+#, fuzzy
+#~ msgid " tagged %s"
+#~ msgstr "Notisar merka med %s"
diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po
index cfcfb5e54..499657993 100644
--- a/locale/pl/LC_MESSAGES/statusnet.po
+++ b/locale/pl/LC_MESSAGES/statusnet.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-30 23:18+0000\n"
-"PO-Revision-Date: 2010-10-30 23:20:40+0000\n"
+"POT-Creation-Date: 2010-11-02 22:51+0000\n"
+"PO-Revision-Date: 2010-11-02 22:53:36+0000\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <http://translatewiki.net/wiki/Portal:pl>\n"
 "MIME-Version: 1.0\n"
@@ -20,11 +20,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ( (n%10 >= 2 && n%10 <= 4 && "
 "(n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
-"X-Generator: MediaWiki 1.17alpha (r75708); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r75875); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pl\n"
 "X-Message-Group: #out-statusnet-core\n"
-"X-POT-Import-Date: 2010-10-30 09:48:40+0000\n"
+"X-POT-Import-Date: 2010-10-30 23:42:01+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -81,15 +81,20 @@ msgstr "Zapisz ustawienia dostępu"
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
+#. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
+#. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #: actions/accessadminpanel.php:193 actions/emailsettings.php:228
-#: actions/imsettings.php:187 actions/pathsadminpanel.php:512
-#: actions/profilesettings.php:201 actions/smssettings.php:209
-#: actions/subscriptions.php:246 lib/applicationeditform.php:355
+#: actions/imsettings.php:187 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: lib/applicationeditform.php:355 lib/groupeditform.php:207
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Zapisz"
@@ -140,7 +145,7 @@ msgstr "Nie ma takiej strony."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:495 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Brak takiego użytkownika."
@@ -213,7 +218,9 @@ msgstr ""
 
 #. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:208
+#. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -572,8 +579,11 @@ msgstr "Imię i nazwisko jest za długie (maksymalnie 255 znaków)."
 #. TRANS: Group edit form validation error.
 #. TRANS: Form validation error in New application form.
 #. TRANS: %d is the maximum number of characters for the description.
+#. TRANS: Group create form validation error.
+#. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:220 actions/editapplication.php:201
 #: actions/editgroup.php:216 actions/newapplication.php:178
+#: actions/newgroup.php:152
 #, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -731,14 +741,14 @@ msgstr "Token żądania został już upoważniony."
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:172 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:74
 #: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
 #: actions/groupunblock.php:65 actions/imsettings.php:230
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
-#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/othersettings.php:153 actions/passwordsettings.php:138
 #: actions/profilesettings.php:221 actions/recoverpassword.php:350
 #: actions/register.php:172 actions/remotesubscribe.php:77
 #: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
@@ -916,20 +926,21 @@ msgstr "Nie można usuwać stanów innych użytkowników."
 
 #. TRANS: Client error displayed trying to repeat a non-existing notice through the API.
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
+#. TRANS: Error message displayed trying to delete a non-existing notice.
 #: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/deletenotice.php:58 actions/shownotice.php:92
+#: actions/deletenotice.php:61 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "Nie ma takiego wpisu."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:535
+#: actions/apistatusesretweet.php:83 lib/command.php:537
 msgid "Cannot repeat your own notice."
 msgstr "Nie można powtórzyć własnego wpisu."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:541
+#: actions/apistatusesretweet.php:92 lib/command.php:543
 msgid "Already repeated that notice."
 msgstr "Już powtórzono ten wpis."
 
@@ -950,7 +961,8 @@ msgstr "Klient musi dostarczać parametr \"stan\" z wartością."
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#: actions/apistatusesupdate.php:244
+#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
+#: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
@@ -965,7 +977,7 @@ msgstr "Nie odnaleziono wpisu nadrzędnego."
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
-#: actions/apistatusesupdate.php:308
+#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
 #, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
@@ -1144,21 +1156,18 @@ msgstr "Podgląd"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
 #: actions/avatarsettings.php:155
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "Usuń"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
 #: actions/avatarsettings.php:173
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Wyślij"
 
 #. TRANS: Button on avatar upload crop form to confirm a selected crop as avatar.
 #: actions/avatarsettings.php:243
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Crop"
 msgstr "Przytnij"
@@ -1178,17 +1187,18 @@ msgstr "Wybierz kwadratowy obszar obrazu do awatara"
 msgid "Lost our file data."
 msgstr "Utracono dane pliku."
 
-#: actions/avatarsettings.php:384
+#. TRANS: Success message for having updated a user avatar.
+#: actions/avatarsettings.php:385
 msgid "Avatar updated."
 msgstr "Zaktualizowano awatar."
 
 #. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
-#: actions/avatarsettings.php:388
+#: actions/avatarsettings.php:389
 msgid "Failed updating avatar."
 msgstr "Zaktualizowanie awatara nie powiodło się."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:412
+#: actions/avatarsettings.php:413
 msgid "Avatar deleted."
 msgstr "Usunięto awatar."
 
@@ -1220,8 +1230,8 @@ msgstr ""
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:154 actions/deleteapplication.php:154
-#: actions/deletegroup.php:220 actions/deletenotice.php:150
+#: actions/block.php:154 actions/deleteapplication.php:157
+#: actions/deletegroup.php:220 actions/deletenotice.php:155
 #: actions/deleteuser.php:152 actions/groupblock.php:178
 msgctxt "BUTTON"
 msgid "No"
@@ -1239,8 +1249,8 @@ msgstr "Nie blokuj tego użytkownika"
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:161 actions/deleteapplication.php:161
-#: actions/deletegroup.php:227 actions/deletenotice.php:157
+#: actions/block.php:161 actions/deleteapplication.php:164
+#: actions/deletegroup.php:227 actions/deletenotice.php:162
 #: actions/deleteuser.php:159 actions/groupblock.php:185
 msgctxt "BUTTON"
 msgid "Yes"
@@ -1308,7 +1318,6 @@ msgstr "Odblokuj użytkownika w tej grupie"
 
 #. TRANS: Button text for unblocking a user from a group.
 #: actions/blockedfromgroup.php:323
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Unblock"
 msgstr "Odblokuj"
@@ -1357,12 +1366,13 @@ msgstr "Ten adres został już potwierdzony."
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
 #. TRANS: Server error thrown on database error updating IM preferences.
 #. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
 #. TRANS: Server error thrown when user profile settings could not be updated.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #: actions/confirmaddress.php:118 actions/emailsettings.php:331
 #: actions/emailsettings.php:477 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:174
+#: actions/imsettings.php:442 actions/othersettings.php:184
 #: actions/profilesettings.php:326 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
@@ -1371,9 +1381,8 @@ msgstr "Nie można zaktualizować użytkownika."
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
 #: actions/confirmaddress.php:132
-#, fuzzy
 msgid "Could not delete address confirmation."
-msgstr "Nie można usunąć potwierdzenia komunikatora."
+msgstr "Nie można usunąć potwierdzenia adresu."
 
 #. TRANS: Title for the contact address confirmation action.
 #: actions/confirmaddress.php:150
@@ -1398,16 +1407,19 @@ msgstr "Rozmowa"
 msgid "Notices"
 msgstr "Wpisy"
 
-#: actions/deleteapplication.php:63
+#. TRANS: Client error displayed trying to delete an application while not logged in.
+#: actions/deleteapplication.php:62
 msgid "You must be logged in to delete an application."
 msgstr "Musisz być zalogowany, aby usunąć aplikację."
 
+#. TRANS: Client error displayed trying to delete an application that does not exist.
 #: actions/deleteapplication.php:71
 msgid "Application not found."
 msgstr "Nie odnaleziono aplikacji."
 
+#. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
-#: actions/deleteapplication.php:78 actions/editapplication.php:78
+#: actions/deleteapplication.php:79 actions/editapplication.php:78
 #: actions/showapplication.php:94
 msgid "You are not the owner of this application."
 msgstr "Nie jesteś właścicielem tej aplikacji."
@@ -1415,15 +1427,18 @@ msgstr "Nie jesteś właścicielem tej aplikacji."
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
 #: actions/newapplication.php:114 actions/showapplication.php:118
-#: lib/action.php:1354
+#: lib/action.php:1404
 msgid "There was a problem with your session token."
 msgstr "Wystąpił problem z tokenem sesji."
 
-#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+#. TRANS: Title for delete application page.
+#. TRANS: Fieldset legend on delete application page.
+#: actions/deleteapplication.php:124 actions/deleteapplication.php:149
 msgid "Delete application"
 msgstr "Usuń aplikację"
 
-#: actions/deleteapplication.php:149
+#. TRANS: Confirmation text on delete application page.
+#: actions/deleteapplication.php:152
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
 "about the application from the database, including all existing user "
@@ -1433,12 +1448,12 @@ msgstr ""
 "danych, w tym wszystkie istniejące połączenia użytkowników."
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:158
+#: actions/deleteapplication.php:161
 msgid "Do not delete this application"
 msgstr "Nie usuwaj tej aplikacji"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:164
+#: actions/deleteapplication.php:167
 msgid "Delete this application"
 msgstr "Usuń tę aplikację"
 
@@ -1472,12 +1487,13 @@ msgstr "Nie można usunąć grupy %s."
 msgid "Deleted group %s"
 msgstr "Usunięto grupę %s"
 
-#. TRANS: Title.
+#. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
 #: actions/deletegroup.php:176 actions/deletegroup.php:202
 msgid "Delete group"
 msgstr "Usuń grupę"
 
+#. TRANS: Warning in form for deleleting a group.
 #: actions/deletegroup.php:206
 msgid ""
 "Are you sure you want to delete this group? This will clear all data about "
@@ -1498,10 +1514,11 @@ msgstr "Nie usuwaj tej grupy"
 msgid "Delete this group"
 msgstr "Usuń tę grupę"
 
+#. TRANS: Error message displayed trying to delete a notice while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1511,11 +1528,13 @@ msgstr "Usuń tę grupę"
 msgid "Not logged in."
 msgstr "Niezalogowany."
 
-#: actions/deletenotice.php:74
+#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
+#: actions/deletenotice.php:78
 msgid "Can't delete this notice."
 msgstr "Nie można usunąć tego wpisu."
 
-#: actions/deletenotice.php:106
+#. TRANS: Instructions for deleting a notice.
+#: actions/deletenotice.php:110
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
@@ -1523,21 +1542,24 @@ msgstr ""
 "Za chwilę wpis zostanie trwale usunięty. Kiedy to się stanie, nie będzie "
 "mogło zostać cofnięte."
 
-#: actions/deletenotice.php:112 actions/deletenotice.php:144
+#. TRANS: Page title when deleting a notice.
+#. TRANS: Fieldset legend for the delete notice form.
+#: actions/deletenotice.php:117 actions/deletenotice.php:148
 msgid "Delete notice"
 msgstr "Usuń wpis"
 
-#: actions/deletenotice.php:147
+#. TRANS: Message for the delete notice form.
+#: actions/deletenotice.php:152
 msgid "Are you sure you want to delete this notice?"
 msgstr "Jesteś pewien, że chcesz usunąć ten wpis?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:154
+#: actions/deletenotice.php:159
 msgid "Do not delete this notice"
 msgstr "Nie usuwaj tego wpisu"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:161 lib/noticelist.php:667
+#: actions/deletenotice.php:166 lib/noticelist.php:667
 msgid "Delete this notice"
 msgstr "Usuń ten wpis"
 
@@ -1697,11 +1719,9 @@ msgstr "Przywróć domyślne ustawienia"
 
 #. TRANS: Submit button title.
 #: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
-#: actions/othersettings.php:126 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: actions/useradminpanel.php:295 lib/applicationeditform.php:357
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: lib/applicationeditform.php:357 lib/designsettings.php:256
 msgid "Save"
 msgstr "Zapisz"
 
@@ -1749,8 +1769,9 @@ msgid "Name is required."
 msgstr "Nazwa jest wymagana."
 
 #. TRANS: Validation error shown when providing too long a name in the "Edit application" form.
-#: actions/editapplication.php:188
-msgid "Name is too long (max 255 characters)."
+#: actions/editapplication.php:188 actions/newapplication.php:169
+#, fuzzy
+msgid "Name is too long (maximum 255 characters)."
 msgstr "Nazwa jest za długa (maksymalnie 255 znaków)."
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
@@ -1779,7 +1800,7 @@ msgid "Organization is required."
 msgstr "Organizacja jest wymagana."
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#: actions/editapplication.php:223
+#: actions/editapplication.php:223 actions/newapplication.php:199
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "Organizacja jest za długa (maksymalnie 255 znaków)."
 
@@ -2572,7 +2593,7 @@ msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Opublikuj MicroID adresu Jabber/GTalk."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:180
+#: actions/imsettings.php:290 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "Zapisano preferencje."
 
@@ -2696,10 +2717,9 @@ msgstr[2] "Jesteś już subskrybowany do tych użytkowników:"
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#. TRANS: Whois output.
-#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:145 actions/invite.php:159 lib/command.php:426
-#, php-format
+#: actions/invite.php:145 actions/invite.php:159
+#, fuzzy, php-format
+msgctxt "INVITE"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
@@ -2888,7 +2908,8 @@ msgstr ""
 "zastrzeżone\"."
 
 #: actions/licenseadminpanel.php:156
-msgid "Invalid license title. Max length is 255 characters."
+#, fuzzy
+msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "Nieprawidłowy tytuł licencji. Maksymalna długość to 255 znaków."
 
 #: actions/licenseadminpanel.php:168
@@ -3062,18 +3083,10 @@ msgstr "Musisz być zalogowany, aby zarejestrować aplikację."
 msgid "Use this form to register a new application."
 msgstr "Użyj tego formularza, aby zarejestrować aplikację."
 
-#: actions/newapplication.php:169
-msgid "Name is too long (maximum 255 chars)."
-msgstr "Nazwa jest za długa (maksymalnie 255 znaków)."
-
 #: actions/newapplication.php:184
 msgid "Source URL is required."
 msgstr "Źródłowy adres URL jest wymagany."
 
-#: actions/newapplication.php:199
-msgid "Organization is too long (maximum 255 chars)."
-msgstr "Organizacja jest za długa (maksymalnie 255 znaków)."
-
 #: actions/newapplication.php:266 actions/newapplication.php:275
 msgid "Could not create application."
 msgstr "Nie można utworzyć aplikacji."
@@ -3093,14 +3106,14 @@ msgid "New message"
 msgstr "Nowa wiadomość"
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:499
+#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501
 msgid "You can't send a message to this user."
 msgstr "Nie można wysłać wiadomości do tego użytkownika."
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
 #: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
-#: lib/command.php:579
+#: lib/command.php:581
 msgid "No content!"
 msgstr "Brak treści."
 
@@ -3109,7 +3122,7 @@ msgid "No recipient specified."
 msgstr "Nie podano odbiorcy."
 
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:503
+#: actions/newmessage.php:167 lib/command.php:505
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "Nie wysyłaj wiadomości do siebie, po prostu powiedz to sobie po cichu."
@@ -3120,12 +3133,12 @@ msgstr "Wysłano wiadomość"
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:511
+#: actions/newmessage.php:188 lib/command.php:513
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Wysłano bezpośrednią wiadomość do użytkownika %s."
 
-#: actions/newmessage.php:213 actions/newnotice.php:263
+#: actions/newmessage.php:213 actions/newnotice.php:264
 msgid "Ajax Error"
 msgstr "Błąd AJAX"
 
@@ -3133,17 +3146,7 @@ msgstr "Błąd AJAX"
 msgid "New notice"
 msgstr "Nowy wpis"
 
-#: actions/newnotice.php:159 lib/mailhandler.php:60
-#, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr "Wpis jest za długi. Maksymalna długość wynosi %d znaków."
-
-#: actions/newnotice.php:183
-#, php-format
-msgid "Max notice size is %d chars, including attachment URL."
-msgstr "Maksymalny rozmiar wpisu wynosi %d znaków, w tym adres URL załącznika."
-
-#: actions/newnotice.php:229
+#: actions/newnotice.php:230
 msgid "Notice posted"
 msgstr "Wysłano wpis"
 
@@ -3316,36 +3319,46 @@ msgstr "Wyszukiwanie osób"
 msgid "Notice Search"
 msgstr "Wyszukiwanie wpisów"
 
-#: actions/othersettings.php:60
+#: actions/othersettings.php:59
 msgid "Other settings"
 msgstr "Inne ustawienia"
 
+#. TRANS: Instructions for tab "Other" in user profile settings.
 #: actions/othersettings.php:71
 msgid "Manage various other options."
 msgstr "Zarządzaj różnymi innymi opcjami."
 
-#: actions/othersettings.php:108
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/othersettings.php:111
 msgid " (free service)"
 msgstr " (wolna usługa)"
 
-#: actions/othersettings.php:116
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/othersettings.php:120
 msgid "Shorten URLs with"
 msgstr "Skracanie adresów URL za pomocą"
 
-#: actions/othersettings.php:117
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/othersettings.php:122
 msgid "Automatic shortening service to use."
 msgstr "Używana automatyczna usługa skracania."
 
-#: actions/othersettings.php:122
+#. TRANS: Label for checkbox.
+#: actions/othersettings.php:128
 msgid "View profile designs"
 msgstr "Wyświetl ustawienia wyglądu profilu"
 
-#: actions/othersettings.php:123
+#. TRANS: Tooltip for checkbox.
+#: actions/othersettings.php:130
 msgid "Show or hide profile designs."
 msgstr "Wyświetl lub ukryj ustawienia wyglądu profilu."
 
-#: actions/othersettings.php:153
-msgid "URL shortening service is too long (max 50 chars)."
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/othersettings.php:162
+#, fuzzy
+msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "Adres URL usługi skracania jest za długi (maksymalnie 50 znaków)."
 
 #: actions/otp.php:69
@@ -3817,7 +3830,7 @@ msgstr "O mnie"
 #. TRANS: Label for group location (dt). Text hidden by default.
 #: actions/profilesettings.php:149 actions/register.php:485
 #: actions/showgroup.php:267 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:177
+#: actions/userauthorization.php:166 lib/groupeditform.php:180
 #: lib/userprofile.php:165
 msgid "Location"
 msgstr "Położenie"
@@ -4157,7 +4170,8 @@ msgid "Unexpected password reset."
 msgstr "Nieoczekiwane przywrócenie hasła."
 
 #: actions/recoverpassword.php:365
-msgid "Password must be 6 chars or more."
+#, fuzzy
+msgid "Password must be 6 characters or more."
 msgstr "Hasło musi mieć sześć lub więcej znaków."
 
 #: actions/recoverpassword.php:369
@@ -4533,7 +4547,7 @@ msgstr "Organizacja"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:172
+#: lib/applicationeditform.php:208 lib/groupeditform.php:175
 msgid "Description"
 msgstr "Opis"
 
@@ -4685,7 +4699,7 @@ msgid "Note"
 msgstr "Wpis"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:298 lib/groupeditform.php:184
+#: actions/showgroup.php:298 lib/groupeditform.php:187
 msgid "Aliases"
 msgstr "Aliasy"
 
@@ -4737,14 +4751,12 @@ msgstr "Wszyscy członkowie"
 
 #. TRANS: Label for creation date in statistics on group page.
 #: actions/showgroup.php:458
-#, fuzzy
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Utworzono"
 
 #. TRANS: Label for member count in statistics on group page.
 #: actions/showgroup.php:466
-#, fuzzy
 msgctxt "LABEL"
 msgid "Members"
 msgstr "Członkowie"
@@ -4818,48 +4830,68 @@ msgstr "Wiadomość od użytkownika %1$s na %2$s"
 msgid "Notice deleted."
 msgstr "Usunięto wpis."
 
-#: actions/showstream.php:72
-#, php-format
-msgid " tagged %s"
-msgstr " ze znacznikiem %s"
+#. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
+#: actions/showstream.php:70
+#, fuzzy, php-format
+msgid "%1$s tagged %2$s"
+msgstr "%1$s, strona %2$d"
 
-#: actions/showstream.php:78
+#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#: actions/showstream.php:74
+#, fuzzy, php-format
+msgid "%1$s tagged %2$s, page %3$d"
+msgstr "Wpisy ze znacznikiem %1$s, strona %2$d"
+
+#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$d is the page number.
+#: actions/showstream.php:82
 #, php-format
 msgid "%1$s, page %2$d"
 msgstr "%1$s, strona %2$d"
 
-#: actions/showstream.php:120
+#. TRANS: Title for link to notice feed.
+#. TRANS: %1$s is a user nickname, %2$s is a hashtag.
+#: actions/showstream.php:127
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Kanał wpisów dla %1$s ze znacznikiem %2$s (RSS 1.0)"
 
-#: actions/showstream.php:127
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:136
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "Kanał wpisów dla %s (RSS 1.0)"
 
-#: actions/showstream.php:134
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:145
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "Kanał wpisów dla %s (RSS 2.0)"
 
-#: actions/showstream.php:141
+#: actions/showstream.php:152
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "Kanał wpisów dla %s (Atom)"
 
-#: actions/showstream.php:146
+#. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
+#. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
+#: actions/showstream.php:159
 #, php-format
 msgid "FOAF for %s"
 msgstr "FOAF dla %s"
 
-#: actions/showstream.php:197
-#, php-format
-msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
+#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
+#: actions/showstream.php:211
+#, fuzzy, php-format
+msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr ""
 "To jest oś czasu dla użytkownika %1$s, ale %2$s nie nic jeszcze nie wysłał."
 
-#: actions/showstream.php:202
+#. TRANS: Second sentence of empty list message for a stream for the user themselves.
+#: actions/showstream.php:217
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -4867,7 +4899,9 @@ msgstr ""
 "Widziałeś ostatnio coś interesującego? Nie wysłałeś jeszcze żadnych wpisów, "
 "teraz jest dobry czas, aby zacząć. :)"
 
-#: actions/showstream.php:204
+#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:221
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -4876,7 +4910,9 @@ msgstr ""
 "Można spróbować szturchnąć użytkownika %1$s lub [wysłać mu coś](%%%%action."
 "newnotice%%%%?status_textarea=%2$s)."
 
-#: actions/showstream.php:243
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:264
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4890,7 +4926,9 @@ msgstr ""
 "obserwować wpisy użytkownika **%s** i wiele więcej. ([Przeczytaj więcej](%%%%"
 "doc.help%%%%))"
 
-#: actions/showstream.php:248
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:271
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4901,7 +4939,8 @@ msgstr ""
 "pl.wikipedia.org/wiki/Mikroblog) opartej na wolnym narzędziu [StatusNet]"
 "(http://status.net/). "
 
-#: actions/showstream.php:305
+#. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
+#: actions/showstream.php:328
 #, php-format
 msgid "Repeat of %s"
 msgstr "Powtórzenia %s"
@@ -5015,32 +5054,41 @@ msgstr ""
 "Ile czasu użytkownicy muszą czekać (w sekundach), aby ponownie wysłać to "
 "samo."
 
-#: actions/sitenoticeadminpanel.php:56
+#. TRANS: Page title for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:55
 msgid "Site Notice"
 msgstr "Wpis witryny"
 
-#: actions/sitenoticeadminpanel.php:67
+#. TRANS: Instructions for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:66
 msgid "Edit site-wide message"
 msgstr "Zmodyfikuj wiadomość witryny"
 
-#: actions/sitenoticeadminpanel.php:103
+#. TRANS: Server error displayed when saving a site-wide notice was impossible.
+#: actions/sitenoticeadminpanel.php:101
 msgid "Unable to save site notice."
 msgstr "Nie można zapisać wpisu witryny."
 
-#: actions/sitenoticeadminpanel.php:113
-msgid "Max length for the site-wide notice is 255 chars."
+#. TRANS: Client error displayed when a site-wide notice was longer than allowed.
+#: actions/sitenoticeadminpanel.php:112
+#, fuzzy
+msgid "Maximum length for the site-wide notice is 255 characters."
 msgstr "Maksymalna długość wpisu witryny to 255 znaków."
 
+#. TRANS: Label for site-wide notice text field in admin panel.
 #: actions/sitenoticeadminpanel.php:176
 msgid "Site notice text"
 msgstr "Tekst wpisu witryny"
 
-#: actions/sitenoticeadminpanel.php:178
-msgid "Site-wide notice text (255 chars max; HTML okay)"
+#. TRANS: Tooltip for site-wide notice text field in admin panel.
+#: actions/sitenoticeadminpanel.php:179
+#, fuzzy
+msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr ""
 "Tekst wpisu witryny (maksymalnie 255 znaków, można używać znaczników HTML)"
 
-#: actions/sitenoticeadminpanel.php:198
+#. TRANS: Title for button to save site notice in admin panel.
+#: actions/sitenoticeadminpanel.php:201
 msgid "Save site notice"
 msgstr "Zapisz wpis witryny"
 
@@ -5507,75 +5555,93 @@ msgstr ""
 "witryny \"%2$s\"."
 
 #. TRANS: User admin panel title
-#: actions/useradminpanel.php:60
+#: actions/useradminpanel.php:58
 msgctxt "TITLE"
 msgid "User"
 msgstr "Użytkownik"
 
-#: actions/useradminpanel.php:71
+#. TRANS: Instruction for user admin panel.
+#: actions/useradminpanel.php:69
 msgid "User settings for this StatusNet site"
 msgstr "Ustawienia użytkownika dla tej witryny StatusNet"
 
-#: actions/useradminpanel.php:150
+#. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
+#: actions/useradminpanel.php:147
 msgid "Invalid bio limit. Must be numeric."
 msgstr "Nieprawidłowe ograniczenie informacji o sobie. Musi być liczbowa."
 
-#: actions/useradminpanel.php:156
-msgid "Invalid welcome text. Max length is 255 characters."
+#. TRANS: Form validation error in user admin panel when welcome text is too long.
+#: actions/useradminpanel.php:154
+#, fuzzy
+msgid "Invalid welcome text. Maximum length is 255 characters."
 msgstr "Nieprawidłowy tekst powitania. Maksymalna długość to 255 znaków."
 
+#. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
+#. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
-#, php-format
-msgid "Invalid default subscripton: '%1$s' is not user."
+#, fuzzy, php-format
+msgid "Invalid default subscripton: '%1$s' is not a user."
 msgstr "Nieprawidłowa domyślna subskrypcja: \"%1$s\" nie jest użytkownikiem."
 
 #. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:106
+#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
 #: lib/personalgroupnav.php:109
 msgid "Profile"
 msgstr "Profil"
 
-#: actions/useradminpanel.php:223
+#. TRANS: Field label in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:220
 msgid "Bio Limit"
 msgstr "Ograniczenie informacji o sobie"
 
-#: actions/useradminpanel.php:224
+#. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:222
 msgid "Maximum length of a profile bio in characters."
 msgstr "Maksymalna długość informacji o sobie jako liczba znaków."
 
-#: actions/useradminpanel.php:232
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:231
 msgid "New users"
 msgstr "Nowi użytkownicy"
 
+#. TRANS: Field label in user admin panel for setting new user welcome text.
 #: actions/useradminpanel.php:236
 msgid "New user welcome"
 msgstr "Powitanie nowego użytkownika"
 
-#: actions/useradminpanel.php:237
-msgid "Welcome text for new users (Max 255 chars)."
+#. TRANS: Tooltip in user admin panel for setting new user welcome text.
+#: actions/useradminpanel.php:238
+#, fuzzy
+msgid "Welcome text for new users (maximum 255 characters)."
 msgstr "Tekst powitania nowych użytkowników (maksymalnie 255 znaków)."
 
-#: actions/useradminpanel.php:242
+#. TRANS: Field label in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:244
 msgid "Default subscription"
 msgstr "Domyślna subskrypcja"
 
-#: actions/useradminpanel.php:243
+#. TRANS: Tooltip in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:246
 msgid "Automatically subscribe new users to this user."
 msgstr "Automatyczne subskrybowanie nowych użytkowników do tego użytkownika."
 
-#: actions/useradminpanel.php:252
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:256
 msgid "Invitations"
 msgstr "Zaproszenia"
 
-#: actions/useradminpanel.php:257
+#. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:262
 msgid "Invitations enabled"
 msgstr "Zaproszenia są włączone"
 
-#: actions/useradminpanel.php:259
+#. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:265
 msgid "Whether to allow users to invite new users."
 msgstr "Czy zezwolić użytkownikom zapraszanie nowych użytkowników."
 
-#: actions/useradminpanel.php:295
+#. TRANS: Title for button to save user settings in user admin panel.
+#: actions/useradminpanel.php:302
 msgid "Save user settings"
 msgstr "Zapisz ustawienia użytkownika"
 
@@ -5785,7 +5851,7 @@ msgid "Plugins"
 msgstr "Wtyczki"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:831
+#: actions/version.php:198 lib/action.php:880
 msgid "Version"
 msgstr "Wersja"
 
@@ -5997,16 +6063,23 @@ msgstr "Nie można zapisać odpowiedzi na %1$d, %2$d."
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
+#. TRANS: Full name of a profile or group followed by nickname in parens
+#: classes/Profile.php:164
+#, fuzzy, php-format
+msgctxt "FANCYNAME"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:791
+#: classes/Profile.php:812
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr "Nie można unieważnić roli \"\"%1$s\" użytkownika #%2$d; nie istnieje."
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:800
+#: classes/Profile.php:821
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6153,194 +6226,201 @@ msgstr "%1$s - %2$s"
 msgid "Untitled page"
 msgstr "Strona bez nazwy"
 
+#. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
+#: lib/action.php:310
+msgctxt "TOOLTIP"
+msgid "Show more"
+msgstr ""
+
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:477
+#: lib/action.php:526
 msgid "Primary site navigation"
 msgstr "Główna nawigacja witryny"
 
 #. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:483
+#: lib/action.php:532
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "Profil osobisty i oś czasu przyjaciół"
 
 #. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:486
+#: lib/action.php:535
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Osobiste"
 
 #. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:488
+#: lib/action.php:537
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
 msgstr "Zmień adres e-mail, awatar, hasło, profil"
 
 #. TRANS: Main menu option when logged in for access to user settings
-#: lib/action.php:491
+#: lib/action.php:540
 msgid "Account"
 msgstr "Konto"
 
 #. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:493
+#: lib/action.php:542
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "Połącz z serwisami"
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:496
+#: lib/action.php:545
 msgid "Connect"
 msgstr "Połącz"
 
 #. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:499
+#: lib/action.php:548
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "Zmień konfigurację witryny"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:502 lib/groupnav.php:117
+#: lib/action.php:551 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Administrator"
 
 #. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:506
+#: lib/action.php:555
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Zaproś przyjaciół i kolegów do dołączenia do ciebie na %s"
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:509
+#: lib/action.php:558
 msgctxt "MENU"
 msgid "Invite"
 msgstr "Zaproś"
 
 #. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:515
+#: lib/action.php:564
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "Wyloguj się z witryny"
 
 #. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:518
+#: lib/action.php:567
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Wyloguj się"
 
 #. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:523
+#: lib/action.php:572
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "Utwórz konto"
 
 #. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:526
+#: lib/action.php:575
 msgctxt "MENU"
 msgid "Register"
 msgstr "Zarejestruj się"
 
 #. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:529
+#: lib/action.php:578
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "Zaloguj się na witrynie"
 
 #. TRANS: Main menu option when not logged in to log in
-#: lib/action.php:532
+#: lib/action.php:581
 msgctxt "MENU"
 msgid "Login"
 msgstr "Zaloguj się"
 
 #. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:535
+#: lib/action.php:584
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Pomóż mi."
 
 #. TRANS: Main menu option for help on the StatusNet site
-#: lib/action.php:538
+#: lib/action.php:587
 msgctxt "MENU"
 msgid "Help"
 msgstr "Pomoc"
 
 #. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:541
+#: lib/action.php:590
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr "Wyszukaj osoby lub tekst"
 
 #. TRANS: Main menu option when logged in or when the StatusNet instance is not private
-#: lib/action.php:544
+#: lib/action.php:593
 msgctxt "MENU"
 msgid "Search"
 msgstr "Wyszukaj"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:566 lib/adminpanelaction.php:387
+#: lib/action.php:615 lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "Wpis witryny"
 
 #. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:633
+#: lib/action.php:682
 msgid "Local views"
 msgstr "Lokalne widoki"
 
 #. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:703
+#: lib/action.php:752
 msgid "Page notice"
 msgstr "Wpis strony"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:804
+#: lib/action.php:853
 msgid "Secondary site navigation"
 msgstr "Druga nawigacja witryny"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:810
+#: lib/action.php:859
 msgid "Help"
 msgstr "Pomoc"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:813
+#: lib/action.php:862
 msgid "About"
 msgstr "O usłudze"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:816
+#: lib/action.php:865
 msgid "FAQ"
 msgstr "FAQ"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:821
+#: lib/action.php:870
 msgid "TOS"
 msgstr "TOS"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:825
+#: lib/action.php:874
 msgid "Privacy"
 msgstr "Prywatność"
 
-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:828
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+#: lib/action.php:877
 msgid "Source"
 msgstr "Kod źródłowy"
 
-#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:834
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+#: lib/action.php:884
 msgid "Contact"
 msgstr "Kontakt"
 
-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:837
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+#: lib/action.php:887
 msgid "Badge"
 msgstr "Odznaka"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:866
+#: lib/action.php:916
 msgid "StatusNet software license"
 msgstr "Licencja oprogramowania StatusNet"
 
@@ -6348,7 +6428,7 @@ msgstr "Licencja oprogramowania StatusNet"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:873
+#: lib/action.php:923
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -6358,7 +6438,7 @@ msgstr ""
 "broughtby%%](%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:876
+#: lib/action.php:926
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** jest usługą mikroblogowania."
@@ -6367,7 +6447,7 @@ msgstr "**%%site.name%%** jest usługą mikroblogowania."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:883
+#: lib/action.php:933
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -6379,20 +6459,20 @@ msgstr ""
 "Affero](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:899
+#: lib/action.php:949
 msgid "Site content license"
 msgstr "Licencja zawartości witryny"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:906
+#: lib/action.php:956
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "Treść i dane %1$s są prywatne i poufne."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:913
+#: lib/action.php:963
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
@@ -6400,7 +6480,7 @@ msgstr ""
 "zastrzeżone."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:917
+#: lib/action.php:967
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "Prawa autorskie do treści i danych są własnością współtwórców. Wszystkie "
@@ -6408,7 +6488,7 @@ msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:949
+#: lib/action.php:999
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
@@ -6416,19 +6496,19 @@ msgstr ""
 "$s."
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1285
+#: lib/action.php:1335
 msgid "Pagination"
 msgstr "Paginacja"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1296
+#: lib/action.php:1346
 msgid "After"
 msgstr "Później"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1306
+#: lib/action.php:1356
 msgid "Before"
 msgstr "Wcześniej"
 
@@ -6772,7 +6852,7 @@ msgid "AJAX error"
 msgstr "Błąd AJAX"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:233 lib/mailhandler.php:142
+#: lib/channel.php:233 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "Zakończono polecenie"
 
@@ -6788,7 +6868,7 @@ msgstr "Wpis z tym identyfikatorem nie istnieje."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:626
+#: lib/command.php:99 lib/command.php:630
 msgid "User has no last notice."
 msgstr "Użytkownik nie posiada ostatniego wpisu."
 
@@ -6857,6 +6937,14 @@ msgstr "Użytkownik %1$s dołączył do grupy %2$s."
 msgid "%1$s left group %2$s."
 msgstr "Użytkownik %1$s opuścił grupę %2$s."
 
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: lib/command.php:426
+#, fuzzy, php-format
+msgctxt "WHOIS"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
 #. TRANS: Whois output. %s is the full name of the queried user.
 #: lib/command.php:430
 #, php-format
@@ -6896,113 +6984,119 @@ msgstr ""
 "%s to zdalny profil; można wysyłać bezpośrednie wiadomości tylko do "
 "użytkowników na tym samym serwerze."
 
-#. TRANS: Message given if content is too long.
+#. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
 #: lib/command.php:488
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr "Wiadomość jest za długa - maksymalnie %1$d znaków, wysłano %2$d."
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] "Wiadomość jest za długa - maksymalnie %1$d znaków, wysłano %2$d."
+msgstr[1] "Wiadomość jest za długa - maksymalnie %1$d znaków, wysłano %2$d."
+msgstr[2] "Wiadomość jest za długa - maksymalnie %1$d znaków, wysłano %2$d."
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:514
+#: lib/command.php:516
 msgid "Error sending direct message."
 msgstr "Błąd podczas wysyłania bezpośredniej wiadomości."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:551
+#: lib/command.php:553
 #, php-format
 msgid "Notice from %s repeated."
 msgstr "Powtórzono wpis od użytkownika %s."
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:554
+#: lib/command.php:556
 msgid "Error repeating notice."
 msgstr "Błąd podczas powtarzania wpisu."
 
-#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:589
-#, php-format
-msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
-msgstr "Wpis jest za długi - maksymalnie %1$d znaków, wysłano %2$d."
+#: lib/command.php:591
+#, fuzzy, php-format
+msgid "Notice too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] "Wpis jest za długi - maksymalnie %1$d znaków, wysłano %2$d."
+msgstr[1] "Wpis jest za długi - maksymalnie %1$d znaków, wysłano %2$d."
+msgstr[2] "Wpis jest za długi - maksymalnie %1$d znaków, wysłano %2$d."
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:600
+#: lib/command.php:604
 #, php-format
 msgid "Reply to %s sent."
 msgstr "Wysłano odpowiedź do %s."
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:603
+#: lib/command.php:607
 msgid "Error saving notice."
 msgstr "Błąd podczas zapisywania wpisu."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:650
+#: lib/command.php:654
 msgid "Specify the name of the user to subscribe to."
 msgstr "Podaj nazwę użytkownika do subskrybowania."
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:659
+#: lib/command.php:663
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Nie można subskrybować profili OMB za pomocą polecenia."
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:667
+#: lib/command.php:671
 #, php-format
 msgid "Subscribed to %s."
 msgstr "Subskrybowano użytkownika %s."
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:688 lib/command.php:799
+#: lib/command.php:692 lib/command.php:803
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "Podaj nazwę użytkownika do usunięcia subskrypcji."
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:699
+#: lib/command.php:703
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr "Usunięto subskrypcję użytkownika %s."
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:719 lib/command.php:745
+#: lib/command.php:723 lib/command.php:749
 msgid "Command not yet implemented."
 msgstr "Nie zaimplementowano polecenia."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:723
+#: lib/command.php:727
 msgid "Notification off."
 msgstr "Wyłączono powiadomienia."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:726
+#: lib/command.php:730
 msgid "Can't turn off notification."
 msgstr "Nie można wyłączyć powiadomień."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:749
+#: lib/command.php:753
 msgid "Notification on."
 msgstr "Włączono powiadomienia."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:752
+#: lib/command.php:756
 msgid "Can't turn on notification."
 msgstr "Nie można włączyć powiadomień."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:766
+#: lib/command.php:770
 msgid "Login command is disabled."
 msgstr "Polecenie logowania jest wyłączone."
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:779
+#: lib/command.php:783
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
@@ -7010,20 +7104,20 @@ msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:808
+#: lib/command.php:812
 #, php-format
 msgid "Unsubscribed %s."
 msgstr "Usunięto subskrypcję użytkownika %s."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:826
+#: lib/command.php:830
 msgid "You are not subscribed to anyone."
 msgstr "Nie subskrybujesz nikogo."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:831
+#: lib/command.php:835
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Subskrybujesz tę osobę:"
@@ -7032,14 +7126,14 @@ msgstr[2] "Subskrybujesz te osoby:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:853
+#: lib/command.php:857
 msgid "No one is subscribed to you."
 msgstr "Nikt cię nie subskrybuje."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:858
+#: lib/command.php:862
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Ta osoba cię subskrybuje:"
@@ -7048,14 +7142,14 @@ msgstr[2] "Te osoby cię subskrybują:"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:880
+#: lib/command.php:884
 msgid "You are not a member of any groups."
 msgstr "Nie jesteś członkiem żadnej grupy."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:885
+#: lib/command.php:889
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Jesteś członkiem tej grupy:"
@@ -7063,7 +7157,7 @@ msgstr[1] "Jesteś członkiem tych grup:"
 msgstr[2] "Jesteś członkiem tych grup:"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:900
+#: lib/command.php:904
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -7292,7 +7386,8 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 małe litery lub liczby, bez spacji i znaków przestankowych"
 
 #: lib/groupeditform.php:163
-msgid "URL of the homepage or blog of the group or topic"
+#, fuzzy
+msgid "URL of the homepage or blog of the group or topic."
 msgstr "Adres URL strony domowej lub bloga grupy, albo temat"
 
 #: lib/groupeditform.php:168
@@ -7300,21 +7395,36 @@ msgid "Describe the group or topic"
 msgstr "Opisz grupę lub temat"
 
 #: lib/groupeditform.php:170
-#, php-format
-msgid "Describe the group or topic in %d characters"
-msgstr "Opisz grupę lub temat w %d znakach"
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d character or less"
+msgid_plural "Describe the group or topic in %d characters or less"
+msgstr[0] "Opisz grupę lub temat w %d znakach"
+msgstr[1] "Opisz grupę lub temat w %d znakach"
+msgstr[2] "Opisz grupę lub temat w %d znakach"
 
-#: lib/groupeditform.php:179
+#: lib/groupeditform.php:182
+#, fuzzy
 msgid ""
-"Location for the group, if any, like \"City, State (or Region), Country\""
+"Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr ""
 "Położenie grupy, jeśli istnieje, np. \"miasto, województwo (lub region), kraj"
 "\""
 
-#: lib/groupeditform.php:187
-#, php-format
-msgid "Extra nicknames for the group, comma- or space- separated, max %d"
-msgstr ""
+#: lib/groupeditform.php:190
+#, fuzzy, php-format
+msgid ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"alias allowed."
+msgid_plural ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"aliases allowed."
+msgstr[0] ""
+"Dodatkowe pseudonimy grupy, oddzielone przecinkami lub spacjami, maksymalnie "
+"%d"
+msgstr[1] ""
+"Dodatkowe pseudonimy grupy, oddzielone przecinkami lub spacjami, maksymalnie "
+"%d"
+msgstr[2] ""
 "Dodatkowe pseudonimy grupy, oddzielone przecinkami lub spacjami, maksymalnie "
 "%d"
 
@@ -7446,30 +7556,30 @@ msgstr "Nieznany typ pliku"
 
 #. TRANS: Number of megabytes. %d is the number.
 #: lib/imagefile.php:248
-#, fuzzy, php-format
+#, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
-msgstr[0] "MB"
-msgstr[1] "MB"
-msgstr[2] "MB"
+msgstr[0] "%d MB"
+msgstr[1] "%d MB"
+msgstr[2] "%d MB"
 
 #. TRANS: Number of kilobytes. %d is the number.
 #: lib/imagefile.php:252
-#, fuzzy, php-format
+#, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
-msgstr[0] "KB"
-msgstr[1] "KB"
-msgstr[2] "KB"
+msgstr[0] "%d KB"
+msgstr[1] "%d KB"
+msgstr[2] "%d KB"
 
 #. TRANS: Number of bytes. %d is the number.
 #: lib/imagefile.php:255
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%d B"
+msgstr[1] "%d B"
+msgstr[2] "%d B"
 
 #: lib/jabber.php:387
 #, php-format
@@ -7876,7 +7986,7 @@ msgstr "To nie jest przychodzący adres e-mail."
 msgid "Sorry, no incoming email allowed."
 msgstr "Przychodzący e-mail nie jest dozwolony."
 
-#: lib/mailhandler.php:228
+#: lib/mailhandler.php:229
 #, php-format
 msgid "Unsupported message type: %s"
 msgstr "Nieobsługiwany typ wiadomości: %s"
@@ -8221,16 +8331,17 @@ msgid "Sandbox this user"
 msgstr "Ogranicz tego użytkownika"
 
 #. TRANS: Fieldset legend for the search form.
-#: lib/searchaction.php:121
+#: lib/searchaction.php:120
 msgid "Search site"
 msgstr "Przeszukaj witrynę"
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
-#: lib/searchaction.php:129
+#: lib/searchaction.php:128
 msgid "Keyword(s)"
 msgstr "Słowa kluczowe"
 
+#. TRANS: Button text for searching site.
 #: lib/searchaction.php:130
 msgctxt "BUTTON"
 msgid "Search"
@@ -8321,8 +8432,8 @@ msgid "The theme file is missing or the upload failed."
 msgstr "Brak pliku motywu lub wysłanie nie powiodło się."
 
 #: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:278 lib/themeuploader.php:282
-#: lib/themeuploader.php:290 lib/themeuploader.php:297
+#: lib/themeuploader.php:279 lib/themeuploader.php:283
+#: lib/themeuploader.php:291 lib/themeuploader.php:298
 msgid "Failed saving theme."
 msgstr "Zapisanie motywu nie powiodło się."
 
@@ -8331,17 +8442,25 @@ msgid "Invalid theme: bad directory structure."
 msgstr "Nieprawidłowy motyw: błędna struktura katalogów."
 
 #: lib/themeuploader.php:166
-#, php-format
-msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
-msgstr ""
+#, fuzzy, php-format
+msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
+msgid_plural ""
+"Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr[0] ""
+"Wysłany motyw jest za duży, musi być mniejszy niż %d bajtów po "
+"zdekompresowaniu."
+msgstr[1] ""
+"Wysłany motyw jest za duży, musi być mniejszy niż %d bajtów po "
+"zdekompresowaniu."
+msgstr[2] ""
 "Wysłany motyw jest za duży, musi być mniejszy niż %d bajtów po "
 "zdekompresowaniu."
 
-#: lib/themeuploader.php:178
+#: lib/themeuploader.php:179
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr "Nieprawidłowe archiwum motywu: brak pliku css/display.css"
 
-#: lib/themeuploader.php:218
+#: lib/themeuploader.php:219
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
@@ -8349,18 +8468,18 @@ msgstr ""
 "Motyw zawiera nieprawidłowy plik lub nazwę katalogu. Należy używać tylko "
 "liter, cyfr, podkreślników i znaku minus z zestawu ASCII."
 
-#: lib/themeuploader.php:224
+#: lib/themeuploader.php:225
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr ""
 "Temat zawiera niebezpieczne rozszerzenie nazwy pliku, co może stanowić "
 "zagrożenie."
 
-#: lib/themeuploader.php:241
+#: lib/themeuploader.php:242
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr "Motyw zawiera plik typu \\\".%s\\\", który nie jest dozwolony."
 
-#: lib/themeuploader.php:259
+#: lib/themeuploader.php:260
 msgid "Error opening theme archive."
 msgstr "Błąd podczas otwierania archiwum motywu."
 
@@ -8370,10 +8489,9 @@ msgstr "Najczęściej wysyłający wpisy"
 
 #. TRANS: Title for the form to unblock a user.
 #: lib/unblockform.php:67
-#, fuzzy
 msgctxt "TITLE"
 msgid "Unblock"
-msgstr "Odblokuj"
+msgstr "Odblokowanie"
 
 #: lib/unsandboxform.php:69
 msgid "Unsandbox"
@@ -8549,22 +8667,41 @@ msgstr[0] "Wiadomość jest za długa. Maksymalnie %1$d znak, wysłano %2$d."
 msgstr[1] "Wiadomość jest za długa. Maksymalnie %1$d znaki, wysłano %2$d."
 msgstr[2] "Wiadomość jest za długa. Maksymalnie %1$d znaków, wysłano %2$d."
 
-#: scripts/restoreuser.php:82
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: scripts/restoreuser.php:61
 #, php-format
-msgid "Backup file for user %s (%s)"
-msgstr "Plik kopii zapasowej dla użytkownika %s (%s)"
+msgid "Getting backup from file '%s'."
+msgstr ""
 
-#: scripts/restoreuser.php:88
+#. TRANS: Commandline script output.
+#: scripts/restoreuser.php:91
 msgid "No user specified; using backup user."
 msgstr "Nie podano użytkownika; używanie użytkownika zapasowego."
 
-#: scripts/restoreuser.php:94
-#, php-format
-msgid "%d entries in backup."
-msgstr "%d wpisów w kopii zapasowej."
+#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
+#: scripts/restoreuser.php:98
+#, fuzzy, php-format
+msgid "%d entry in backup."
+msgid_plural "%d entries in backup."
+msgstr[0] "%d wpisów w kopii zapasowej."
+msgstr[1] "%d wpisów w kopii zapasowej."
+msgstr[2] "%d wpisów w kopii zapasowej."
+
+#~ msgid "Name is too long (maximum 255 chars)."
+#~ msgstr "Nazwa jest za długa (maksymalnie 255 znaków)."
+
+#~ msgid "Organization is too long (maximum 255 chars)."
+#~ msgstr "Organizacja jest za długa (maksymalnie 255 znaków)."
+
+#~ msgid "That's too long. Max notice size is %d chars."
+#~ msgstr "Wpis jest za długi. Maksymalna długość wynosi %d znaków."
+
+#~ msgid "Max notice size is %d chars, including attachment URL."
+#~ msgstr ""
+#~ "Maksymalny rozmiar wpisu wynosi %d znaków, w tym adres URL załącznika."
 
-#~ msgid "Description is too long (max %d chars)."
-#~ msgstr "Opis jest za długi (maksymalnie %d znaków)."
+#~ msgid " tagged %s"
+#~ msgstr " ze znacznikiem %s"
 
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "Za dużo aliasów. Maksymalnie %d."
+#~ msgid "Backup file for user %s (%s)"
+#~ msgstr "Plik kopii zapasowej dla użytkownika %s (%s)"
diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po
index be8cae38f..2c04b685d 100644
--- a/locale/pt/LC_MESSAGES/statusnet.po
+++ b/locale/pt/LC_MESSAGES/statusnet.po
@@ -14,17 +14,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-30 23:18+0000\n"
-"PO-Revision-Date: 2010-10-30 23:20:42+0000\n"
+"POT-Creation-Date: 2010-11-02 22:51+0000\n"
+"PO-Revision-Date: 2010-11-02 22:53:38+0000\n"
 "Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r75708); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r75875); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2010-10-30 09:48:40+0000\n"
+"X-POT-Import-Date: 2010-10-30 23:42:01+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -81,15 +81,20 @@ msgstr "Gravar configurações de acesso"
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
+#. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
+#. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #: actions/accessadminpanel.php:193 actions/emailsettings.php:228
-#: actions/imsettings.php:187 actions/pathsadminpanel.php:512
-#: actions/profilesettings.php:201 actions/smssettings.php:209
-#: actions/subscriptions.php:246 lib/applicationeditform.php:355
+#: actions/imsettings.php:187 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: lib/applicationeditform.php:355 lib/groupeditform.php:207
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Gravar"
@@ -140,7 +145,7 @@ msgstr "Página não foi encontrada."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:495 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Utilizador não foi encontrado."
@@ -212,7 +217,9 @@ msgstr ""
 
 #. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:208
+#. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -567,8 +574,11 @@ msgstr "Nome completo demasiado longo (máx. 255 caracteres)."
 #. TRANS: Group edit form validation error.
 #. TRANS: Form validation error in New application form.
 #. TRANS: %d is the maximum number of characters for the description.
+#. TRANS: Group create form validation error.
+#. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:220 actions/editapplication.php:201
 #: actions/editgroup.php:216 actions/newapplication.php:178
+#: actions/newgroup.php:152
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -728,14 +738,14 @@ msgstr "Não tem autorização."
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:172 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:74
 #: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
 #: actions/groupunblock.php:65 actions/imsettings.php:230
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
-#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/othersettings.php:153 actions/passwordsettings.php:138
 #: actions/profilesettings.php:221 actions/recoverpassword.php:350
 #: actions/register.php:172 actions/remotesubscribe.php:77
 #: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
@@ -915,20 +925,21 @@ msgstr "Não pode apagar o estado de outro utilizador."
 
 #. TRANS: Client error displayed trying to repeat a non-existing notice through the API.
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
+#. TRANS: Error message displayed trying to delete a non-existing notice.
 #: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/deletenotice.php:58 actions/shownotice.php:92
+#: actions/deletenotice.php:61 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "Nota não foi encontrada."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:535
+#: actions/apistatusesretweet.php:83 lib/command.php:537
 msgid "Cannot repeat your own notice."
 msgstr "Não pode repetir a sua própria nota."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:541
+#: actions/apistatusesretweet.php:92 lib/command.php:543
 msgid "Already repeated that notice."
 msgstr "Já repetiu essa nota."
 
@@ -949,7 +960,8 @@ msgstr "O cliente tem de fornecer um parâmetro 'status' com um valor."
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#: actions/apistatusesupdate.php:244
+#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
+#: lib/mailhandler.php:60
 #, fuzzy, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
@@ -964,7 +976,7 @@ msgstr "Método da API não encontrado."
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
-#: actions/apistatusesupdate.php:308
+#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
 #, fuzzy, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
@@ -1175,17 +1187,18 @@ msgstr "Escolha uma área quadrada da imagem para ser o seu avatar"
 msgid "Lost our file data."
 msgstr "Perdi os dados do nosso ficheiro."
 
-#: actions/avatarsettings.php:384
+#. TRANS: Success message for having updated a user avatar.
+#: actions/avatarsettings.php:385
 msgid "Avatar updated."
 msgstr "Avatar actualizado."
 
 #. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
-#: actions/avatarsettings.php:388
+#: actions/avatarsettings.php:389
 msgid "Failed updating avatar."
 msgstr "Falha ao actualizar avatar."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:412
+#: actions/avatarsettings.php:413
 msgid "Avatar deleted."
 msgstr "Avatar apagado."
 
@@ -1217,8 +1230,8 @@ msgstr ""
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:154 actions/deleteapplication.php:154
-#: actions/deletegroup.php:220 actions/deletenotice.php:150
+#: actions/block.php:154 actions/deleteapplication.php:157
+#: actions/deletegroup.php:220 actions/deletenotice.php:155
 #: actions/deleteuser.php:152 actions/groupblock.php:178
 msgctxt "BUTTON"
 msgid "No"
@@ -1236,8 +1249,8 @@ msgstr "Não bloquear este utilizador"
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:161 actions/deleteapplication.php:161
-#: actions/deletegroup.php:227 actions/deletenotice.php:157
+#: actions/block.php:161 actions/deleteapplication.php:164
+#: actions/deletegroup.php:227 actions/deletenotice.php:162
 #: actions/deleteuser.php:159 actions/groupblock.php:185
 msgctxt "BUTTON"
 msgid "Yes"
@@ -1354,12 +1367,13 @@ msgstr "Esse endereço já tinha sido confirmado."
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
 #. TRANS: Server error thrown on database error updating IM preferences.
 #. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
 #. TRANS: Server error thrown when user profile settings could not be updated.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #: actions/confirmaddress.php:118 actions/emailsettings.php:331
 #: actions/emailsettings.php:477 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:174
+#: actions/imsettings.php:442 actions/othersettings.php:184
 #: actions/profilesettings.php:326 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
@@ -1395,16 +1409,19 @@ msgstr "Conversação"
 msgid "Notices"
 msgstr "Notas"
 
-#: actions/deleteapplication.php:63
+#. TRANS: Client error displayed trying to delete an application while not logged in.
+#: actions/deleteapplication.php:62
 msgid "You must be logged in to delete an application."
 msgstr "Tem de iniciar uma sessão para eliminar uma aplicação."
 
+#. TRANS: Client error displayed trying to delete an application that does not exist.
 #: actions/deleteapplication.php:71
 msgid "Application not found."
 msgstr "Aplicação não foi encontrada."
 
+#. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
-#: actions/deleteapplication.php:78 actions/editapplication.php:78
+#: actions/deleteapplication.php:79 actions/editapplication.php:78
 #: actions/showapplication.php:94
 msgid "You are not the owner of this application."
 msgstr "Não é o proprietário desta aplicação."
@@ -1412,15 +1429,18 @@ msgstr "Não é o proprietário desta aplicação."
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
 #: actions/newapplication.php:114 actions/showapplication.php:118
-#: lib/action.php:1354
+#: lib/action.php:1404
 msgid "There was a problem with your session token."
 msgstr "Ocorreu um problema com a sua sessão."
 
-#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+#. TRANS: Title for delete application page.
+#. TRANS: Fieldset legend on delete application page.
+#: actions/deleteapplication.php:124 actions/deleteapplication.php:149
 msgid "Delete application"
 msgstr "Apagar aplicação"
 
-#: actions/deleteapplication.php:149
+#. TRANS: Confirmation text on delete application page.
+#: actions/deleteapplication.php:152
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
 "about the application from the database, including all existing user "
@@ -1431,12 +1451,12 @@ msgstr ""
 "utilizadores em existência."
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:158
+#: actions/deleteapplication.php:161
 msgid "Do not delete this application"
 msgstr "Não apagar esta aplicação"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:164
+#: actions/deleteapplication.php:167
 msgid "Delete this application"
 msgstr "Apagar esta aplicação"
 
@@ -1472,13 +1492,14 @@ msgstr "Não foi possível actualizar o grupo."
 msgid "Deleted group %s"
 msgstr "%1$s deixou o grupo %2$s"
 
-#. TRANS: Title.
+#. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
 #: actions/deletegroup.php:176 actions/deletegroup.php:202
 #, fuzzy
 msgid "Delete group"
 msgstr "Apagar utilizador"
 
+#. TRANS: Warning in form for deleleting a group.
 #: actions/deletegroup.php:206
 #, fuzzy
 msgid ""
@@ -1501,10 +1522,11 @@ msgstr "Não apagar esta nota"
 msgid "Delete this group"
 msgstr "Apagar este utilizador"
 
+#. TRANS: Error message displayed trying to delete a notice while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1514,11 +1536,13 @@ msgstr "Apagar este utilizador"
 msgid "Not logged in."
 msgstr "Não iniciou sessão."
 
-#: actions/deletenotice.php:74
+#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
+#: actions/deletenotice.php:78
 msgid "Can't delete this notice."
 msgstr "Nota não pode ser apagada."
 
-#: actions/deletenotice.php:106
+#. TRANS: Instructions for deleting a notice.
+#: actions/deletenotice.php:110
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
@@ -1526,21 +1550,24 @@ msgstr ""
 "Está prestes a apagar permamentemente uma nota. Esta acção não pode ser "
 "desfeita."
 
-#: actions/deletenotice.php:112 actions/deletenotice.php:144
+#. TRANS: Page title when deleting a notice.
+#. TRANS: Fieldset legend for the delete notice form.
+#: actions/deletenotice.php:117 actions/deletenotice.php:148
 msgid "Delete notice"
 msgstr "Apagar nota"
 
-#: actions/deletenotice.php:147
+#. TRANS: Message for the delete notice form.
+#: actions/deletenotice.php:152
 msgid "Are you sure you want to delete this notice?"
 msgstr "Tem a certeza de que quer apagar esta nota?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:154
+#: actions/deletenotice.php:159
 msgid "Do not delete this notice"
 msgstr "Não apagar esta nota"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:161 lib/noticelist.php:667
+#: actions/deletenotice.php:166 lib/noticelist.php:667
 msgid "Delete this notice"
 msgstr "Apagar esta nota"
 
@@ -1706,11 +1733,9 @@ msgstr "Repor predefinição"
 
 #. TRANS: Submit button title.
 #: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
-#: actions/othersettings.php:126 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: actions/useradminpanel.php:295 lib/applicationeditform.php:357
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: lib/applicationeditform.php:357 lib/designsettings.php:256
 msgid "Save"
 msgstr "Gravar"
 
@@ -1758,9 +1783,9 @@ msgid "Name is required."
 msgstr "Nome é obrigatório."
 
 #. TRANS: Validation error shown when providing too long a name in the "Edit application" form.
-#: actions/editapplication.php:188
+#: actions/editapplication.php:188 actions/newapplication.php:169
 #, fuzzy
-msgid "Name is too long (max 255 characters)."
+msgid "Name is too long (maximum 255 characters)."
 msgstr "Nome é demasiado longo (máx. 255 caracteres)."
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
@@ -1789,7 +1814,7 @@ msgid "Organization is required."
 msgstr "Organização é obrigatória."
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#: actions/editapplication.php:223
+#: actions/editapplication.php:223 actions/newapplication.php:199
 #, fuzzy
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "Organização é demasiado longa (máx. 255 caracteres)."
@@ -2590,7 +2615,7 @@ msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Publicar um MicroID para o meu endereço Jabber/GTalk."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:180
+#: actions/imsettings.php:290 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "Preferências gravadas."
 
@@ -2717,10 +2742,9 @@ msgstr[1] "Já subscreveu estes utilizadores:"
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#. TRANS: Whois output.
-#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:145 actions/invite.php:159 lib/command.php:426
-#, php-format
+#: actions/invite.php:145 actions/invite.php:159
+#, fuzzy, php-format
+msgctxt "INVITE"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
@@ -2903,8 +2927,9 @@ msgid ""
 msgstr ""
 
 #: actions/licenseadminpanel.php:156
-msgid "Invalid license title. Max length is 255 characters."
-msgstr ""
+#, fuzzy
+msgid "Invalid license title. Maximum length is 255 characters."
+msgstr "Texto de boas-vindas inválido. Tamanho máx. é 255 caracteres."
 
 #: actions/licenseadminpanel.php:168
 msgid "Invalid license URL."
@@ -3076,20 +3101,10 @@ msgstr "Tem de iniciar uma sessão para registar uma aplicação."
 msgid "Use this form to register a new application."
 msgstr "Use este formulário para registar uma nova aplicação."
 
-#: actions/newapplication.php:169
-#, fuzzy
-msgid "Name is too long (maximum 255 chars)."
-msgstr "Nome é demasiado longo (máx. 255 caracteres)."
-
 #: actions/newapplication.php:184
 msgid "Source URL is required."
 msgstr "É necessária a URL de origem."
 
-#: actions/newapplication.php:199
-#, fuzzy
-msgid "Organization is too long (maximum 255 chars)."
-msgstr "Organização é demasiado longa (máx. 255 caracteres)."
-
 #: actions/newapplication.php:266 actions/newapplication.php:275
 msgid "Could not create application."
 msgstr "Não foi possível criar a aplicação."
@@ -3109,14 +3124,14 @@ msgid "New message"
 msgstr "Mensagem nova"
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:499
+#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501
 msgid "You can't send a message to this user."
 msgstr "Não pode enviar uma mensagem a este utilizador."
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
 #: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
-#: lib/command.php:579
+#: lib/command.php:581
 msgid "No content!"
 msgstr "Sem conteúdo!"
 
@@ -3125,7 +3140,7 @@ msgid "No recipient specified."
 msgstr "Não especificou um destinatário."
 
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:503
+#: actions/newmessage.php:167 lib/command.php:505
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "Não auto-envie uma mensagem; basta lê-la baixinho a si próprio."
@@ -3136,12 +3151,12 @@ msgstr "Mensagem enviada"
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:511
+#: actions/newmessage.php:188 lib/command.php:513
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Mensagem directa para %s foi enviada."
 
-#: actions/newmessage.php:213 actions/newnotice.php:263
+#: actions/newmessage.php:213 actions/newnotice.php:264
 msgid "Ajax Error"
 msgstr "Erro do Ajax"
 
@@ -3149,17 +3164,7 @@ msgstr "Erro do Ajax"
 msgid "New notice"
 msgstr "Nota nova"
 
-#: actions/newnotice.php:159 lib/mailhandler.php:60
-#, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr "Demasiado longo. Tamanho máx. das notas é %d caracteres."
-
-#: actions/newnotice.php:183
-#, php-format
-msgid "Max notice size is %d chars, including attachment URL."
-msgstr "Tamanho máx. das notas é %d caracteres, incluindo a URL do anexo."
-
-#: actions/newnotice.php:229
+#: actions/newnotice.php:230
 msgid "Notice posted"
 msgstr "Nota publicada"
 
@@ -3328,36 +3333,46 @@ msgstr "Pesquisa de Pessoas"
 msgid "Notice Search"
 msgstr "Pesquisa de Notas"
 
-#: actions/othersettings.php:60
+#: actions/othersettings.php:59
 msgid "Other settings"
 msgstr "Outras configurações"
 
+#. TRANS: Instructions for tab "Other" in user profile settings.
 #: actions/othersettings.php:71
 msgid "Manage various other options."
 msgstr "Gerir várias outras opções."
 
-#: actions/othersettings.php:108
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/othersettings.php:111
 msgid " (free service)"
 msgstr " (serviço gratuito)"
 
-#: actions/othersettings.php:116
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/othersettings.php:120
 msgid "Shorten URLs with"
 msgstr "Encurtar URLs com"
 
-#: actions/othersettings.php:117
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/othersettings.php:122
 msgid "Automatic shortening service to use."
 msgstr "Serviço de encurtamento que será usado automaticamente"
 
-#: actions/othersettings.php:122
+#. TRANS: Label for checkbox.
+#: actions/othersettings.php:128
 msgid "View profile designs"
 msgstr "Ver estilos para o perfil"
 
-#: actions/othersettings.php:123
+#. TRANS: Tooltip for checkbox.
+#: actions/othersettings.php:130
 msgid "Show or hide profile designs."
 msgstr "Mostrar ou esconder estilos para o perfil."
 
-#: actions/othersettings.php:153
-msgid "URL shortening service is too long (max 50 chars)."
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/othersettings.php:162
+#, fuzzy
+msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "Serviço de encurtamento de URLs demasiado extenso (máx. 50 caracteres)"
 
 #: actions/otp.php:69
@@ -3848,7 +3863,7 @@ msgstr "Biografia"
 #. TRANS: Label for group location (dt). Text hidden by default.
 #: actions/profilesettings.php:149 actions/register.php:485
 #: actions/showgroup.php:267 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:177
+#: actions/userauthorization.php:166 lib/groupeditform.php:180
 #: lib/userprofile.php:165
 msgid "Location"
 msgstr "Localidade"
@@ -4191,7 +4206,8 @@ msgid "Unexpected password reset."
 msgstr "Reinício inesperado da senha."
 
 #: actions/recoverpassword.php:365
-msgid "Password must be 6 chars or more."
+#, fuzzy
+msgid "Password must be 6 characters or more."
 msgstr "Senha tem de ter 6 ou mais caracteres."
 
 #: actions/recoverpassword.php:369
@@ -4570,7 +4586,7 @@ msgstr "Organização"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:172
+#: lib/applicationeditform.php:208 lib/groupeditform.php:175
 msgid "Description"
 msgstr "Descrição"
 
@@ -4723,7 +4739,7 @@ msgid "Note"
 msgstr "Anotação"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:298 lib/groupeditform.php:184
+#: actions/showgroup.php:298 lib/groupeditform.php:187
 msgid "Aliases"
 msgstr "Nomes alternativos"
 
@@ -4856,47 +4872,67 @@ msgstr "Mensagem de %1$s a %2$s"
 msgid "Notice deleted."
 msgstr "Avatar actualizado."
 
-#: actions/showstream.php:72
-#, php-format
-msgid " tagged %s"
-msgstr "  categorizou %s"
+#. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
+#: actions/showstream.php:70
+#, fuzzy, php-format
+msgid "%1$s tagged %2$s"
+msgstr "%1$s, página %2$d"
+
+#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#: actions/showstream.php:74
+#, fuzzy, php-format
+msgid "%1$s tagged %2$s, page %3$d"
+msgstr "Notas categorizadas com %1$s, página %2$d"
 
-#: actions/showstream.php:78
+#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$d is the page number.
+#: actions/showstream.php:82
 #, php-format
 msgid "%1$s, page %2$d"
 msgstr "%1$s, página %2$d"
 
-#: actions/showstream.php:120
+#. TRANS: Title for link to notice feed.
+#. TRANS: %1$s is a user nickname, %2$s is a hashtag.
+#: actions/showstream.php:127
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Fonte de notas de %1$s com a categoria %2$s (RSS 1.0)"
 
-#: actions/showstream.php:127
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:136
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "Fonte de notas para %s (RSS 1.0)"
 
-#: actions/showstream.php:134
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:145
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "Fonte de notas para %s (RSS 2.0)"
 
-#: actions/showstream.php:141
+#: actions/showstream.php:152
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "Fonte de notas para %s (Atom)"
 
-#: actions/showstream.php:146
+#. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
+#. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
+#: actions/showstream.php:159
 #, php-format
 msgid "FOAF for %s"
 msgstr "FOAF para %s"
 
-#: actions/showstream.php:197
-#, php-format
-msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
+#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
+#: actions/showstream.php:211
+#, fuzzy, php-format
+msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr "Estas são as notas de %1$s, mas %2$s ainda não publicou nenhuma."
 
-#: actions/showstream.php:202
+#. TRANS: Second sentence of empty list message for a stream for the user themselves.
+#: actions/showstream.php:217
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -4904,7 +4940,9 @@ msgstr ""
 "Viu algo de interessante ultimamente? Como ainda não publicou nenhuma nota, "
 "esta seria uma óptima altura para começar :)"
 
-#: actions/showstream.php:204
+#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:221
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -4913,7 +4951,9 @@ msgstr ""
 "Pode tentar dar um toque em %1$s ou [endereçar-lhe uma nota](%%%%action."
 "newnotice%%%%?status_textarea=%2$s)."
 
-#: actions/showstream.php:243
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:264
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4927,7 +4967,9 @@ msgstr ""
 "action.register%%%%) para seguir as notas de **%s** e de muitos mais! "
 "([Saber mais](%%%%doc.help%%%%))"
 
-#: actions/showstream.php:248
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:271
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4938,7 +4980,8 @@ msgstr ""
 "(http://en.wikipedia.org/wiki/Micro-blogging) baseado no programa de "
 "Software Livre [StatusNet](http://status.net/). "
 
-#: actions/showstream.php:305
+#. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
+#: actions/showstream.php:328
 #, php-format
 msgid "Repeat of %s"
 msgstr "Repetições de %s"
@@ -5052,31 +5095,40 @@ msgstr ""
 "Quanto tempo os utilizadores terão de esperar (em segundos) para publicar a "
 "mesma coisa outra vez."
 
-#: actions/sitenoticeadminpanel.php:56
+#. TRANS: Page title for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:55
 msgid "Site Notice"
 msgstr "Aviso do Site"
 
-#: actions/sitenoticeadminpanel.php:67
+#. TRANS: Instructions for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:66
 msgid "Edit site-wide message"
 msgstr "Editar mensagem do site"
 
-#: actions/sitenoticeadminpanel.php:103
+#. TRANS: Server error displayed when saving a site-wide notice was impossible.
+#: actions/sitenoticeadminpanel.php:101
 msgid "Unable to save site notice."
 msgstr "Não foi possível gravar o aviso do site."
 
-#: actions/sitenoticeadminpanel.php:113
-msgid "Max length for the site-wide notice is 255 chars."
+#. TRANS: Client error displayed when a site-wide notice was longer than allowed.
+#: actions/sitenoticeadminpanel.php:112
+#, fuzzy
+msgid "Maximum length for the site-wide notice is 255 characters."
 msgstr "Tamanho máximo do aviso do site é 255 caracteres."
 
+#. TRANS: Label for site-wide notice text field in admin panel.
 #: actions/sitenoticeadminpanel.php:176
 msgid "Site notice text"
 msgstr "Texto do aviso do site"
 
-#: actions/sitenoticeadminpanel.php:178
-msgid "Site-wide notice text (255 chars max; HTML okay)"
+#. TRANS: Tooltip for site-wide notice text field in admin panel.
+#: actions/sitenoticeadminpanel.php:179
+#, fuzzy
+msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr "Texto do aviso do site (máx. 255 caracteres; pode usar HTML)"
 
-#: actions/sitenoticeadminpanel.php:198
+#. TRANS: Title for button to save site notice in admin panel.
+#: actions/sitenoticeadminpanel.php:201
 msgid "Save site notice"
 msgstr "Gravar aviso do site"
 
@@ -5542,75 +5594,93 @@ msgstr ""
 "site."
 
 #. TRANS: User admin panel title
-#: actions/useradminpanel.php:60
+#: actions/useradminpanel.php:58
 msgctxt "TITLE"
 msgid "User"
 msgstr "Utilizador"
 
-#: actions/useradminpanel.php:71
+#. TRANS: Instruction for user admin panel.
+#: actions/useradminpanel.php:69
 msgid "User settings for this StatusNet site"
 msgstr ""
 
-#: actions/useradminpanel.php:150
+#. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
+#: actions/useradminpanel.php:147
 msgid "Invalid bio limit. Must be numeric."
 msgstr "Limite da biografia inválido. Tem de ser numérico."
 
-#: actions/useradminpanel.php:156
-msgid "Invalid welcome text. Max length is 255 characters."
+#. TRANS: Form validation error in user admin panel when welcome text is too long.
+#: actions/useradminpanel.php:154
+#, fuzzy
+msgid "Invalid welcome text. Maximum length is 255 characters."
 msgstr "Texto de boas-vindas inválido. Tamanho máx. é 255 caracteres."
 
+#. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
+#. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
-#, php-format
-msgid "Invalid default subscripton: '%1$s' is not user."
+#, fuzzy, php-format
+msgid "Invalid default subscripton: '%1$s' is not a user."
 msgstr "Subscrição predefinida é inválida: '%1$s' não é utilizador."
 
 #. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:106
+#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
 #: lib/personalgroupnav.php:109
 msgid "Profile"
 msgstr "Perfil"
 
-#: actions/useradminpanel.php:223
+#. TRANS: Field label in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:220
 msgid "Bio Limit"
 msgstr "Limite da Biografia"
 
-#: actions/useradminpanel.php:224
+#. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:222
 msgid "Maximum length of a profile bio in characters."
 msgstr "Tamanho máximo de uma biografia em caracteres."
 
-#: actions/useradminpanel.php:232
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:231
 msgid "New users"
 msgstr "Utilizadores novos"
 
+#. TRANS: Field label in user admin panel for setting new user welcome text.
 #: actions/useradminpanel.php:236
 msgid "New user welcome"
 msgstr "Boas-vindas a utilizadores novos"
 
-#: actions/useradminpanel.php:237
-msgid "Welcome text for new users (Max 255 chars)."
+#. TRANS: Tooltip in user admin panel for setting new user welcome text.
+#: actions/useradminpanel.php:238
+#, fuzzy
+msgid "Welcome text for new users (maximum 255 characters)."
 msgstr "Texto de boas-vindas a utilizadores novos (máx. 255 caracteres)."
 
-#: actions/useradminpanel.php:242
+#. TRANS: Field label in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:244
 msgid "Default subscription"
 msgstr "Subscrição predefinida"
 
-#: actions/useradminpanel.php:243
+#. TRANS: Tooltip in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:246
 msgid "Automatically subscribe new users to this user."
 msgstr "Novos utilizadores subscrevem automaticamente este utilizador."
 
-#: actions/useradminpanel.php:252
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:256
 msgid "Invitations"
 msgstr "Convites"
 
-#: actions/useradminpanel.php:257
+#. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:262
 msgid "Invitations enabled"
 msgstr "Convites habilitados"
 
-#: actions/useradminpanel.php:259
+#. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:265
 msgid "Whether to allow users to invite new users."
 msgstr "Permitir, ou não, que utilizadores convidem utilizadores novos."
 
-#: actions/useradminpanel.php:295
+#. TRANS: Title for button to save user settings in user admin panel.
+#: actions/useradminpanel.php:302
 msgid "Save user settings"
 msgstr ""
 
@@ -5820,7 +5890,7 @@ msgid "Plugins"
 msgstr "Plugins"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:831
+#: actions/version.php:198 lib/action.php:880
 msgid "Version"
 msgstr "Versão"
 
@@ -6030,9 +6100,16 @@ msgstr "Não foi possível gravar a informação do grupo local."
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
+#. TRANS: Full name of a profile or group followed by nickname in parens
+#: classes/Profile.php:164
+#, fuzzy, php-format
+msgctxt "FANCYNAME"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:791
+#: classes/Profile.php:812
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
@@ -6040,7 +6117,7 @@ msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:800
+#: classes/Profile.php:821
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6187,194 +6264,201 @@ msgstr "%1$s - %2$s"
 msgid "Untitled page"
 msgstr "Página sem título"
 
+#. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
+#: lib/action.php:310
+msgctxt "TOOLTIP"
+msgid "Show more"
+msgstr ""
+
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:477
+#: lib/action.php:526
 msgid "Primary site navigation"
 msgstr "Navegação primária deste site"
 
 #. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:483
+#: lib/action.php:532
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "Perfil pessoal e notas dos amigos"
 
 #. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:486
+#: lib/action.php:535
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Pessoal"
 
 #. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:488
+#: lib/action.php:537
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
 msgstr "Altere o seu endereço electrónico, avatar, senha, perfil"
 
 #. TRANS: Main menu option when logged in for access to user settings
-#: lib/action.php:491
+#: lib/action.php:540
 msgid "Account"
 msgstr "Conta"
 
 #. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:493
+#: lib/action.php:542
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "Ligar aos serviços"
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:496
+#: lib/action.php:545
 msgid "Connect"
 msgstr "Ligar"
 
 #. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:499
+#: lib/action.php:548
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "Alterar a configuração do site"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:502 lib/groupnav.php:117
+#: lib/action.php:551 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Gestor"
 
 #. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:506
+#: lib/action.php:555
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Convidar amigos e colegas para se juntarem a si em %s"
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:509
+#: lib/action.php:558
 msgctxt "MENU"
 msgid "Invite"
 msgstr "Convidar"
 
 #. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:515
+#: lib/action.php:564
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "Terminar esta sessão"
 
 #. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:518
+#: lib/action.php:567
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Sair"
 
 #. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:523
+#: lib/action.php:572
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "Criar uma conta"
 
 #. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:526
+#: lib/action.php:575
 msgctxt "MENU"
 msgid "Register"
 msgstr "Registar"
 
 #. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:529
+#: lib/action.php:578
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "Iniciar uma sessão"
 
 #. TRANS: Main menu option when not logged in to log in
-#: lib/action.php:532
+#: lib/action.php:581
 msgctxt "MENU"
 msgid "Login"
 msgstr "Entrar"
 
 #. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:535
+#: lib/action.php:584
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Ajudem-me!"
 
 #. TRANS: Main menu option for help on the StatusNet site
-#: lib/action.php:538
+#: lib/action.php:587
 msgctxt "MENU"
 msgid "Help"
 msgstr "Ajuda"
 
 #. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:541
+#: lib/action.php:590
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr "Procurar pessoas ou pesquisar texto"
 
 #. TRANS: Main menu option when logged in or when the StatusNet instance is not private
-#: lib/action.php:544
+#: lib/action.php:593
 msgctxt "MENU"
 msgid "Search"
 msgstr "Pesquisa"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:566 lib/adminpanelaction.php:387
+#: lib/action.php:615 lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "Aviso do site"
 
 #. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:633
+#: lib/action.php:682
 msgid "Local views"
 msgstr "Vistas locais"
 
 #. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:703
+#: lib/action.php:752
 msgid "Page notice"
 msgstr "Aviso da página"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:804
+#: lib/action.php:853
 msgid "Secondary site navigation"
 msgstr "Navegação secundária deste site"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:810
+#: lib/action.php:859
 msgid "Help"
 msgstr "Ajuda"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:813
+#: lib/action.php:862
 msgid "About"
 msgstr "Sobre"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:816
+#: lib/action.php:865
 msgid "FAQ"
 msgstr "FAQ"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:821
+#: lib/action.php:870
 msgid "TOS"
 msgstr "Termos"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:825
+#: lib/action.php:874
 msgid "Privacy"
 msgstr "Privacidade"
 
-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:828
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+#: lib/action.php:877
 msgid "Source"
 msgstr "Código fonte"
 
-#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:834
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+#: lib/action.php:884
 msgid "Contact"
 msgstr "Contacto"
 
-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:837
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+#: lib/action.php:887
 msgid "Badge"
 msgstr "Emblema"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:866
+#: lib/action.php:916
 msgid "StatusNet software license"
 msgstr "Licença de software do StatusNet"
 
@@ -6382,7 +6466,7 @@ msgstr "Licença de software do StatusNet"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:873
+#: lib/action.php:923
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -6392,7 +6476,7 @@ msgstr ""
 "broughtby%%](%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:876
+#: lib/action.php:926
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** é um serviço de microblogues."
@@ -6401,7 +6485,7 @@ msgstr "**%%site.name%%** é um serviço de microblogues."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:883
+#: lib/action.php:933
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -6413,20 +6497,20 @@ msgstr ""
 "fsf.org/licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:899
+#: lib/action.php:949
 msgid "Site content license"
 msgstr "Licença de conteúdos do site"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:906
+#: lib/action.php:956
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "O conteúdo e dados do site %1$s são privados e confidenciais."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:913
+#: lib/action.php:963
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
@@ -6434,7 +6518,7 @@ msgstr ""
 "direitos reservados."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:917
+#: lib/action.php:967
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "Direitos de autor sobre o conteúdo e dados detidos pelos contribuidores. "
@@ -6442,7 +6526,7 @@ msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:949
+#: lib/action.php:999
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
@@ -6450,19 +6534,19 @@ msgstr ""
 "licença %2$s."
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1285
+#: lib/action.php:1335
 msgid "Pagination"
 msgstr "Paginação"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1296
+#: lib/action.php:1346
 msgid "After"
 msgstr "Posteriores"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1306
+#: lib/action.php:1356
 msgid "Before"
 msgstr "Anteriores"
 
@@ -6807,7 +6891,7 @@ msgid "AJAX error"
 msgstr "Erro do Ajax"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:233 lib/mailhandler.php:142
+#: lib/channel.php:233 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "Comando terminado"
 
@@ -6823,7 +6907,7 @@ msgstr "Não existe nenhuma nota com essa identificação."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:626
+#: lib/command.php:99 lib/command.php:630
 msgid "User has no last notice."
 msgstr "Utilizador não tem nenhuma última nota."
 
@@ -6892,6 +6976,14 @@ msgstr "%1$s juntou-se ao grupo %2$s."
 msgid "%1$s left group %2$s."
 msgstr "%1$s deixou o grupo %2$s."
 
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: lib/command.php:426
+#, fuzzy, php-format
+msgctxt "WHOIS"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
 #. TRANS: Whois output. %s is the full name of the queried user.
 #: lib/command.php:430
 #, php-format
@@ -6931,133 +7023,137 @@ msgstr ""
 "%s é um perfil remoto; só pode enviar mensagens directas a utilizadores no "
 "mesmo servidor."
 
-#. TRANS: Message given if content is too long.
+#. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
 #: lib/command.php:488
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr "Mensagem demasiado extensa - máx. %1$d caracteres, enviou %2$d."
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] "Mensagem demasiado extensa - máx. %1$d caracteres, enviou %2$d."
+msgstr[1] "Mensagem demasiado extensa - máx. %1$d caracteres, enviou %2$d."
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:514
+#: lib/command.php:516
 msgid "Error sending direct message."
 msgstr "Erro no envio da mensagem directa."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:551
+#: lib/command.php:553
 #, php-format
 msgid "Notice from %s repeated."
 msgstr "Nota de %s repetida."
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:554
+#: lib/command.php:556
 msgid "Error repeating notice."
 msgstr "Erro ao repetir nota."
 
-#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:589
-#, php-format
-msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
-msgstr "Nota demasiado extensa - máx. %1$d caracteres, enviou %2$d."
+#: lib/command.php:591
+#, fuzzy, php-format
+msgid "Notice too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] "Nota demasiado extensa - máx. %1$d caracteres, enviou %2$d."
+msgstr[1] "Nota demasiado extensa - máx. %1$d caracteres, enviou %2$d."
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:600
+#: lib/command.php:604
 #, php-format
 msgid "Reply to %s sent."
 msgstr "Resposta a %s enviada."
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:603
+#: lib/command.php:607
 msgid "Error saving notice."
 msgstr "Erro ao gravar nota."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:650
+#: lib/command.php:654
 msgid "Specify the name of the user to subscribe to."
 msgstr "Introduza o nome do utilizador para subscrever."
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:659
+#: lib/command.php:663
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Não pode subscrever perfis OMB por comando."
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:667
+#: lib/command.php:671
 #, php-format
 msgid "Subscribed to %s."
 msgstr "Subscreveu %s."
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:688 lib/command.php:799
+#: lib/command.php:692 lib/command.php:803
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "Introduza o nome do utilizador para deixar de subscrever."
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:699
+#: lib/command.php:703
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr "Deixou de subscrever %s."
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:719 lib/command.php:745
+#: lib/command.php:723 lib/command.php:749
 msgid "Command not yet implemented."
 msgstr "Comando ainda não implementado."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:723
+#: lib/command.php:727
 msgid "Notification off."
 msgstr "Notificação desligada."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:726
+#: lib/command.php:730
 msgid "Can't turn off notification."
 msgstr "Não foi possível desligar a notificação."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:749
+#: lib/command.php:753
 msgid "Notification on."
 msgstr "Notificação ligada."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:752
+#: lib/command.php:756
 msgid "Can't turn on notification."
 msgstr "Não foi possível ligar a notificação."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:766
+#: lib/command.php:770
 msgid "Login command is disabled."
 msgstr "Comando para iniciar sessão foi desactivado."
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:779
+#: lib/command.php:783
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr "O link é utilizável uma única vez e só é válido durante 2 minutos: %s."
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:808
+#: lib/command.php:812
 #, php-format
 msgid "Unsubscribed %s."
 msgstr "Subscrição de %s cancelada."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:826
+#: lib/command.php:830
 msgid "You are not subscribed to anyone."
 msgstr "Não subscreveu ninguém."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:831
+#: lib/command.php:835
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Subscreveu esta pessoa:"
@@ -7065,14 +7161,14 @@ msgstr[1] "Subscreveu estas pessoas:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:853
+#: lib/command.php:857
 msgid "No one is subscribed to you."
 msgstr "Ninguém subscreve as suas notas."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:858
+#: lib/command.php:862
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Esta pessoa subscreve as suas notas:"
@@ -7080,21 +7176,21 @@ msgstr[1] "Estas pessoas subscrevem as suas notas:"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:880
+#: lib/command.php:884
 msgid "You are not a member of any groups."
 msgstr "Não está em nenhum grupo."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:885
+#: lib/command.php:889
 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:"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:900
+#: lib/command.php:904
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -7325,7 +7421,8 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 letras minúsculas ou números, sem pontuação ou espaços"
 
 #: lib/groupeditform.php:163
-msgid "URL of the homepage or blog of the group or topic"
+#, fuzzy
+msgid "URL of the homepage or blog of the group or topic."
 msgstr "URL da página ou do blogue, deste grupo ou assunto"
 
 #: lib/groupeditform.php:168
@@ -7333,19 +7430,29 @@ msgid "Describe the group or topic"
 msgstr "Descreva o grupo ou assunto"
 
 #: lib/groupeditform.php:170
-#, php-format
-msgid "Describe the group or topic in %d characters"
-msgstr "Descreva o grupo ou o assunto em %d caracteres"
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d character or less"
+msgid_plural "Describe the group or topic in %d characters or less"
+msgstr[0] "Descreva o grupo ou o assunto em %d caracteres"
+msgstr[1] "Descreva o grupo ou o assunto em %d caracteres"
 
-#: lib/groupeditform.php:179
+#: lib/groupeditform.php:182
+#, fuzzy
 msgid ""
-"Location for the group, if any, like \"City, State (or Region), Country\""
+"Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr "Localidade do grupo, se aplicável, por ex. \"Cidade, Região, País\""
 
-#: lib/groupeditform.php:187
-#, php-format
-msgid "Extra nicknames for the group, comma- or space- separated, max %d"
-msgstr ""
+#: lib/groupeditform.php:190
+#, fuzzy, php-format
+msgid ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"alias allowed."
+msgid_plural ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"aliases allowed."
+msgstr[0] ""
+"Nomes adicionais para o grupo, separados por vírgulas ou espaços, máx. %d"
+msgstr[1] ""
 "Nomes adicionais para o grupo, separados por vírgulas ou espaços, máx. %d"
 
 #. TRANS: Menu item in the group navigation page.
@@ -7902,7 +8009,7 @@ msgstr "Desculpe, esse não é o seu endereço para receber correio electrónico
 msgid "Sorry, no incoming email allowed."
 msgstr "Desculpe, não lhe é permitido receber correio electrónico."
 
-#: lib/mailhandler.php:228
+#: lib/mailhandler.php:229
 #, php-format
 msgid "Unsupported message type: %s"
 msgstr "Tipo de mensagem não suportado: %s"
@@ -8251,16 +8358,17 @@ msgid "Sandbox this user"
 msgstr "Impedir que notas deste utilizador sejam públicas"
 
 #. TRANS: Fieldset legend for the search form.
-#: lib/searchaction.php:121
+#: lib/searchaction.php:120
 msgid "Search site"
 msgstr "Pesquisar site"
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
-#: lib/searchaction.php:129
+#: lib/searchaction.php:128
 msgid "Keyword(s)"
 msgstr "Categorias"
 
+#. TRANS: Button text for searching site.
 #: lib/searchaction.php:130
 msgctxt "BUTTON"
 msgid "Search"
@@ -8351,8 +8459,8 @@ msgid "The theme file is missing or the upload failed."
 msgstr "O ficheiro do tema não foi localizado ou o upload falhou."
 
 #: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:278 lib/themeuploader.php:282
-#: lib/themeuploader.php:290 lib/themeuploader.php:297
+#: lib/themeuploader.php:279 lib/themeuploader.php:283
+#: lib/themeuploader.php:291 lib/themeuploader.php:298
 msgid "Failed saving theme."
 msgstr "Não foi possível gravar o tema."
 
@@ -8361,17 +8469,22 @@ msgid "Invalid theme: bad directory structure."
 msgstr "Tema inválido: estrutura de directórios incorrecta."
 
 #: lib/themeuploader.php:166
-#, php-format
-msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
-msgstr ""
+#, fuzzy, php-format
+msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
+msgid_plural ""
+"Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr[0] ""
+"O tema carregado é demasiado grande; tem de ter menos de %d bytes "
+"descomprimido."
+msgstr[1] ""
 "O tema carregado é demasiado grande; tem de ter menos de %d bytes "
 "descomprimido."
 
-#: lib/themeuploader.php:178
+#: lib/themeuploader.php:179
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr "Arquivo do tema inválido: falta o ficheiro css/display.css"
 
-#: lib/themeuploader.php:218
+#: lib/themeuploader.php:219
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
@@ -8379,16 +8492,16 @@ msgstr ""
 "Tema contém um nome de ficheiro ou de directório inválido. Use somente "
 "letras ASCII, algarismos, sublinhados e o sinal de menos."
 
-#: lib/themeuploader.php:224
+#: lib/themeuploader.php:225
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr "O tema contém extensões de ficheiro inseguras; pode não ser seguro."
 
-#: lib/themeuploader.php:241
+#: lib/themeuploader.php:242
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr "Tema contém um ficheiro do tipo '.%s', o que não é permitido."
 
-#: lib/themeuploader.php:259
+#: lib/themeuploader.php:260
 msgid "Error opening theme archive."
 msgstr "Ocorreu um erro ao abrir o arquivo do tema."
 
@@ -8569,23 +8682,39 @@ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
 msgstr[0] "Mensagem demasiado extensa - máx. %1$d caracteres, enviou %2$d."
 msgstr[1] "Mensagem demasiado extensa - máx. %1$d caracteres, enviou %2$d."
 
-#: scripts/restoreuser.php:82
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: scripts/restoreuser.php:61
 #, php-format
-msgid "Backup file for user %s (%s)"
+msgid "Getting backup from file '%s'."
 msgstr ""
 
-#: scripts/restoreuser.php:88
+#. TRANS: Commandline script output.
+#: scripts/restoreuser.php:91
 #, fuzzy
 msgid "No user specified; using backup user."
 msgstr "Não foi especificado um ID de utilizador."
 
-#: scripts/restoreuser.php:94
+#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
+#: scripts/restoreuser.php:98
 #, php-format
-msgid "%d entries in backup."
-msgstr ""
+msgid "%d entry in backup."
+msgid_plural "%d entries in backup."
+msgstr[0] ""
+msgstr[1] ""
+
+#, fuzzy
+#~ msgid "Name is too long (maximum 255 chars)."
+#~ msgstr "Nome é demasiado longo (máx. 255 caracteres)."
+
+#, fuzzy
+#~ msgid "Organization is too long (maximum 255 chars)."
+#~ msgstr "Organização é demasiado longa (máx. 255 caracteres)."
+
+#~ msgid "That's too long. Max notice size is %d chars."
+#~ msgstr "Demasiado longo. Tamanho máx. das notas é %d caracteres."
 
-#~ msgid "Description is too long (max %d chars)."
-#~ msgstr "Descrição demasiado longa (máx. %d caracteres)."
+#~ msgid "Max notice size is %d chars, including attachment URL."
+#~ msgstr "Tamanho máx. das notas é %d caracteres, incluindo a URL do anexo."
 
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "Demasiados nomes alternativos! Máx. %d."
+#~ msgid " tagged %s"
+#~ msgstr "  categorizou %s"
diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po
index c884667c1..4b84ec3ab 100644
--- a/locale/pt_BR/LC_MESSAGES/statusnet.po
+++ b/locale/pt_BR/LC_MESSAGES/statusnet.po
@@ -15,18 +15,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-30 23:18+0000\n"
-"PO-Revision-Date: 2010-10-30 23:20:43+0000\n"
+"POT-Creation-Date: 2010-11-02 22:51+0000\n"
+"PO-Revision-Date: 2010-11-02 22:53:41+0000\n"
 "Language-Team: Brazilian Portuguese <http://translatewiki.net/wiki/Portal:pt-"
 "br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r75708); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r75875); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-POT-Import-Date: 2010-10-30 09:48:40+0000\n"
+"X-POT-Import-Date: 2010-10-30 23:42:01+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -83,15 +83,20 @@ msgstr "Salvar as configurações de acesso"
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
+#. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
+#. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #: actions/accessadminpanel.php:193 actions/emailsettings.php:228
-#: actions/imsettings.php:187 actions/pathsadminpanel.php:512
-#: actions/profilesettings.php:201 actions/smssettings.php:209
-#: actions/subscriptions.php:246 lib/applicationeditform.php:355
+#: actions/imsettings.php:187 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: lib/applicationeditform.php:355 lib/groupeditform.php:207
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Salvar"
@@ -142,7 +147,7 @@ msgstr "Esta página não existe."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:495 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Este usuário não existe."
@@ -215,7 +220,9 @@ msgstr ""
 
 #. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:208
+#. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -338,7 +345,7 @@ msgstr "Não foi possível salvar o perfil."
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
 #: actions/designadminpanel.php:125 actions/editapplication.php:121
 #: actions/newapplication.php:104 actions/newnotice.php:95
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
 "current configuration."
@@ -346,7 +353,7 @@ msgid_plural ""
 "The server was unable to handle that much POST data (%s bytes) due to its "
 "current configuration."
 msgstr[0] ""
-"O servidor não conseguiu manipular a quantidade de dados do POST (%s bytes) "
+"O servidor não conseguiu manipular a quantidade de dados do POST (%s byte) "
 "devido à sua configuração atual."
 msgstr[1] ""
 "O servidor não conseguiu manipular a quantidade de dados do POST (%s bytes) "
@@ -422,11 +429,11 @@ msgstr "Nenhuma mensagem de texto!"
 #. TRANS: Form validation error displayed when message content is too long.
 #. TRANS: %d is the maximum number of characters for a message.
 #: actions/apidirectmessagenew.php:127 actions/newmessage.php:152
-#, fuzzy, php-format
+#, php-format
 msgid "That's too long. Maximum message size is %d character."
 msgid_plural "That's too long. Maximum message size is %d characters."
 msgstr[0] ""
-"Isso é muito extenso. O tamanho máximo das mensagens é %d caracteres."
+"Isso é muito extenso. O tamanho máximo das mensagens é %d caractere."
 msgstr[1] ""
 "Isso é muito extenso. O tamanho máximo das mensagens é %d caracteres."
 
@@ -444,7 +451,6 @@ msgstr ""
 
 #. TRANS: Client error displayed trying to direct message self (403).
 #: actions/apidirectmessagenew.php:154
-#, fuzzy
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -567,9 +573,8 @@ msgstr "A URL informada não é válida."
 #: actions/apigroupcreate.php:210 actions/editgroup.php:211
 #: actions/newgroup.php:147 actions/profilesettings.php:256
 #: actions/register.php:227
-#, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
-msgstr "Nome completo muito extenso (máx. 255 caracteres)"
+msgstr "O nome completo é muito extenso (máx. 255 caracteres)"
 
 #. TRANS: Client error shown when providing too long a description during group creation.
 #. TRANS: %d is the maximum number of allowed characters.
@@ -577,13 +582,16 @@ msgstr "Nome completo muito extenso (máx. 255 caracteres)"
 #. TRANS: Group edit form validation error.
 #. TRANS: Form validation error in New application form.
 #. TRANS: %d is the maximum number of characters for the description.
+#. TRANS: Group create form validation error.
+#. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:220 actions/editapplication.php:201
 #: actions/editgroup.php:216 actions/newapplication.php:178
-#, fuzzy, php-format
+#: actions/newgroup.php:152
+#, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
-msgstr[0] "Descrição muito extensa (máximo %d caracteres)."
-msgstr[1] "Descrição muito extensa (máximo %d caracteres)."
+msgstr[0] "A descrição é muito extensa (máximo %d caractere)."
+msgstr[1] "A descrição é muito extensa (máximo %d caracteres)."
 
 #. TRANS: Client error shown when providing too long a location during group creation.
 #. TRANS: Group edit form validation error.
@@ -592,9 +600,8 @@ msgstr[1] "Descrição muito extensa (máximo %d caracteres)."
 #: actions/apigroupcreate.php:234 actions/editgroup.php:223
 #: actions/newgroup.php:159 actions/profilesettings.php:269
 #: actions/register.php:236
-#, fuzzy
 msgid "Location is too long (maximum 255 characters)."
-msgstr "Localização muito extensa (máx. 255 caracteres)."
+msgstr "A localização é muito extensa (máx. 255 caracteres)."
 
 #. TRANS: Client error shown when providing too many aliases during group creation.
 #. TRANS: %d is the maximum number of allowed aliases.
@@ -738,14 +745,14 @@ msgstr "Você não está autorizado."
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:172 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:74
 #: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
 #: actions/groupunblock.php:65 actions/imsettings.php:230
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
-#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/othersettings.php:153 actions/passwordsettings.php:138
 #: actions/profilesettings.php:221 actions/recoverpassword.php:350
 #: actions/register.php:172 actions/remotesubscribe.php:77
 #: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
@@ -929,20 +936,21 @@ msgstr "Você não pode excluir uma mensagem de outro usuário."
 
 #. TRANS: Client error displayed trying to repeat a non-existing notice through the API.
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
+#. TRANS: Error message displayed trying to delete a non-existing notice.
 #: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/deletenotice.php:58 actions/shownotice.php:92
+#: actions/deletenotice.php:61 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "Essa mensagem não existe."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:535
+#: actions/apistatusesretweet.php:83 lib/command.php:537
 msgid "Cannot repeat your own notice."
 msgstr "Você não pode repetir a sua própria mensagem."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:541
+#: actions/apistatusesretweet.php:92 lib/command.php:543
 msgid "Already repeated that notice."
 msgstr "Você já repetiu essa mensagem."
 
@@ -963,7 +971,8 @@ msgstr "O cliente tem de fornecer um parâmetro 'status' com um valor."
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#: actions/apistatusesupdate.php:244
+#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
+#: lib/mailhandler.php:60
 #, fuzzy, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
@@ -978,7 +987,7 @@ msgstr "O método da API não foi encontrado!"
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
-#: actions/apistatusesupdate.php:308
+#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
 #, fuzzy, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
@@ -1189,17 +1198,18 @@ msgstr "Selecione uma área quadrada da imagem para ser seu avatar"
 msgid "Lost our file data."
 msgstr "Os dados do nosso arquivo foram perdidos."
 
-#: actions/avatarsettings.php:384
+#. TRANS: Success message for having updated a user avatar.
+#: actions/avatarsettings.php:385
 msgid "Avatar updated."
 msgstr "O avatar foi atualizado."
 
 #. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
-#: actions/avatarsettings.php:388
+#: actions/avatarsettings.php:389
 msgid "Failed updating avatar."
 msgstr "Não foi possível atualizar o avatar."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:412
+#: actions/avatarsettings.php:413
 msgid "Avatar deleted."
 msgstr "O avatar foi excluído."
 
@@ -1232,8 +1242,8 @@ msgstr ""
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:154 actions/deleteapplication.php:154
-#: actions/deletegroup.php:220 actions/deletenotice.php:150
+#: actions/block.php:154 actions/deleteapplication.php:157
+#: actions/deletegroup.php:220 actions/deletenotice.php:155
 #: actions/deleteuser.php:152 actions/groupblock.php:178
 msgctxt "BUTTON"
 msgid "No"
@@ -1251,8 +1261,8 @@ msgstr "Não bloquear este usuário"
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:161 actions/deleteapplication.php:161
-#: actions/deletegroup.php:227 actions/deletenotice.php:157
+#: actions/block.php:161 actions/deleteapplication.php:164
+#: actions/deletegroup.php:227 actions/deletenotice.php:162
 #: actions/deleteuser.php:159 actions/groupblock.php:185
 msgctxt "BUTTON"
 msgid "Yes"
@@ -1369,12 +1379,13 @@ msgstr "Esse endereço já foi confirmado."
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
 #. TRANS: Server error thrown on database error updating IM preferences.
 #. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
 #. TRANS: Server error thrown when user profile settings could not be updated.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #: actions/confirmaddress.php:118 actions/emailsettings.php:331
 #: actions/emailsettings.php:477 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:174
+#: actions/imsettings.php:442 actions/othersettings.php:184
 #: actions/profilesettings.php:326 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
@@ -1410,16 +1421,19 @@ msgstr "Conversa"
 msgid "Notices"
 msgstr "Mensagens"
 
-#: actions/deleteapplication.php:63
+#. TRANS: Client error displayed trying to delete an application while not logged in.
+#: actions/deleteapplication.php:62
 msgid "You must be logged in to delete an application."
 msgstr "Você precisa estar autenticado para excluir uma aplicação."
 
+#. TRANS: Client error displayed trying to delete an application that does not exist.
 #: actions/deleteapplication.php:71
 msgid "Application not found."
 msgstr "A aplicação não foi encontrada."
 
+#. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
-#: actions/deleteapplication.php:78 actions/editapplication.php:78
+#: actions/deleteapplication.php:79 actions/editapplication.php:78
 #: actions/showapplication.php:94
 msgid "You are not the owner of this application."
 msgstr "Você não é o dono desta aplicação."
@@ -1427,15 +1441,18 @@ msgstr "Você não é o dono desta aplicação."
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
 #: actions/newapplication.php:114 actions/showapplication.php:118
-#: lib/action.php:1354
+#: lib/action.php:1404
 msgid "There was a problem with your session token."
 msgstr "Ocorreu um problema com o seu token de sessão."
 
-#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+#. TRANS: Title for delete application page.
+#. TRANS: Fieldset legend on delete application page.
+#: actions/deleteapplication.php:124 actions/deleteapplication.php:149
 msgid "Delete application"
 msgstr "Excluir a aplicação"
 
-#: actions/deleteapplication.php:149
+#. TRANS: Confirmation text on delete application page.
+#: actions/deleteapplication.php:152
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
 "about the application from the database, including all existing user "
@@ -1446,12 +1463,12 @@ msgstr ""
 "com os usuários."
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:158
+#: actions/deleteapplication.php:161
 msgid "Do not delete this application"
 msgstr "Não excluir esta aplicação"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:164
+#: actions/deleteapplication.php:167
 msgid "Delete this application"
 msgstr "Excluir esta aplicação"
 
@@ -1487,13 +1504,14 @@ msgstr "Não foi possível atualizar o grupo."
 msgid "Deleted group %s"
 msgstr "%1$s deixou o grupo %2$s"
 
-#. TRANS: Title.
+#. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
 #: actions/deletegroup.php:176 actions/deletegroup.php:202
 #, fuzzy
 msgid "Delete group"
 msgstr "Excluir usuário"
 
+#. TRANS: Warning in form for deleleting a group.
 #: actions/deletegroup.php:206
 #, fuzzy
 msgid ""
@@ -1516,10 +1534,11 @@ msgstr "Não excluir esta mensagem."
 msgid "Delete this group"
 msgstr "Excluir este usuário"
 
+#. TRANS: Error message displayed trying to delete a notice while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1529,11 +1548,13 @@ msgstr "Excluir este usuário"
 msgid "Not logged in."
 msgstr "Você não está autenticado."
 
-#: actions/deletenotice.php:74
+#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
+#: actions/deletenotice.php:78
 msgid "Can't delete this notice."
 msgstr "Não é possível excluir esta mensagem."
 
-#: actions/deletenotice.php:106
+#. TRANS: Instructions for deleting a notice.
+#: actions/deletenotice.php:110
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
@@ -1541,21 +1562,24 @@ msgstr ""
 "Você está prestes a excluir permanentemente uma mensagem. Isso não poderá "
 "ser desfeito."
 
-#: actions/deletenotice.php:112 actions/deletenotice.php:144
+#. TRANS: Page title when deleting a notice.
+#. TRANS: Fieldset legend for the delete notice form.
+#: actions/deletenotice.php:117 actions/deletenotice.php:148
 msgid "Delete notice"
 msgstr "Excluir a mensagem"
 
-#: actions/deletenotice.php:147
+#. TRANS: Message for the delete notice form.
+#: actions/deletenotice.php:152
 msgid "Are you sure you want to delete this notice?"
 msgstr "Tem certeza que deseja excluir esta mensagem?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:154
+#: actions/deletenotice.php:159
 msgid "Do not delete this notice"
 msgstr "Não excluir esta mensagem."
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:161 lib/noticelist.php:667
+#: actions/deletenotice.php:166 lib/noticelist.php:667
 msgid "Delete this notice"
 msgstr "Excluir esta mensagem"
 
@@ -1721,11 +1745,9 @@ msgstr "Restaura de volta ao padrão"
 
 #. TRANS: Submit button title.
 #: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
-#: actions/othersettings.php:126 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: actions/useradminpanel.php:295 lib/applicationeditform.php:357
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: lib/applicationeditform.php:357 lib/designsettings.php:256
 msgid "Save"
 msgstr "Salvar"
 
@@ -1773,9 +1795,9 @@ msgid "Name is required."
 msgstr "O nome é obrigatório."
 
 #. TRANS: Validation error shown when providing too long a name in the "Edit application" form.
-#: actions/editapplication.php:188
+#: actions/editapplication.php:188 actions/newapplication.php:169
 #, fuzzy
-msgid "Name is too long (max 255 characters)."
+msgid "Name is too long (maximum 255 characters)."
 msgstr "O nome é muito extenso (máx. 255 caracteres)."
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
@@ -1804,7 +1826,7 @@ msgid "Organization is required."
 msgstr "A organização é obrigatória."
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#: actions/editapplication.php:223
+#: actions/editapplication.php:223 actions/newapplication.php:199
 #, fuzzy
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "A organização é muito extensa (máx. 255 caracteres)."
@@ -2609,7 +2631,7 @@ msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Publique um MicroID para meu endereço de Jabber/Gtalk."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:180
+#: actions/imsettings.php:290 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "As preferências foram salvas."
 
@@ -2735,10 +2757,9 @@ msgstr[1] "Você já está assinando esses usuários:"
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#. TRANS: Whois output.
-#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:145 actions/invite.php:159 lib/command.php:426
-#, php-format
+#: actions/invite.php:145 actions/invite.php:159
+#, fuzzy, php-format
+msgctxt "INVITE"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
@@ -2921,8 +2942,10 @@ msgid ""
 msgstr ""
 
 #: actions/licenseadminpanel.php:156
-msgid "Invalid license title. Max length is 255 characters."
+#, fuzzy
+msgid "Invalid license title. Maximum length is 255 characters."
 msgstr ""
+"Mensagem de boas vindas inválida. O comprimento máximo é de 255 caracteres."
 
 #: actions/licenseadminpanel.php:168
 msgid "Invalid license URL."
@@ -3097,20 +3120,10 @@ msgstr "Você deve estar autenticado para registrar uma aplicação."
 msgid "Use this form to register a new application."
 msgstr "Utilize este formulário para registrar uma nova aplicação."
 
-#: actions/newapplication.php:169
-#, fuzzy
-msgid "Name is too long (maximum 255 chars)."
-msgstr "O nome é muito extenso (máx. 255 caracteres)."
-
 #: actions/newapplication.php:184
 msgid "Source URL is required."
 msgstr "A URL da fonte é obrigatória."
 
-#: actions/newapplication.php:199
-#, fuzzy
-msgid "Organization is too long (maximum 255 chars)."
-msgstr "A organização é muito extensa (máx. 255 caracteres)."
-
 #: actions/newapplication.php:266 actions/newapplication.php:275
 msgid "Could not create application."
 msgstr "Não foi possível criar a aplicação."
@@ -3130,14 +3143,14 @@ msgid "New message"
 msgstr "Nova mensagem"
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:499
+#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501
 msgid "You can't send a message to this user."
 msgstr "Você não pode enviar mensagens para este usuário."
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
 #: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
-#: lib/command.php:579
+#: lib/command.php:581
 msgid "No content!"
 msgstr "Nenhum conteúdo!"
 
@@ -3146,7 +3159,7 @@ msgid "No recipient specified."
 msgstr "Não foi especificado nenhum destinatário."
 
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:503
+#: actions/newmessage.php:167 lib/command.php:505
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -3159,12 +3172,12 @@ msgstr "A mensagem foi enviada"
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:511
+#: actions/newmessage.php:188 lib/command.php:513
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "A mensagem direta para %s foi enviada."
 
-#: actions/newmessage.php:213 actions/newnotice.php:263
+#: actions/newmessage.php:213 actions/newnotice.php:264
 msgid "Ajax Error"
 msgstr "Erro no Ajax"
 
@@ -3172,17 +3185,7 @@ msgstr "Erro no Ajax"
 msgid "New notice"
 msgstr "Nova mensagem"
 
-#: actions/newnotice.php:159 lib/mailhandler.php:60
-#, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr "Está muito extenso. O tamanho máximo é de %d caracteres."
-
-#: actions/newnotice.php:183
-#, php-format
-msgid "Max notice size is %d chars, including attachment URL."
-msgstr "O tamanho máximo da mensagem é de %d caracteres"
-
-#: actions/newnotice.php:229
+#: actions/newnotice.php:230
 msgid "Notice posted"
 msgstr "A mensagem foi publicada"
 
@@ -3352,36 +3355,46 @@ msgstr "Procurar pessoas"
 msgid "Notice Search"
 msgstr "Procurar mensagens"
 
-#: actions/othersettings.php:60
+#: actions/othersettings.php:59
 msgid "Other settings"
 msgstr "Outras configurações"
 
+#. TRANS: Instructions for tab "Other" in user profile settings.
 #: actions/othersettings.php:71
 msgid "Manage various other options."
 msgstr "Gerencia várias outras opções."
 
-#: actions/othersettings.php:108
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/othersettings.php:111
 msgid " (free service)"
 msgstr " (serviço livre)"
 
-#: actions/othersettings.php:116
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/othersettings.php:120
 msgid "Shorten URLs with"
 msgstr "Encolher URLs com"
 
-#: actions/othersettings.php:117
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/othersettings.php:122
 msgid "Automatic shortening service to use."
 msgstr "Serviço de encolhimento automático a ser utilizado."
 
-#: actions/othersettings.php:122
+#. TRANS: Label for checkbox.
+#: actions/othersettings.php:128
 msgid "View profile designs"
 msgstr "Visualizar aparências do perfil"
 
-#: actions/othersettings.php:123
+#. TRANS: Tooltip for checkbox.
+#: actions/othersettings.php:130
 msgid "Show or hide profile designs."
 msgstr "Exibir ou esconder as aparências do perfil."
 
-#: actions/othersettings.php:153
-msgid "URL shortening service is too long (max 50 chars)."
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/othersettings.php:162
+#, fuzzy
+msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "O serviço de encolhimento de URL é muito extenso (máx. 50 caracteres)."
 
 #: actions/otp.php:69
@@ -3873,7 +3886,7 @@ msgstr "Descrição"
 #. TRANS: Label for group location (dt). Text hidden by default.
 #: actions/profilesettings.php:149 actions/register.php:485
 #: actions/showgroup.php:267 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:177
+#: actions/userauthorization.php:166 lib/groupeditform.php:180
 #: lib/userprofile.php:165
 msgid "Location"
 msgstr "Localização"
@@ -4216,7 +4229,8 @@ msgid "Unexpected password reset."
 msgstr "Restauração inesperada da senha."
 
 #: actions/recoverpassword.php:365
-msgid "Password must be 6 chars or more."
+#, fuzzy
+msgid "Password must be 6 characters or more."
 msgstr "A senha deve ter 6 ou mais caracteres."
 
 #: actions/recoverpassword.php:369
@@ -4595,7 +4609,7 @@ msgstr "Organização"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:172
+#: lib/applicationeditform.php:208 lib/groupeditform.php:175
 msgid "Description"
 msgstr "Descrição"
 
@@ -4746,7 +4760,7 @@ msgid "Note"
 msgstr "Mensagem"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:298 lib/groupeditform.php:184
+#: actions/showgroup.php:298 lib/groupeditform.php:187
 msgid "Aliases"
 msgstr "Apelidos"
 
@@ -4879,49 +4893,69 @@ msgstr "Mensagem de %1$s no %2$s"
 msgid "Notice deleted."
 msgstr "A mensagem excluída."
 
-#: actions/showstream.php:72
-#, php-format
-msgid " tagged %s"
-msgstr " etiquetada %s"
+#. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
+#: actions/showstream.php:70
+#, fuzzy, php-format
+msgid "%1$s tagged %2$s"
+msgstr "%1$s, pág. %2$d"
 
-#: actions/showstream.php:78
+#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#: actions/showstream.php:74
+#, fuzzy, php-format
+msgid "%1$s tagged %2$s, page %3$d"
+msgstr "Mensagens etiquetadas com %1$s, pág. %2$d"
+
+#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$d is the page number.
+#: actions/showstream.php:82
 #, php-format
 msgid "%1$s, page %2$d"
 msgstr "%1$s, pág. %2$d"
 
-#: actions/showstream.php:120
+#. TRANS: Title for link to notice feed.
+#. TRANS: %1$s is a user nickname, %2$s is a hashtag.
+#: actions/showstream.php:127
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Fonte de mensagens de %1$s etiquetada como %2$s (RSS 1.0)"
 
-#: actions/showstream.php:127
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:136
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "Fonte de mensagens de %s (RSS 1.0)"
 
-#: actions/showstream.php:134
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:145
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "Fonte de mensagens de %s (RSS 2.0)"
 
-#: actions/showstream.php:141
+#: actions/showstream.php:152
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "Fonte de mensagens de %s (Atom)"
 
-#: actions/showstream.php:146
+#. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
+#. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
+#: actions/showstream.php:159
 #, php-format
 msgid "FOAF for %s"
 msgstr "FOAF de %s"
 
-#: actions/showstream.php:197
-#, php-format
-msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
+#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
+#: actions/showstream.php:211
+#, fuzzy, php-format
+msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr ""
 "Este é o fluxo público de mensagens de %1$s, mas %2$s não publicou nada "
 "ainda."
 
-#: actions/showstream.php:202
+#. TRANS: Second sentence of empty list message for a stream for the user themselves.
+#: actions/showstream.php:217
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -4929,7 +4963,9 @@ msgstr ""
 "Viu alguma coisa interessante recentemente? Você ainda não publicou nenhuma "
 "mensagem. Que tal começar agora? :)"
 
-#: actions/showstream.php:204
+#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:221
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -4938,7 +4974,9 @@ msgstr ""
 "Seja o primeiro a [publicar sobre este tópico](%%%%action.newnotice%%%%?"
 "status_textarea=%s)!"
 
-#: actions/showstream.php:243
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:264
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4952,7 +4990,9 @@ msgstr ""
 "acompanhar as mensagens de **%s** e muito mais! ([Saiba mais](%%%%doc.help%%%"
 "%))"
 
-#: actions/showstream.php:248
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:271
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4963,7 +5003,8 @@ msgstr ""
 "pt.wikipedia.org/wiki/Micro-blogging) baseado no software livre [StatusNet]"
 "(http://status.net/). "
 
-#: actions/showstream.php:305
+#. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
+#: actions/showstream.php:328
 #, php-format
 msgid "Repeat of %s"
 msgstr "Repetição de %s"
@@ -5077,31 +5118,40 @@ msgstr ""
 "Quanto tempo (em segundos) os usuários devem esperar para publicar a mesma "
 "coisa novamente."
 
-#: actions/sitenoticeadminpanel.php:56
+#. TRANS: Page title for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:55
 msgid "Site Notice"
 msgstr "Avisos do site"
 
-#: actions/sitenoticeadminpanel.php:67
+#. TRANS: Instructions for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:66
 msgid "Edit site-wide message"
 msgstr "Editar os avisos do site (exibidos em todas as páginas)"
 
-#: actions/sitenoticeadminpanel.php:103
+#. TRANS: Server error displayed when saving a site-wide notice was impossible.
+#: actions/sitenoticeadminpanel.php:101
 msgid "Unable to save site notice."
 msgstr "Não foi possível salvar os avisos do site."
 
-#: actions/sitenoticeadminpanel.php:113
-msgid "Max length for the site-wide notice is 255 chars."
+#. TRANS: Client error displayed when a site-wide notice was longer than allowed.
+#: actions/sitenoticeadminpanel.php:112
+#, fuzzy
+msgid "Maximum length for the site-wide notice is 255 characters."
 msgstr "O tamanho máximo para os avisos é de 255 caracteres."
 
+#. TRANS: Label for site-wide notice text field in admin panel.
 #: actions/sitenoticeadminpanel.php:176
 msgid "Site notice text"
 msgstr "Texto dos avisos"
 
-#: actions/sitenoticeadminpanel.php:178
-msgid "Site-wide notice text (255 chars max; HTML okay)"
+#. TRANS: Tooltip for site-wide notice text field in admin panel.
+#: actions/sitenoticeadminpanel.php:179
+#, fuzzy
+msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr "Texto dos avisos do site (no máximo 255 caracteres; pode usar HTML)"
 
-#: actions/sitenoticeadminpanel.php:198
+#. TRANS: Title for button to save site notice in admin panel.
+#: actions/sitenoticeadminpanel.php:201
 msgid "Save site notice"
 msgstr "Salvar os avisos do site"
 
@@ -5565,76 +5615,94 @@ msgstr ""
 "do site."
 
 #. TRANS: User admin panel title
-#: actions/useradminpanel.php:60
+#: actions/useradminpanel.php:58
 msgctxt "TITLE"
 msgid "User"
 msgstr "Usuário"
 
-#: actions/useradminpanel.php:71
+#. TRANS: Instruction for user admin panel.
+#: actions/useradminpanel.php:69
 msgid "User settings for this StatusNet site"
 msgstr ""
 
-#: actions/useradminpanel.php:150
+#. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
+#: actions/useradminpanel.php:147
 msgid "Invalid bio limit. Must be numeric."
 msgstr "Limite da descrição inválido. Seu valor deve ser numérico."
 
-#: actions/useradminpanel.php:156
-msgid "Invalid welcome text. Max length is 255 characters."
+#. TRANS: Form validation error in user admin panel when welcome text is too long.
+#: actions/useradminpanel.php:154
+#, fuzzy
+msgid "Invalid welcome text. Maximum length is 255 characters."
 msgstr ""
 "Mensagem de boas vindas inválida. O comprimento máximo é de 255 caracteres."
 
+#. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
+#. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
-#, php-format
-msgid "Invalid default subscripton: '%1$s' is not user."
+#, fuzzy, php-format
+msgid "Invalid default subscripton: '%1$s' is not a user."
 msgstr "Assinatura padrão inválida: '%1$s' não é um usuário."
 
 #. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:106
+#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
 #: lib/personalgroupnav.php:109
 msgid "Profile"
 msgstr "Perfil"
 
-#: actions/useradminpanel.php:223
+#. TRANS: Field label in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:220
 msgid "Bio Limit"
 msgstr "Limite da descrição"
 
-#: actions/useradminpanel.php:224
+#. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:222
 msgid "Maximum length of a profile bio in characters."
 msgstr "Comprimento máximo da descrição do perfil, em caracteres."
 
-#: actions/useradminpanel.php:232
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:231
 msgid "New users"
 msgstr "Novos usuários"
 
+#. TRANS: Field label in user admin panel for setting new user welcome text.
 #: actions/useradminpanel.php:236
 msgid "New user welcome"
 msgstr "Boas vindas aos novos usuários"
 
-#: actions/useradminpanel.php:237
-msgid "Welcome text for new users (Max 255 chars)."
+#. TRANS: Tooltip in user admin panel for setting new user welcome text.
+#: actions/useradminpanel.php:238
+#, fuzzy
+msgid "Welcome text for new users (maximum 255 characters)."
 msgstr "Texto de boas vindas para os novos usuários (máx. 255 caracteres)."
 
-#: actions/useradminpanel.php:242
+#. TRANS: Field label in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:244
 msgid "Default subscription"
 msgstr "Assinatura padrão"
 
-#: actions/useradminpanel.php:243
+#. TRANS: Tooltip in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:246
 msgid "Automatically subscribe new users to this user."
 msgstr "Os novos usuários assinam esse usuário automaticamente."
 
-#: actions/useradminpanel.php:252
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:256
 msgid "Invitations"
 msgstr "Convites"
 
-#: actions/useradminpanel.php:257
+#. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:262
 msgid "Invitations enabled"
 msgstr "Convites habilitados"
 
-#: actions/useradminpanel.php:259
+#. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:265
 msgid "Whether to allow users to invite new users."
 msgstr "Define se os usuários podem ou não convidar novos usuários."
 
-#: actions/useradminpanel.php:295
+#. TRANS: Title for button to save user settings in user admin panel.
+#: actions/useradminpanel.php:302
 msgid "Save user settings"
 msgstr ""
 
@@ -5847,7 +5915,7 @@ msgid "Plugins"
 msgstr "Plugins"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:831
+#: actions/version.php:198 lib/action.php:880
 msgid "Version"
 msgstr "Versão"
 
@@ -6056,16 +6124,23 @@ msgstr "Não foi possível salvar a informação do grupo local."
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
+#. TRANS: Full name of a profile or group followed by nickname in parens
+#: classes/Profile.php:164
+#, fuzzy, php-format
+msgctxt "FANCYNAME"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:791
+#: classes/Profile.php:812
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr "Não é possível revogar a função \"%1$s\" do usuário #%2$d; não existe."
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:800
+#: classes/Profile.php:821
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6212,194 +6287,201 @@ msgstr "%1$s - %2$s"
 msgid "Untitled page"
 msgstr "Página sem título"
 
+#. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
+#: lib/action.php:310
+msgctxt "TOOLTIP"
+msgid "Show more"
+msgstr ""
+
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:477
+#: lib/action.php:526
 msgid "Primary site navigation"
 msgstr "Navegação primária no site"
 
 #. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:483
+#: lib/action.php:532
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "Perfil pessoal e fluxo de mensagens dos amigos"
 
 #. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:486
+#: lib/action.php:535
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Pessoal"
 
 #. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:488
+#: lib/action.php:537
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
 msgstr "Altere seu e-mail, avatar, senha, perfil"
 
 #. TRANS: Main menu option when logged in for access to user settings
-#: lib/action.php:491
+#: lib/action.php:540
 msgid "Account"
 msgstr "Conta"
 
 #. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:493
+#: lib/action.php:542
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "Conecte-se a outros serviços"
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:496
+#: lib/action.php:545
 msgid "Connect"
 msgstr "Conectar"
 
 #. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:499
+#: lib/action.php:548
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "Altere as configurações do site"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:502 lib/groupnav.php:117
+#: lib/action.php:551 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Administrar"
 
 #. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:506
+#: lib/action.php:555
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Convide seus amigos e colegas para unir-se a você no %s"
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:509
+#: lib/action.php:558
 msgctxt "MENU"
 msgid "Invite"
 msgstr "Convidar"
 
 #. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:515
+#: lib/action.php:564
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "Sair do site"
 
 #. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:518
+#: lib/action.php:567
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Sair"
 
 #. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:523
+#: lib/action.php:572
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "Criar uma conta"
 
 #. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:526
+#: lib/action.php:575
 msgctxt "MENU"
 msgid "Register"
 msgstr "Registrar-se"
 
 #. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:529
+#: lib/action.php:578
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "Autentique-se no site"
 
 #. TRANS: Main menu option when not logged in to log in
-#: lib/action.php:532
+#: lib/action.php:581
 msgctxt "MENU"
 msgid "Login"
 msgstr "Entrar"
 
 #. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:535
+#: lib/action.php:584
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Ajudem-me!"
 
 #. TRANS: Main menu option for help on the StatusNet site
-#: lib/action.php:538
+#: lib/action.php:587
 msgctxt "MENU"
 msgid "Help"
 msgstr "Ajuda"
 
 #. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:541
+#: lib/action.php:590
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr "Procure por pessoas ou textos"
 
 #. TRANS: Main menu option when logged in or when the StatusNet instance is not private
-#: lib/action.php:544
+#: lib/action.php:593
 msgctxt "MENU"
 msgid "Search"
 msgstr "Pesquisar"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:566 lib/adminpanelaction.php:387
+#: lib/action.php:615 lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "Avisos do site"
 
 #. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:633
+#: lib/action.php:682
 msgid "Local views"
 msgstr "Visualizações locais"
 
 #. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:703
+#: lib/action.php:752
 msgid "Page notice"
 msgstr "Notícia da página"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:804
+#: lib/action.php:853
 msgid "Secondary site navigation"
 msgstr "Navegação secundária no site"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:810
+#: lib/action.php:859
 msgid "Help"
 msgstr "Ajuda"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:813
+#: lib/action.php:862
 msgid "About"
 msgstr "Sobre"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:816
+#: lib/action.php:865
 msgid "FAQ"
 msgstr "FAQ"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:821
+#: lib/action.php:870
 msgid "TOS"
 msgstr "Termos de uso"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:825
+#: lib/action.php:874
 msgid "Privacy"
 msgstr "Privacidade"
 
-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:828
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+#: lib/action.php:877
 msgid "Source"
 msgstr "Fonte"
 
-#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:834
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+#: lib/action.php:884
 msgid "Contact"
 msgstr "Contato"
 
-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:837
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+#: lib/action.php:887
 msgid "Badge"
 msgstr "Mini-aplicativo"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:866
+#: lib/action.php:916
 msgid "StatusNet software license"
 msgstr "Licença do software StatusNet"
 
@@ -6407,7 +6489,7 @@ msgstr "Licença do software StatusNet"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:873
+#: lib/action.php:923
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -6417,7 +6499,7 @@ msgstr ""
 "broughtby%%](%%site.broughtbyurl%%). "
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:876
+#: lib/action.php:926
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** é um serviço de microblog."
@@ -6426,7 +6508,7 @@ msgstr "**%%site.name%%** é um serviço de microblog."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:883
+#: lib/action.php:933
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -6438,26 +6520,26 @@ msgstr ""
 "fsf.org/licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:899
+#: lib/action.php:949
 msgid "Site content license"
 msgstr "Licença do conteúdo do site"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:906
+#: lib/action.php:956
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "O conteúdo e os dados de %1$s são privados e confidenciais."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:913
+#: lib/action.php:963
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr "Conteúdo e dados licenciados sob %1$s. Todos os direitos reservados."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:917
+#: lib/action.php:967
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "Conteúdo e dados licenciados pelos colaboradores. Todos os direitos "
@@ -6465,25 +6547,25 @@ msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:949
+#: lib/action.php:999
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr "Todo o conteúdo e dados de %1$s estão disponíveis sob a licença %2$s."
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1285
+#: lib/action.php:1335
 msgid "Pagination"
 msgstr "Paginação"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1296
+#: lib/action.php:1346
 msgid "After"
 msgstr "Próximo"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1306
+#: lib/action.php:1356
 msgid "Before"
 msgstr "Anterior"
 
@@ -6832,7 +6914,7 @@ msgid "AJAX error"
 msgstr "Erro no Ajax"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:233 lib/mailhandler.php:142
+#: lib/channel.php:233 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "O comando foi completado"
 
@@ -6848,7 +6930,7 @@ msgstr "Não existe uma mensagem com essa id."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:626
+#: lib/command.php:99 lib/command.php:630
 msgid "User has no last notice."
 msgstr "O usuário não tem nenhuma \"última mensagem\"."
 
@@ -6918,6 +7000,14 @@ msgstr "%1$s associou-se ao grupo %2$s."
 msgid "%1$s left group %2$s."
 msgstr "%1$s deixou o grupo %2$s."
 
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: lib/command.php:426
+#, fuzzy, php-format
+msgctxt "WHOIS"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
 #. TRANS: Whois output. %s is the full name of the queried user.
 #: lib/command.php:430
 #, php-format
@@ -6957,115 +7047,121 @@ msgstr ""
 "%s é um perfil remoto; você pode só pode enviar mensagens diretas para "
 "usuários do mesmo servidor."
 
-#. TRANS: Message given if content is too long.
+#. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
 #: lib/command.php:488
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] ""
+"A mensagem é muito extensa - o máximo são %1$d caracteres e você enviou %2$d."
+msgstr[1] ""
 "A mensagem é muito extensa - o máximo são %1$d caracteres e você enviou %2$d."
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:514
+#: lib/command.php:516
 msgid "Error sending direct message."
 msgstr "Ocorreu um erro durante o envio da mensagem direta."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:551
+#: lib/command.php:553
 #, php-format
 msgid "Notice from %s repeated."
 msgstr "A mensagem de %s foi repetida."
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:554
+#: lib/command.php:556
 msgid "Error repeating notice."
 msgstr "Erro na repetição da mensagem."
 
-#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:589
-#, php-format
-msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
+#: lib/command.php:591
+#, fuzzy, php-format
+msgid "Notice too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] ""
+"A mensagem é muito extensa - o máximo são %1$d caracteres e você enviou %2$d."
+msgstr[1] ""
 "A mensagem é muito extensa - o máximo são %1$d caracteres e você enviou %2$d."
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:600
+#: lib/command.php:604
 #, php-format
 msgid "Reply to %s sent."
 msgstr "A resposta para %s foi enviada."
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:603
+#: lib/command.php:607
 msgid "Error saving notice."
 msgstr "Erro no salvamento da mensagem."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:650
+#: lib/command.php:654
 msgid "Specify the name of the user to subscribe to."
 msgstr "Especifique o nome do usuário que será assinado."
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:659
+#: lib/command.php:663
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Não é possível assinar perfis OMB com comandos."
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:667
+#: lib/command.php:671
 #, php-format
 msgid "Subscribed to %s."
 msgstr "Foi efetuada a assinatura de $s."
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:688 lib/command.php:799
+#: lib/command.php:692 lib/command.php:803
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "Especifique o nome do usuário cuja assinatura será cancelada."
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:699
+#: lib/command.php:703
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr "Foi cancelada a assinatura de %s."
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:719 lib/command.php:745
+#: lib/command.php:723 lib/command.php:749
 msgid "Command not yet implemented."
 msgstr "O comando não foi implementado ainda."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:723
+#: lib/command.php:727
 msgid "Notification off."
 msgstr "Notificação desligada."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:726
+#: lib/command.php:730
 msgid "Can't turn off notification."
 msgstr "Não é possível desligar a notificação."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:749
+#: lib/command.php:753
 msgid "Notification on."
 msgstr "Notificação ligada."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:752
+#: lib/command.php:756
 msgid "Can't turn on notification."
 msgstr "Não é possível ligar a notificação."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:766
+#: lib/command.php:770
 msgid "Login command is disabled."
 msgstr "O comando para autenticação está desabilitado."
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:779
+#: lib/command.php:783
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
@@ -7074,20 +7170,20 @@ msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:808
+#: lib/command.php:812
 #, php-format
 msgid "Unsubscribed %s."
 msgstr "Foi cancelada a assinatura de %s."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:826
+#: lib/command.php:830
 msgid "You are not subscribed to anyone."
 msgstr "Você não está assinando ninguém."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:831
+#: lib/command.php:835
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Você já está assinando esta pessoa:"
@@ -7095,14 +7191,14 @@ msgstr[1] "Você já está assinando estas pessoas:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:853
+#: lib/command.php:857
 msgid "No one is subscribed to you."
 msgstr "Ninguém o assinou ainda."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:858
+#: lib/command.php:862
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Esta pessoa está assinando você:"
@@ -7110,21 +7206,21 @@ msgstr[1] "Estas pessoas estão assinando você:"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:880
+#: lib/command.php:884
 msgid "You are not a member of any groups."
 msgstr "Você não é membro de nenhum grupo."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:885
+#: lib/command.php:889
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Você é membro deste grupo:"
 msgstr[1] "Você é membro destes grupos:"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:900
+#: lib/command.php:904
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -7355,7 +7451,8 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 letras minúsculas ou números, sem pontuações ou espaços"
 
 #: lib/groupeditform.php:163
-msgid "URL of the homepage or blog of the group or topic"
+#, fuzzy
+msgid "URL of the homepage or blog of the group or topic."
 msgstr "URL para o site ou blog do grupo ou tópico"
 
 #: lib/groupeditform.php:168
@@ -7363,21 +7460,31 @@ msgid "Describe the group or topic"
 msgstr "Descreva o grupo ou tópico"
 
 #: lib/groupeditform.php:170
-#, php-format
-msgid "Describe the group or topic in %d characters"
-msgstr "Descreva o grupo ou tópico em %d caracteres."
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d character or less"
+msgid_plural "Describe the group or topic in %d characters or less"
+msgstr[0] "Descreva o grupo ou tópico em %d caracteres."
+msgstr[1] "Descreva o grupo ou tópico em %d caracteres."
 
-#: lib/groupeditform.php:179
+#: lib/groupeditform.php:182
+#, fuzzy
 msgid ""
-"Location for the group, if any, like \"City, State (or Region), Country\""
+"Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr ""
 "Localização do grupo, caso tenha alguma, como \"cidade, estado (ou região), "
 "país\""
 
-#: lib/groupeditform.php:187
-#, php-format
-msgid "Extra nicknames for the group, comma- or space- separated, max %d"
-msgstr ""
+#: lib/groupeditform.php:190
+#, fuzzy, php-format
+msgid ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"alias allowed."
+msgid_plural ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"aliases allowed."
+msgstr[0] ""
+"Apelidos extras para o grupo, separado por vírgulas ou espaços, no máximo %d"
+msgstr[1] ""
 "Apelidos extras para o grupo, separado por vírgulas ou espaços, no máximo %d"
 
 #. TRANS: Menu item in the group navigation page.
@@ -7935,7 +8042,7 @@ msgstr "Desculpe-me, mas este não é seu endereço de e-mail para recebimento."
 msgid "Sorry, no incoming email allowed."
 msgstr "Desculpe-me, mas não é permitido o recebimento de e-mails."
 
-#: lib/mailhandler.php:228
+#: lib/mailhandler.php:229
 #, php-format
 msgid "Unsupported message type: %s"
 msgstr "Tipo de mensagem não suportado: %s"
@@ -8286,16 +8393,17 @@ msgid "Sandbox this user"
 msgstr "Colocar este usuário em isolamento"
 
 #. TRANS: Fieldset legend for the search form.
-#: lib/searchaction.php:121
+#: lib/searchaction.php:120
 msgid "Search site"
 msgstr "Procurar no site"
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
-#: lib/searchaction.php:129
+#: lib/searchaction.php:128
 msgid "Keyword(s)"
 msgstr "Palavra(s)-chave"
 
+#. TRANS: Button text for searching site.
 #: lib/searchaction.php:130
 msgctxt "BUTTON"
 msgid "Search"
@@ -8386,8 +8494,8 @@ msgid "The theme file is missing or the upload failed."
 msgstr "O arquivo do tema não foi localizado ou ocorreu uma erro no envio."
 
 #: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:278 lib/themeuploader.php:282
-#: lib/themeuploader.php:290 lib/themeuploader.php:297
+#: lib/themeuploader.php:279 lib/themeuploader.php:283
+#: lib/themeuploader.php:291 lib/themeuploader.php:298
 msgid "Failed saving theme."
 msgstr "Não foi possível salvar o tema."
 
@@ -8396,16 +8504,20 @@ msgid "Invalid theme: bad directory structure."
 msgstr "Tema inválido: estrutura de diretórios incorreta."
 
 #: lib/themeuploader.php:166
-#, php-format
-msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
-msgstr ""
+#, fuzzy, php-format
+msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
+msgid_plural ""
+"Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr[0] ""
+"O tema enviado é muito grande; ele deve ter menos de %d bytes descomprimido."
+msgstr[1] ""
 "O tema enviado é muito grande; ele deve ter menos de %d bytes descomprimido."
 
-#: lib/themeuploader.php:178
+#: lib/themeuploader.php:179
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr "Arquivo de tema inválido: está faltando o arquivo css/display.css"
 
-#: lib/themeuploader.php:218
+#: lib/themeuploader.php:219
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
@@ -8413,16 +8525,16 @@ msgstr ""
 "O tema contém um nome de arquivo ou de diretório inválido. Use somente "
 "caracteres ASCII, números e os sinais de sublinhado e hífen."
 
-#: lib/themeuploader.php:224
+#: lib/themeuploader.php:225
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr "O tema contém extensões de arquivo inseguras; pode não ser seguro."
 
-#: lib/themeuploader.php:241
+#: lib/themeuploader.php:242
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr "O tema contém um arquivo do tipo '.%s', que não é permitido."
 
-#: lib/themeuploader.php:259
+#: lib/themeuploader.php:260
 msgid "Error opening theme archive."
 msgstr "Ocorreu um erro ao abrir o arquivo do tema."
 
@@ -8605,23 +8717,39 @@ msgstr[0] ""
 msgstr[1] ""
 "A mensagem é muito extensa - o máximo são %1$d caracteres e você enviou %2$d."
 
-#: scripts/restoreuser.php:82
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: scripts/restoreuser.php:61
 #, php-format
-msgid "Backup file for user %s (%s)"
+msgid "Getting backup from file '%s'."
 msgstr ""
 
-#: scripts/restoreuser.php:88
+#. TRANS: Commandline script output.
+#: scripts/restoreuser.php:91
 #, fuzzy
 msgid "No user specified; using backup user."
 msgstr "Não foi especificado nenhum ID de usuário."
 
-#: scripts/restoreuser.php:94
+#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
+#: scripts/restoreuser.php:98
 #, php-format
-msgid "%d entries in backup."
-msgstr ""
+msgid "%d entry in backup."
+msgid_plural "%d entries in backup."
+msgstr[0] ""
+msgstr[1] ""
+
+#, fuzzy
+#~ msgid "Name is too long (maximum 255 chars)."
+#~ msgstr "O nome é muito extenso (máx. 255 caracteres)."
+
+#, fuzzy
+#~ msgid "Organization is too long (maximum 255 chars)."
+#~ msgstr "A organização é muito extensa (máx. 255 caracteres)."
+
+#~ msgid "That's too long. Max notice size is %d chars."
+#~ msgstr "Está muito extenso. O tamanho máximo é de %d caracteres."
 
-#~ msgid "Description is too long (max %d chars)."
-#~ msgstr "Descrição muito extensa (máximo %d caracteres)."
+#~ msgid "Max notice size is %d chars, including attachment URL."
+#~ msgstr "O tamanho máximo da mensagem é de %d caracteres"
 
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "Muitos apelidos! O máximo são %d."
+#~ msgid " tagged %s"
+#~ msgstr " etiquetada %s"
diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po
index a6f360233..17a86e373 100644
--- a/locale/ru/LC_MESSAGES/statusnet.po
+++ b/locale/ru/LC_MESSAGES/statusnet.po
@@ -14,18 +14,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-30 23:18+0000\n"
-"PO-Revision-Date: 2010-10-30 23:20:44+0000\n"
+"POT-Creation-Date: 2010-11-02 22:51+0000\n"
+"PO-Revision-Date: 2010-11-02 22:53:42+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r75708); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r75875); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
-"X-POT-Import-Date: 2010-10-30 09:48:40+0000\n"
+"X-POT-Import-Date: 2010-10-30 23:42:01+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -83,15 +83,20 @@ msgstr "Сохранить настройки доступа"
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
+#. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
+#. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #: actions/accessadminpanel.php:193 actions/emailsettings.php:228
-#: actions/imsettings.php:187 actions/pathsadminpanel.php:512
-#: actions/profilesettings.php:201 actions/smssettings.php:209
-#: actions/subscriptions.php:246 lib/applicationeditform.php:355
+#: actions/imsettings.php:187 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: lib/applicationeditform.php:355 lib/groupeditform.php:207
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Сохранить"
@@ -142,7 +147,7 @@ msgstr "Нет такой страницы."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:495 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Нет такого пользователя."
@@ -213,7 +218,9 @@ msgstr ""
 
 #. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:208
+#. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -576,8 +583,11 @@ msgstr "Полное имя слишком длинное (не больше 255
 #. TRANS: Group edit form validation error.
 #. TRANS: Form validation error in New application form.
 #. TRANS: %d is the maximum number of characters for the description.
+#. TRANS: Group create form validation error.
+#. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:220 actions/editapplication.php:201
 #: actions/editgroup.php:216 actions/newapplication.php:178
+#: actions/newgroup.php:152
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -738,14 +748,14 @@ msgstr "Вы не авторизованы."
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:172 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:74
 #: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
 #: actions/groupunblock.php:65 actions/imsettings.php:230
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
-#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/othersettings.php:153 actions/passwordsettings.php:138
 #: actions/profilesettings.php:221 actions/recoverpassword.php:350
 #: actions/register.php:172 actions/remotesubscribe.php:77
 #: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
@@ -924,20 +934,21 @@ msgstr "Вы не можете удалять статус других поль
 
 #. TRANS: Client error displayed trying to repeat a non-existing notice through the API.
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
+#. TRANS: Error message displayed trying to delete a non-existing notice.
 #: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/deletenotice.php:58 actions/shownotice.php:92
+#: actions/deletenotice.php:61 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "Нет такой записи."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:535
+#: actions/apistatusesretweet.php:83 lib/command.php:537
 msgid "Cannot repeat your own notice."
 msgstr "Невозможно повторить собственную запись."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:541
+#: actions/apistatusesretweet.php:92 lib/command.php:543
 msgid "Already repeated that notice."
 msgstr "Запись уже повторена."
 
@@ -958,7 +969,8 @@ msgstr "Клиент должен предоставить параметр «st
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#: actions/apistatusesupdate.php:244
+#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
+#: lib/mailhandler.php:60
 #, fuzzy, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
@@ -974,7 +986,7 @@ msgstr "Метод API не найден."
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
-#: actions/apistatusesupdate.php:308
+#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
 #, fuzzy, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
@@ -1186,17 +1198,18 @@ msgstr "Подберите нужный квадратный участок дл
 msgid "Lost our file data."
 msgstr "Потеряна информация о файле."
 
-#: actions/avatarsettings.php:384
+#. TRANS: Success message for having updated a user avatar.
+#: actions/avatarsettings.php:385
 msgid "Avatar updated."
 msgstr "Аватара обновлена."
 
 #. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
-#: actions/avatarsettings.php:388
+#: actions/avatarsettings.php:389
 msgid "Failed updating avatar."
 msgstr "Неудача при обновлении аватары."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:412
+#: actions/avatarsettings.php:413
 msgid "Avatar deleted."
 msgstr "Аватара удалена."
 
@@ -1228,8 +1241,8 @@ msgstr ""
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:154 actions/deleteapplication.php:154
-#: actions/deletegroup.php:220 actions/deletenotice.php:150
+#: actions/block.php:154 actions/deleteapplication.php:157
+#: actions/deletegroup.php:220 actions/deletenotice.php:155
 #: actions/deleteuser.php:152 actions/groupblock.php:178
 msgctxt "BUTTON"
 msgid "No"
@@ -1247,8 +1260,8 @@ msgstr "Не блокировать этого пользователя"
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:161 actions/deleteapplication.php:161
-#: actions/deletegroup.php:227 actions/deletenotice.php:157
+#: actions/block.php:161 actions/deleteapplication.php:164
+#: actions/deletegroup.php:227 actions/deletenotice.php:162
 #: actions/deleteuser.php:159 actions/groupblock.php:185
 msgctxt "BUTTON"
 msgid "Yes"
@@ -1365,12 +1378,13 @@ msgstr "Этот адрес уже подтверждён."
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
 #. TRANS: Server error thrown on database error updating IM preferences.
 #. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
 #. TRANS: Server error thrown when user profile settings could not be updated.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #: actions/confirmaddress.php:118 actions/emailsettings.php:331
 #: actions/emailsettings.php:477 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:174
+#: actions/imsettings.php:442 actions/othersettings.php:184
 #: actions/profilesettings.php:326 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
@@ -1406,16 +1420,19 @@ msgstr "Дискуссия"
 msgid "Notices"
 msgstr "Записи"
 
-#: actions/deleteapplication.php:63
+#. TRANS: Client error displayed trying to delete an application while not logged in.
+#: actions/deleteapplication.php:62
 msgid "You must be logged in to delete an application."
 msgstr "Вы должны войти в систему, чтобы удалить приложение."
 
+#. TRANS: Client error displayed trying to delete an application that does not exist.
 #: actions/deleteapplication.php:71
 msgid "Application not found."
 msgstr "Приложение не найдено."
 
+#. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
-#: actions/deleteapplication.php:78 actions/editapplication.php:78
+#: actions/deleteapplication.php:79 actions/editapplication.php:78
 #: actions/showapplication.php:94
 msgid "You are not the owner of this application."
 msgstr "Вы не являетесь владельцем этого приложения."
@@ -1423,15 +1440,18 @@ msgstr "Вы не являетесь владельцем этого прило�
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
 #: actions/newapplication.php:114 actions/showapplication.php:118
-#: lib/action.php:1354
+#: lib/action.php:1404
 msgid "There was a problem with your session token."
 msgstr "Проблема с вашим ключом сессии."
 
-#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+#. TRANS: Title for delete application page.
+#. TRANS: Fieldset legend on delete application page.
+#: actions/deleteapplication.php:124 actions/deleteapplication.php:149
 msgid "Delete application"
 msgstr "Удалить приложение"
 
-#: actions/deleteapplication.php:149
+#. TRANS: Confirmation text on delete application page.
+#: actions/deleteapplication.php:152
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
 "about the application from the database, including all existing user "
@@ -1442,12 +1462,12 @@ msgstr ""
 "пользователей."
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:158
+#: actions/deleteapplication.php:161
 msgid "Do not delete this application"
 msgstr "Не удаляйте это приложение"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:164
+#: actions/deleteapplication.php:167
 msgid "Delete this application"
 msgstr "Удалить это приложение"
 
@@ -1483,13 +1503,14 @@ msgstr "Не удаётся обновить информацию о групп�
 msgid "Deleted group %s"
 msgstr "%1$s покинул группу %2$s"
 
-#. TRANS: Title.
+#. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
 #: actions/deletegroup.php:176 actions/deletegroup.php:202
 #, fuzzy
 msgid "Delete group"
 msgstr "Удалить пользователя"
 
+#. TRANS: Warning in form for deleleting a group.
 #: actions/deletegroup.php:206
 #, fuzzy
 msgid ""
@@ -1510,10 +1531,11 @@ msgstr "Не удаляйте эту группу"
 msgid "Delete this group"
 msgstr "Удалить эту группу"
 
+#. TRANS: Error message displayed trying to delete a notice while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1523,11 +1545,13 @@ msgstr "Удалить эту группу"
 msgid "Not logged in."
 msgstr "Не авторизован."
 
-#: actions/deletenotice.php:74
+#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
+#: actions/deletenotice.php:78
 msgid "Can't delete this notice."
 msgstr "Не удаётся удалить эту запись."
 
-#: actions/deletenotice.php:106
+#. TRANS: Instructions for deleting a notice.
+#: actions/deletenotice.php:110
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
@@ -1535,21 +1559,24 @@ msgstr ""
 "Вы окончательно удаляете запись. После того, как это будет сделано, "
 "восстановление будет невозможно."
 
-#: actions/deletenotice.php:112 actions/deletenotice.php:144
+#. TRANS: Page title when deleting a notice.
+#. TRANS: Fieldset legend for the delete notice form.
+#: actions/deletenotice.php:117 actions/deletenotice.php:148
 msgid "Delete notice"
 msgstr "Удалить запись"
 
-#: actions/deletenotice.php:147
+#. TRANS: Message for the delete notice form.
+#: actions/deletenotice.php:152
 msgid "Are you sure you want to delete this notice?"
 msgstr "Вы уверены, что хотите удалить эту запись?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:154
+#: actions/deletenotice.php:159
 msgid "Do not delete this notice"
 msgstr "Не удалять эту запись"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:161 lib/noticelist.php:667
+#: actions/deletenotice.php:166 lib/noticelist.php:667
 msgid "Delete this notice"
 msgstr "Удалить эту запись"
 
@@ -1713,11 +1740,9 @@ msgstr "Восстановить значения по умолчанию"
 
 #. TRANS: Submit button title.
 #: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
-#: actions/othersettings.php:126 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: actions/useradminpanel.php:295 lib/applicationeditform.php:357
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: lib/applicationeditform.php:357 lib/designsettings.php:256
 msgid "Save"
 msgstr "Сохранить"
 
@@ -1765,9 +1790,9 @@ msgid "Name is required."
 msgstr "Имя обязательно."
 
 #. TRANS: Validation error shown when providing too long a name in the "Edit application" form.
-#: actions/editapplication.php:188
+#: actions/editapplication.php:188 actions/newapplication.php:169
 #, fuzzy
-msgid "Name is too long (max 255 characters)."
+msgid "Name is too long (maximum 255 characters)."
 msgstr "Имя слишком длинное (не больше 255 знаков)."
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
@@ -1796,7 +1821,7 @@ msgid "Organization is required."
 msgstr "Организация обязательна."
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#: actions/editapplication.php:223
+#: actions/editapplication.php:223 actions/newapplication.php:199
 #, fuzzy
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "Слишком длинное название организации (максимум 255 знаков)."
@@ -2604,7 +2629,7 @@ msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Опубликовать MicroID для моего Jabber/GTalk - адреса."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:180
+#: actions/imsettings.php:290 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "Предпочтения сохранены."
 
@@ -2732,10 +2757,9 @@ msgstr[2] "Вы уже подписаны на пользователя:"
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#. TRANS: Whois output.
-#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:145 actions/invite.php:159 lib/command.php:426
-#, php-format
+#: actions/invite.php:145 actions/invite.php:159
+#, fuzzy, php-format
+msgctxt "INVITE"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
@@ -2924,7 +2948,8 @@ msgid ""
 msgstr ""
 
 #: actions/licenseadminpanel.php:156
-msgid "Invalid license title. Max length is 255 characters."
+#, fuzzy
+msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "Неверное название лицензии. Максимальная длина 255 символов."
 
 #: actions/licenseadminpanel.php:168
@@ -3097,20 +3122,10 @@ msgstr "Вы должны авторизоваться, чтобы зареги�
 msgid "Use this form to register a new application."
 msgstr "Используйте эту форму для создания нового приложения."
 
-#: actions/newapplication.php:169
-#, fuzzy
-msgid "Name is too long (maximum 255 chars)."
-msgstr "Имя слишком длинное (не больше 255 знаков)."
-
 #: actions/newapplication.php:184
 msgid "Source URL is required."
 msgstr "URL источника обязателен."
 
-#: actions/newapplication.php:199
-#, fuzzy
-msgid "Organization is too long (maximum 255 chars)."
-msgstr "Слишком длинное название организации (максимум 255 знаков)."
-
 #: actions/newapplication.php:266 actions/newapplication.php:275
 msgid "Could not create application."
 msgstr "Не удаётся создать приложение."
@@ -3130,14 +3145,14 @@ msgid "New message"
 msgstr "Новое сообщение"
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:499
+#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501
 msgid "You can't send a message to this user."
 msgstr "Вы не можете послать сообщение этому пользователю."
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
 #: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
-#: lib/command.php:579
+#: lib/command.php:581
 msgid "No content!"
 msgstr "Нет контента!"
 
@@ -3146,7 +3161,7 @@ msgid "No recipient specified."
 msgstr "Нет адресата."
 
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:503
+#: actions/newmessage.php:167 lib/command.php:505
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "Не посылайте сообщения сами себе; просто потихоньку скажите это себе."
@@ -3157,12 +3172,12 @@ msgstr "Сообщение отправлено"
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:511
+#: actions/newmessage.php:188 lib/command.php:513
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Прямое сообщение для %s послано."
 
-#: actions/newmessage.php:213 actions/newnotice.php:263
+#: actions/newmessage.php:213 actions/newnotice.php:264
 msgid "Ajax Error"
 msgstr "Ошибка AJAX"
 
@@ -3170,17 +3185,7 @@ msgstr "Ошибка AJAX"
 msgid "New notice"
 msgstr "Новая запись"
 
-#: actions/newnotice.php:159 lib/mailhandler.php:60
-#, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr "Слишком длинная запись. Максимальная длина — %d знаков."
-
-#: actions/newnotice.php:183
-#, php-format
-msgid "Max notice size is %d chars, including attachment URL."
-msgstr "Максимальная длина записи — %d символов, включая URL вложения."
-
-#: actions/newnotice.php:229
+#: actions/newnotice.php:230
 msgid "Notice posted"
 msgstr "Запись опубликована"
 
@@ -3349,36 +3354,46 @@ msgstr "Поиск людей"
 msgid "Notice Search"
 msgstr "Поиск в записях"
 
-#: actions/othersettings.php:60
+#: actions/othersettings.php:59
 msgid "Other settings"
 msgstr "Другие настройки"
 
+#. TRANS: Instructions for tab "Other" in user profile settings.
 #: actions/othersettings.php:71
 msgid "Manage various other options."
 msgstr "Управление другими опциями."
 
-#: actions/othersettings.php:108
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/othersettings.php:111
 msgid " (free service)"
 msgstr " (бесплатный сервис)"
 
-#: actions/othersettings.php:116
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/othersettings.php:120
 msgid "Shorten URLs with"
 msgstr "Сокращать URL с помощью"
 
-#: actions/othersettings.php:117
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/othersettings.php:122
 msgid "Automatic shortening service to use."
 msgstr "Автоматически использовать выбранный сервис"
 
-#: actions/othersettings.php:122
+#. TRANS: Label for checkbox.
+#: actions/othersettings.php:128
 msgid "View profile designs"
 msgstr "Показать оформления профиля"
 
-#: actions/othersettings.php:123
+#. TRANS: Tooltip for checkbox.
+#: actions/othersettings.php:130
 msgid "Show or hide profile designs."
 msgstr "Показать или скрыть оформления профиля."
 
-#: actions/othersettings.php:153
-msgid "URL shortening service is too long (max 50 chars)."
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/othersettings.php:162
+#, fuzzy
+msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "Сервис сокращения URL слишком длинный (максимум 50 символов)."
 
 #: actions/otp.php:69
@@ -3865,7 +3880,7 @@ msgstr "Биография"
 #. TRANS: Label for group location (dt). Text hidden by default.
 #: actions/profilesettings.php:149 actions/register.php:485
 #: actions/showgroup.php:267 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:177
+#: actions/userauthorization.php:166 lib/groupeditform.php:180
 #: lib/userprofile.php:165
 msgid "Location"
 msgstr "Месторасположение"
@@ -4204,7 +4219,8 @@ msgid "Unexpected password reset."
 msgstr "Нетиповая переустановка пароля."
 
 #: actions/recoverpassword.php:365
-msgid "Password must be 6 chars or more."
+#, fuzzy
+msgid "Password must be 6 characters or more."
 msgstr "Пароль должен быть длиной не менее 6 символов."
 
 #: actions/recoverpassword.php:369
@@ -4582,7 +4598,7 @@ msgstr "Организация"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:172
+#: lib/applicationeditform.php:208 lib/groupeditform.php:175
 msgid "Description"
 msgstr "Описание"
 
@@ -4734,7 +4750,7 @@ msgid "Note"
 msgstr "Запись"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:298 lib/groupeditform.php:184
+#: actions/showgroup.php:298 lib/groupeditform.php:187
 msgid "Aliases"
 msgstr "Алиасы"
 
@@ -4867,47 +4883,67 @@ msgstr "Сообщение от %1$s на %2$s"
 msgid "Notice deleted."
 msgstr "Запись удалена."
 
-#: actions/showstream.php:72
-#, php-format
-msgid " tagged %s"
-msgstr "  с тегом %s"
+#. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
+#: actions/showstream.php:70
+#, fuzzy, php-format
+msgid "%1$s tagged %2$s"
+msgstr "%1$s, страница %2$d"
+
+#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#: actions/showstream.php:74
+#, fuzzy, php-format
+msgid "%1$s tagged %2$s, page %3$d"
+msgstr "Записи с тегом %1$s, страница %2$d"
 
-#: actions/showstream.php:78
+#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$d is the page number.
+#: actions/showstream.php:82
 #, php-format
 msgid "%1$s, page %2$d"
 msgstr "%1$s, страница %2$d"
 
-#: actions/showstream.php:120
+#. TRANS: Title for link to notice feed.
+#. TRANS: %1$s is a user nickname, %2$s is a hashtag.
+#: actions/showstream.php:127
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Лента записей %1$s с тегом %2$s (RSS 1.0)"
 
-#: actions/showstream.php:127
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:136
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "Лента записей для %s (RSS 1.0)"
 
-#: actions/showstream.php:134
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:145
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "Лента записей для %s (RSS 2.0)"
 
-#: actions/showstream.php:141
+#: actions/showstream.php:152
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "Лента записей для %s (Atom)"
 
-#: actions/showstream.php:146
+#. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
+#. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
+#: actions/showstream.php:159
 #, php-format
 msgid "FOAF for %s"
 msgstr "FOAF для %s"
 
-#: actions/showstream.php:197
-#, php-format
-msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
+#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
+#: actions/showstream.php:211
+#, fuzzy, php-format
+msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr "Это лента %1$s, однако %2$s пока ничего не отправил."
 
-#: actions/showstream.php:202
+#. TRANS: Second sentence of empty list message for a stream for the user themselves.
+#: actions/showstream.php:217
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -4915,7 +4951,9 @@ msgstr ""
 "Видели недавно что-нибудь интересное? Вы ещё не отправили ни одной записи, "
 "сейчас хорошее время  для начала :)"
 
-#: actions/showstream.php:204
+#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:221
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -4924,7 +4962,9 @@ msgstr ""
 "Вы можете попробовать «подтолкнуть» %1$s или [написать что-нибудь для них](%%%"
 "%action.newnotice%%%%?status_textarea=%2$s)."
 
-#: actions/showstream.php:243
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:264
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4939,7 +4979,9 @@ msgstr ""
 "сообщения  участника **%s** и иметь доступ ко множеству других возможностей! "
 "([Читать далее](%%%%doc.help%%%%))"
 
-#: actions/showstream.php:248
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:271
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4951,7 +4993,8 @@ msgstr ""
 "использованием свободного программного обеспечения [StatusNet](http://status."
 "net/). "
 
-#: actions/showstream.php:305
+#. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
+#: actions/showstream.php:328
 #, php-format
 msgid "Repeat of %s"
 msgstr "Повтор за %s"
@@ -5065,31 +5108,40 @@ msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 "Сколько нужно ждать пользователям (в секундах) для отправки того же ещё раз."
 
-#: actions/sitenoticeadminpanel.php:56
+#. TRANS: Page title for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:55
 msgid "Site Notice"
 msgstr "Уведомление сайта"
 
-#: actions/sitenoticeadminpanel.php:67
+#. TRANS: Instructions for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:66
 msgid "Edit site-wide message"
 msgstr "Изменить уведомление для всего сайта"
 
-#: actions/sitenoticeadminpanel.php:103
+#. TRANS: Server error displayed when saving a site-wide notice was impossible.
+#: actions/sitenoticeadminpanel.php:101
 msgid "Unable to save site notice."
 msgstr "Не удаётся сохранить уведомление сайта."
 
-#: actions/sitenoticeadminpanel.php:113
-msgid "Max length for the site-wide notice is 255 chars."
+#. TRANS: Client error displayed when a site-wide notice was longer than allowed.
+#: actions/sitenoticeadminpanel.php:112
+#, fuzzy
+msgid "Maximum length for the site-wide notice is 255 characters."
 msgstr "Максимальная длина уведомления сайта составляет 255 символов."
 
+#. TRANS: Label for site-wide notice text field in admin panel.
 #: actions/sitenoticeadminpanel.php:176
 msgid "Site notice text"
 msgstr "Текст уведомления сайта"
 
-#: actions/sitenoticeadminpanel.php:178
-msgid "Site-wide notice text (255 chars max; HTML okay)"
+#. TRANS: Tooltip for site-wide notice text field in admin panel.
+#: actions/sitenoticeadminpanel.php:179
+#, fuzzy
+msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr "Текст уведомления сайта (максимум 255 символов; допустим HTML)"
 
-#: actions/sitenoticeadminpanel.php:198
+#. TRANS: Title for button to save site notice in admin panel.
+#: actions/sitenoticeadminpanel.php:201
 msgid "Save site notice"
 msgstr "Сохранить уведомление сайта"
 
@@ -5558,76 +5610,94 @@ msgstr ""
 "Лицензия просматриваемого потока «%1$s» несовместима с лицензией сайта «%2$s»."
 
 #. TRANS: User admin panel title
-#: actions/useradminpanel.php:60
+#: actions/useradminpanel.php:58
 msgctxt "TITLE"
 msgid "User"
 msgstr "Пользователь"
 
-#: actions/useradminpanel.php:71
+#. TRANS: Instruction for user admin panel.
+#: actions/useradminpanel.php:69
 msgid "User settings for this StatusNet site"
 msgstr ""
 
-#: actions/useradminpanel.php:150
+#. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
+#: actions/useradminpanel.php:147
 msgid "Invalid bio limit. Must be numeric."
 msgstr "Неверное ограничение биографии. Должно быть числом."
 
-#: actions/useradminpanel.php:156
-msgid "Invalid welcome text. Max length is 255 characters."
+#. TRANS: Form validation error in user admin panel when welcome text is too long.
+#: actions/useradminpanel.php:154
+#, fuzzy
+msgid "Invalid welcome text. Maximum length is 255 characters."
 msgstr ""
 "Неверный текст приветствия. Максимальная длина составляет 255 символов."
 
+#. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
+#. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
-#, php-format
-msgid "Invalid default subscripton: '%1$s' is not user."
+#, fuzzy, php-format
+msgid "Invalid default subscripton: '%1$s' is not a user."
 msgstr "Неверная подписка по умолчанию: «%1$s» не является пользователем."
 
 #. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:106
+#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
 #: lib/personalgroupnav.php:109
 msgid "Profile"
 msgstr "Профиль"
 
-#: actions/useradminpanel.php:223
+#. TRANS: Field label in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:220
 msgid "Bio Limit"
 msgstr "Ограничение биографии"
 
-#: actions/useradminpanel.php:224
+#. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:222
 msgid "Maximum length of a profile bio in characters."
 msgstr "Максимальная длина биографии профиля в символах."
 
-#: actions/useradminpanel.php:232
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:231
 msgid "New users"
 msgstr "Новые пользователи"
 
+#. TRANS: Field label in user admin panel for setting new user welcome text.
 #: actions/useradminpanel.php:236
 msgid "New user welcome"
 msgstr "Приветствие новым пользователям"
 
-#: actions/useradminpanel.php:237
-msgid "Welcome text for new users (Max 255 chars)."
+#. TRANS: Tooltip in user admin panel for setting new user welcome text.
+#: actions/useradminpanel.php:238
+#, fuzzy
+msgid "Welcome text for new users (maximum 255 characters)."
 msgstr "Текст приветствия для новых пользователей (максимум 255 символов)."
 
-#: actions/useradminpanel.php:242
+#. TRANS: Field label in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:244
 msgid "Default subscription"
 msgstr "Подписка по умолчанию"
 
-#: actions/useradminpanel.php:243
+#. TRANS: Tooltip in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:246
 msgid "Automatically subscribe new users to this user."
 msgstr "Автоматически подписывать новых пользователей на этого пользователя."
 
-#: actions/useradminpanel.php:252
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:256
 msgid "Invitations"
 msgstr "Приглашения"
 
-#: actions/useradminpanel.php:257
+#. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:262
 msgid "Invitations enabled"
 msgstr "Приглашения включены"
 
-#: actions/useradminpanel.php:259
+#. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:265
 msgid "Whether to allow users to invite new users."
 msgstr "Разрешать ли пользователям приглашать новых пользователей."
 
-#: actions/useradminpanel.php:295
+#. TRANS: Title for button to save user settings in user admin panel.
+#: actions/useradminpanel.php:302
 msgid "Save user settings"
 msgstr ""
 
@@ -5837,7 +5907,7 @@ msgid "Plugins"
 msgstr "Плагины"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:831
+#: actions/version.php:198 lib/action.php:880
 msgid "Version"
 msgstr "Версия"
 
@@ -6046,9 +6116,16 @@ msgstr "Не удаётся сохранить информацию о лока�
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
+#. TRANS: Full name of a profile or group followed by nickname in parens
+#: classes/Profile.php:164
+#, fuzzy, php-format
+msgctxt "FANCYNAME"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:791
+#: classes/Profile.php:812
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
@@ -6057,7 +6134,7 @@ msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:800
+#: classes/Profile.php:821
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6203,194 +6280,201 @@ msgstr "%1$s — %2$s"
 msgid "Untitled page"
 msgstr "Страница без названия"
 
+#. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
+#: lib/action.php:310
+msgctxt "TOOLTIP"
+msgid "Show more"
+msgstr ""
+
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:477
+#: lib/action.php:526
 msgid "Primary site navigation"
 msgstr "Главная навигация"
 
 #. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:483
+#: lib/action.php:532
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "Личный профиль и лента друзей"
 
 #. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:486
+#: lib/action.php:535
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Личное"
 
 #. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:488
+#: lib/action.php:537
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
 msgstr "Изменить ваш email, аватар, пароль, профиль"
 
 #. TRANS: Main menu option when logged in for access to user settings
-#: lib/action.php:491
+#: lib/action.php:540
 msgid "Account"
 msgstr "Настройки"
 
 #. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:493
+#: lib/action.php:542
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "Соединить с сервисами"
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:496
+#: lib/action.php:545
 msgid "Connect"
 msgstr "Соединить"
 
 #. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:499
+#: lib/action.php:548
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "Изменить конфигурацию сайта"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:502 lib/groupnav.php:117
+#: lib/action.php:551 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Настройки"
 
 #. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:506
+#: lib/action.php:555
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Пригласите друзей и коллег стать такими же как Вы участниками %s"
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:509
+#: lib/action.php:558
 msgctxt "MENU"
 msgid "Invite"
 msgstr "Пригласить"
 
 #. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:515
+#: lib/action.php:564
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "Выйти"
 
 #. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:518
+#: lib/action.php:567
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Выход"
 
 #. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:523
+#: lib/action.php:572
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "Создать новый аккаунт"
 
 #. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:526
+#: lib/action.php:575
 msgctxt "MENU"
 msgid "Register"
 msgstr "Регистрация"
 
 #. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:529
+#: lib/action.php:578
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "Войти"
 
 #. TRANS: Main menu option when not logged in to log in
-#: lib/action.php:532
+#: lib/action.php:581
 msgctxt "MENU"
 msgid "Login"
 msgstr "Вход"
 
 #. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:535
+#: lib/action.php:584
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Помощь"
 
 #. TRANS: Main menu option for help on the StatusNet site
-#: lib/action.php:538
+#: lib/action.php:587
 msgctxt "MENU"
 msgid "Help"
 msgstr "Помощь"
 
 #. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:541
+#: lib/action.php:590
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr "Искать людей или текст"
 
 #. TRANS: Main menu option when logged in or when the StatusNet instance is not private
-#: lib/action.php:544
+#: lib/action.php:593
 msgctxt "MENU"
 msgid "Search"
 msgstr "Поиск"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:566 lib/adminpanelaction.php:387
+#: lib/action.php:615 lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "Уведомление сайта"
 
 #. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:633
+#: lib/action.php:682
 msgid "Local views"
 msgstr "Локальные виды"
 
 #. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:703
+#: lib/action.php:752
 msgid "Page notice"
 msgstr "Новая запись"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:804
+#: lib/action.php:853
 msgid "Secondary site navigation"
 msgstr "Навигация по подпискам"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:810
+#: lib/action.php:859
 msgid "Help"
 msgstr "Помощь"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:813
+#: lib/action.php:862
 msgid "About"
 msgstr "О проекте"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:816
+#: lib/action.php:865
 msgid "FAQ"
 msgstr "ЧаВо"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:821
+#: lib/action.php:870
 msgid "TOS"
 msgstr "TOS"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:825
+#: lib/action.php:874
 msgid "Privacy"
 msgstr "Пользовательское соглашение"
 
-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:828
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+#: lib/action.php:877
 msgid "Source"
 msgstr "Исходный код"
 
-#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:834
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+#: lib/action.php:884
 msgid "Contact"
 msgstr "Контактная информация"
 
-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:837
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+#: lib/action.php:887
 msgid "Badge"
 msgstr "Бедж"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:866
+#: lib/action.php:916
 msgid "StatusNet software license"
 msgstr "StatusNet лицензия"
 
@@ -6398,7 +6482,7 @@ msgstr "StatusNet лицензия"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:873
+#: lib/action.php:923
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -6408,7 +6492,7 @@ msgstr ""
 "broughtby%%](%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:876
+#: lib/action.php:926
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** — сервис микроблогинга."
@@ -6417,7 +6501,7 @@ msgstr "**%%site.name%%** — сервис микроблогинга."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:883
+#: lib/action.php:933
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -6430,27 +6514,27 @@ msgstr ""
 "licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:899
+#: lib/action.php:949
 msgid "Site content license"
 msgstr "Лицензия содержимого сайта"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:906
+#: lib/action.php:956
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "Содержание и данные %1$s являются личными и конфиденциальными."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:913
+#: lib/action.php:963
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 "Авторские права на содержание и данные принадлежат %1$s. Все права защищены."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:917
+#: lib/action.php:967
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "Авторские права на содержание и данные принадлежат разработчикам. Все права "
@@ -6458,25 +6542,25 @@ msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:949
+#: lib/action.php:999
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr "Все материалы и данные %1$s доступны на условиях лицензии %2$s."
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1285
+#: lib/action.php:1335
 msgid "Pagination"
 msgstr "Разбиение на страницы"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1296
+#: lib/action.php:1346
 msgid "After"
 msgstr "Сюда"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1306
+#: lib/action.php:1356
 msgid "Before"
 msgstr "Туда"
 
@@ -6823,7 +6907,7 @@ msgid "AJAX error"
 msgstr "Ошибка AJAX"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:233 lib/mailhandler.php:142
+#: lib/channel.php:233 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "Команда завершена"
 
@@ -6839,7 +6923,7 @@ msgstr "Записи с таким id не существует."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:626
+#: lib/command.php:99 lib/command.php:630
 msgid "User has no last notice."
 msgstr "У пользователя нет последней записи."
 
@@ -6908,6 +6992,14 @@ msgstr "%1$s присоединился к группе %2$s."
 msgid "%1$s left group %2$s."
 msgstr "%1$s покинул группу %2$s."
 
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: lib/command.php:426
+#, fuzzy, php-format
+msgctxt "WHOIS"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
 #. TRANS: Whois output. %s is the full name of the queried user.
 #: lib/command.php:430
 #, php-format
@@ -6947,114 +7039,125 @@ msgstr ""
 "%s профиль другой системы; вы можете отсылать личное сообщение только "
 "пользователям этой системы."
 
-#. TRANS: Message given if content is too long.
+#. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
 #: lib/command.php:488
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] ""
+"Сообщение слишком длинное — не больше %1$d символов, вы отправили %2$d."
+msgstr[1] ""
+"Сообщение слишком длинное — не больше %1$d символов, вы отправили %2$d."
+msgstr[2] ""
 "Сообщение слишком длинное — не больше %1$d символов, вы отправили %2$d."
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:514
+#: lib/command.php:516
 msgid "Error sending direct message."
 msgstr "Ошибка при отправке прямого сообщения."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:551
+#: lib/command.php:553
 #, php-format
 msgid "Notice from %s repeated."
 msgstr "Запись %s повторена."
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:554
+#: lib/command.php:556
 msgid "Error repeating notice."
 msgstr "Ошибка при повторении записи."
 
-#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:589
-#, php-format
-msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
-msgstr "Запись слишком длинная — не больше %1$d символов, вы отправили %2$d."
+#: lib/command.php:591
+#, fuzzy, php-format
+msgid "Notice too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] ""
+"Запись слишком длинная — не больше %1$d символов, вы отправили %2$d."
+msgstr[1] ""
+"Запись слишком длинная — не больше %1$d символов, вы отправили %2$d."
+msgstr[2] ""
+"Запись слишком длинная — не больше %1$d символов, вы отправили %2$d."
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:600
+#: lib/command.php:604
 #, php-format
 msgid "Reply to %s sent."
 msgstr "Ответ %s отправлен."
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:603
+#: lib/command.php:607
 msgid "Error saving notice."
 msgstr "Проблемы с сохранением записи."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:650
+#: lib/command.php:654
 msgid "Specify the name of the user to subscribe to."
 msgstr "Укажите имя пользователя для подписки."
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:659
+#: lib/command.php:663
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Невозможно подписаться командой на профили OMB."
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:667
+#: lib/command.php:671
 #, php-format
 msgid "Subscribed to %s."
 msgstr "Подписался на %s."
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:688 lib/command.php:799
+#: lib/command.php:692 lib/command.php:803
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "Укажите имя пользователя для отмены подписки."
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:699
+#: lib/command.php:703
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr "Отписаться от %s."
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:719 lib/command.php:745
+#: lib/command.php:723 lib/command.php:749
 msgid "Command not yet implemented."
 msgstr "Команда ещё не выполнена."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:723
+#: lib/command.php:727
 msgid "Notification off."
 msgstr "Оповещение отсутствует."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:726
+#: lib/command.php:730
 msgid "Can't turn off notification."
 msgstr "Нет оповещения."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:749
+#: lib/command.php:753
 msgid "Notification on."
 msgstr "Есть оповещение."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:752
+#: lib/command.php:756
 msgid "Can't turn on notification."
 msgstr "Есть оповещение."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:766
+#: lib/command.php:770
 msgid "Login command is disabled."
 msgstr "Команда входа отключена."
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:779
+#: lib/command.php:783
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
@@ -7063,20 +7166,20 @@ msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:808
+#: lib/command.php:812
 #, php-format
 msgid "Unsubscribed %s."
 msgstr "Отписано %s."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:826
+#: lib/command.php:830
 msgid "You are not subscribed to anyone."
 msgstr "Вы ни на кого не подписаны."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:831
+#: lib/command.php:835
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Вы подписаны на этих людей:"
@@ -7085,14 +7188,14 @@ msgstr[2] "Вы подписаны на этих людей:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:853
+#: lib/command.php:857
 msgid "No one is subscribed to you."
 msgstr "Никто не подписан на вас."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:858
+#: lib/command.php:862
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Эти люди подписались на вас:"
@@ -7101,14 +7204,14 @@ msgstr[2] "Эти люди подписались на вас:"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:880
+#: lib/command.php:884
 msgid "You are not a member of any groups."
 msgstr "Вы не состоите ни в одной группе."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:885
+#: lib/command.php:889
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Вы являетесь участником следующих групп:"
@@ -7116,7 +7219,7 @@ msgstr[1] "Вы являетесь участником следующих гр�
 msgstr[2] "Вы являетесь участником следующих групп:"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:900
+#: lib/command.php:904
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -7347,7 +7450,8 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 латинских строчных буквы или цифры, без пробелов"
 
 #: lib/groupeditform.php:163
-msgid "URL of the homepage or blog of the group or topic"
+#, fuzzy
+msgid "URL of the homepage or blog of the group or topic."
 msgstr "Адрес страницы, дневника или профиля группы на другом портале"
 
 #: lib/groupeditform.php:168
@@ -7355,19 +7459,34 @@ msgid "Describe the group or topic"
 msgstr "Опишите группу или тему"
 
 #: lib/groupeditform.php:170
-#, php-format
-msgid "Describe the group or topic in %d characters"
-msgstr "Опишите группу или тему при помощи %d символов"
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d character or less"
+msgid_plural "Describe the group or topic in %d characters or less"
+msgstr[0] "Опишите группу или тему при помощи %d символов"
+msgstr[1] "Опишите группу или тему при помощи %d символов"
+msgstr[2] "Опишите группу или тему при помощи %d символов"
 
-#: lib/groupeditform.php:179
+#: lib/groupeditform.php:182
+#, fuzzy
 msgid ""
-"Location for the group, if any, like \"City, State (or Region), Country\""
+"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/groupeditform.php:190
+#, fuzzy, php-format
+msgid ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"alias allowed."
+msgid_plural ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"aliases allowed."
+msgstr[0] ""
+"Дополнительные имена для группы, разделённые запятой или пробелом, максимум %"
+"d имён"
+msgstr[1] ""
+"Дополнительные имена для группы, разделённые запятой или пробелом, максимум %"
+"d имён"
+msgstr[2] ""
 "Дополнительные имена для группы, разделённые запятой или пробелом, максимум %"
 "d имён"
 
@@ -7927,7 +8046,7 @@ msgstr "Простите, это не Ваш входящий электронн
 msgid "Sorry, no incoming email allowed."
 msgstr "Простите, входящих писем нет."
 
-#: lib/mailhandler.php:228
+#: lib/mailhandler.php:229
 #, php-format
 msgid "Unsupported message type: %s"
 msgstr "Неподдерживаемый формат файла изображения: %s"
@@ -8273,16 +8392,17 @@ msgid "Sandbox this user"
 msgstr "Установить режим песочницы для этого пользователя"
 
 #. TRANS: Fieldset legend for the search form.
-#: lib/searchaction.php:121
+#: lib/searchaction.php:120
 msgid "Search site"
 msgstr "Поиск по сайту"
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
-#: lib/searchaction.php:129
+#: lib/searchaction.php:128
 msgid "Keyword(s)"
 msgstr "Ключевые слова"
 
+#. TRANS: Button text for searching site.
 #: lib/searchaction.php:130
 msgctxt "BUTTON"
 msgid "Search"
@@ -8372,8 +8492,8 @@ msgid "The theme file is missing or the upload failed."
 msgstr "Файл темы отсутствует или произошёл сбой при загрузке."
 
 #: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:278 lib/themeuploader.php:282
-#: lib/themeuploader.php:290 lib/themeuploader.php:297
+#: lib/themeuploader.php:279 lib/themeuploader.php:283
+#: lib/themeuploader.php:291 lib/themeuploader.php:298
 msgid "Failed saving theme."
 msgstr "Ошибка при сохранении темы."
 
@@ -8382,17 +8502,25 @@ msgid "Invalid theme: bad directory structure."
 msgstr "Ошибочная тема. Плохая структура директорий."
 
 #: lib/themeuploader.php:166
-#, php-format
-msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
-msgstr ""
+#, fuzzy, php-format
+msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
+msgid_plural ""
+"Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr[0] ""
+"Размер загруженной темы слишком велик, в распакованном виде она должна "
+"занимать не более %d байт."
+msgstr[1] ""
+"Размер загруженной темы слишком велик, в распакованном виде она должна "
+"занимать не более %d байт."
+msgstr[2] ""
 "Размер загруженной темы слишком велик, в распакованном виде она должна "
 "занимать не более %d байт."
 
-#: lib/themeuploader.php:178
+#: lib/themeuploader.php:179
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr "Недопустимый архив: темы. Отсутствует файл css/display.css"
 
-#: lib/themeuploader.php:218
+#: lib/themeuploader.php:219
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
@@ -8400,16 +8528,16 @@ msgstr ""
 "Тема содержит недопустимое имя файла или папки. Допустимы буквы ASCII, "
 "цифры, подчеркивание и знак минуса."
 
-#: lib/themeuploader.php:224
+#: lib/themeuploader.php:225
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr "Тема содержит файлы с опасным расширением; это может быть небезопасно."
 
-#: lib/themeuploader.php:241
+#: lib/themeuploader.php:242
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr "Тема содержит файл недопустимого типа «.%s»."
 
-#: lib/themeuploader.php:259
+#: lib/themeuploader.php:260
 msgid "Error opening theme archive."
 msgstr "Ошибка открытия архива темы."
 
@@ -8600,23 +8728,40 @@ msgstr[1] ""
 msgstr[2] ""
 "Сообщение слишком длинное — не больше %1$d символов, вы отправили %2$d."
 
-#: scripts/restoreuser.php:82
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: scripts/restoreuser.php:61
 #, php-format
-msgid "Backup file for user %s (%s)"
+msgid "Getting backup from file '%s'."
 msgstr ""
 
-#: scripts/restoreuser.php:88
+#. TRANS: Commandline script output.
+#: scripts/restoreuser.php:91
 #, fuzzy
 msgid "No user specified; using backup user."
 msgstr "Не указан идентификатор пользователя."
 
-#: scripts/restoreuser.php:94
+#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
+#: scripts/restoreuser.php:98
 #, php-format
-msgid "%d entries in backup."
-msgstr ""
+msgid "%d entry in backup."
+msgid_plural "%d entries in backup."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#, fuzzy
+#~ msgid "Name is too long (maximum 255 chars)."
+#~ msgstr "Имя слишком длинное (не больше 255 знаков)."
+
+#, fuzzy
+#~ msgid "Organization is too long (maximum 255 chars)."
+#~ msgstr "Слишком длинное название организации (максимум 255 знаков)."
+
+#~ msgid "That's too long. Max notice size is %d chars."
+#~ msgstr "Слишком длинная запись. Максимальная длина — %d знаков."
 
-#~ msgid "Description is too long (max %d chars)."
-#~ msgstr "Слишком длинное описание (максимум %d символов)"
+#~ msgid "Max notice size is %d chars, including attachment URL."
+#~ msgstr "Максимальная длина записи — %d символов, включая URL вложения."
 
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "Слишком много алиасов! Максимальное число — %d."
+#~ msgid " tagged %s"
+#~ msgstr "  с тегом %s"
diff --git a/locale/statusnet.pot b/locale/statusnet.pot
index 375c6bc74..ed52e7f84 100644
--- a/locale/statusnet.pot
+++ b/locale/statusnet.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-30 23:18+0000\n"
+"POT-Creation-Date: 2010-11-02 22:51+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"
@@ -72,15 +72,20 @@ msgstr ""
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
+#. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
+#. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #: actions/accessadminpanel.php:193 actions/emailsettings.php:228
-#: actions/imsettings.php:187 actions/pathsadminpanel.php:512
-#: actions/profilesettings.php:201 actions/smssettings.php:209
-#: actions/subscriptions.php:246 lib/applicationeditform.php:355
+#: actions/imsettings.php:187 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: lib/applicationeditform.php:355 lib/groupeditform.php:207
 msgctxt "BUTTON"
 msgid "Save"
 msgstr ""
@@ -131,7 +136,7 @@ msgstr ""
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:495 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr ""
@@ -198,7 +203,9 @@ msgstr ""
 
 #. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:208
+#. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -542,8 +549,11 @@ msgstr ""
 #. TRANS: Group edit form validation error.
 #. TRANS: Form validation error in New application form.
 #. TRANS: %d is the maximum number of characters for the description.
+#. TRANS: Group create form validation error.
+#. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:220 actions/editapplication.php:201
 #: actions/editgroup.php:216 actions/newapplication.php:178
+#: actions/newgroup.php:152
 #, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -699,14 +709,14 @@ msgstr ""
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:172 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:74
 #: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
 #: actions/groupunblock.php:65 actions/imsettings.php:230
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
-#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/othersettings.php:153 actions/passwordsettings.php:138
 #: actions/profilesettings.php:221 actions/recoverpassword.php:350
 #: actions/register.php:172 actions/remotesubscribe.php:77
 #: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
@@ -874,20 +884,21 @@ msgstr ""
 
 #. TRANS: Client error displayed trying to repeat a non-existing notice through the API.
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
+#. TRANS: Error message displayed trying to delete a non-existing notice.
 #: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/deletenotice.php:58 actions/shownotice.php:92
+#: actions/deletenotice.php:61 actions/shownotice.php:92
 msgid "No such notice."
 msgstr ""
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:535
+#: actions/apistatusesretweet.php:83 lib/command.php:537
 msgid "Cannot repeat your own notice."
 msgstr ""
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:541
+#: actions/apistatusesretweet.php:92 lib/command.php:543
 msgid "Already repeated that notice."
 msgstr ""
 
@@ -908,7 +919,8 @@ msgstr ""
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#: actions/apistatusesupdate.php:244
+#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
+#: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
@@ -922,7 +934,7 @@ msgstr ""
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
-#: actions/apistatusesupdate.php:308
+#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
 #, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
@@ -1128,17 +1140,18 @@ msgstr ""
 msgid "Lost our file data."
 msgstr ""
 
-#: actions/avatarsettings.php:384
+#. TRANS: Success message for having updated a user avatar.
+#: actions/avatarsettings.php:385
 msgid "Avatar updated."
 msgstr ""
 
 #. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
-#: actions/avatarsettings.php:388
+#: actions/avatarsettings.php:389
 msgid "Failed updating avatar."
 msgstr ""
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:412
+#: actions/avatarsettings.php:413
 msgid "Avatar deleted."
 msgstr ""
 
@@ -1167,8 +1180,8 @@ msgstr ""
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:154 actions/deleteapplication.php:154
-#: actions/deletegroup.php:220 actions/deletenotice.php:150
+#: actions/block.php:154 actions/deleteapplication.php:157
+#: actions/deletegroup.php:220 actions/deletenotice.php:155
 #: actions/deleteuser.php:152 actions/groupblock.php:178
 msgctxt "BUTTON"
 msgid "No"
@@ -1186,8 +1199,8 @@ msgstr ""
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:161 actions/deleteapplication.php:161
-#: actions/deletegroup.php:227 actions/deletenotice.php:157
+#: actions/block.php:161 actions/deleteapplication.php:164
+#: actions/deletegroup.php:227 actions/deletenotice.php:162
 #: actions/deleteuser.php:159 actions/groupblock.php:185
 msgctxt "BUTTON"
 msgid "Yes"
@@ -1303,12 +1316,13 @@ msgstr ""
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
 #. TRANS: Server error thrown on database error updating IM preferences.
 #. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
 #. TRANS: Server error thrown when user profile settings could not be updated.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #: actions/confirmaddress.php:118 actions/emailsettings.php:331
 #: actions/emailsettings.php:477 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:174
+#: actions/imsettings.php:442 actions/othersettings.php:184
 #: actions/profilesettings.php:326 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
@@ -1343,16 +1357,19 @@ msgstr ""
 msgid "Notices"
 msgstr ""
 
-#: actions/deleteapplication.php:63
+#. TRANS: Client error displayed trying to delete an application while not logged in.
+#: actions/deleteapplication.php:62
 msgid "You must be logged in to delete an application."
 msgstr ""
 
+#. TRANS: Client error displayed trying to delete an application that does not exist.
 #: actions/deleteapplication.php:71
 msgid "Application not found."
 msgstr ""
 
+#. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
-#: actions/deleteapplication.php:78 actions/editapplication.php:78
+#: actions/deleteapplication.php:79 actions/editapplication.php:78
 #: actions/showapplication.php:94
 msgid "You are not the owner of this application."
 msgstr ""
@@ -1360,15 +1377,18 @@ msgstr ""
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
 #: actions/newapplication.php:114 actions/showapplication.php:118
-#: lib/action.php:1354
+#: lib/action.php:1404
 msgid "There was a problem with your session token."
 msgstr ""
 
-#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+#. TRANS: Title for delete application page.
+#. TRANS: Fieldset legend on delete application page.
+#: actions/deleteapplication.php:124 actions/deleteapplication.php:149
 msgid "Delete application"
 msgstr ""
 
-#: actions/deleteapplication.php:149
+#. TRANS: Confirmation text on delete application page.
+#: actions/deleteapplication.php:152
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
 "about the application from the database, including all existing user "
@@ -1376,12 +1396,12 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:158
+#: actions/deleteapplication.php:161
 msgid "Do not delete this application"
 msgstr ""
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:164
+#: actions/deleteapplication.php:167
 msgid "Delete this application"
 msgstr ""
 
@@ -1415,12 +1435,13 @@ msgstr ""
 msgid "Deleted group %s"
 msgstr ""
 
-#. TRANS: Title.
+#. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
 #: actions/deletegroup.php:176 actions/deletegroup.php:202
 msgid "Delete group"
 msgstr ""
 
+#. TRANS: Warning in form for deleleting a group.
 #: actions/deletegroup.php:206
 msgid ""
 "Are you sure you want to delete this group? This will clear all data about "
@@ -1438,10 +1459,11 @@ msgstr ""
 msgid "Delete this group"
 msgstr ""
 
+#. TRANS: Error message displayed trying to delete a notice while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1451,31 +1473,36 @@ msgstr ""
 msgid "Not logged in."
 msgstr ""
 
-#: actions/deletenotice.php:74
+#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
+#: actions/deletenotice.php:78
 msgid "Can't delete this notice."
 msgstr ""
 
-#: actions/deletenotice.php:106
+#. TRANS: Instructions for deleting a notice.
+#: actions/deletenotice.php:110
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
 msgstr ""
 
-#: actions/deletenotice.php:112 actions/deletenotice.php:144
+#. TRANS: Page title when deleting a notice.
+#. TRANS: Fieldset legend for the delete notice form.
+#: actions/deletenotice.php:117 actions/deletenotice.php:148
 msgid "Delete notice"
 msgstr ""
 
-#: actions/deletenotice.php:147
+#. TRANS: Message for the delete notice form.
+#: actions/deletenotice.php:152
 msgid "Are you sure you want to delete this notice?"
 msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:154
+#: actions/deletenotice.php:159
 msgid "Do not delete this notice"
 msgstr ""
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:161 lib/noticelist.php:667
+#: actions/deletenotice.php:166 lib/noticelist.php:667
 msgid "Delete this notice"
 msgstr ""
 
@@ -1633,11 +1660,9 @@ msgstr ""
 
 #. TRANS: Submit button title.
 #: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
-#: actions/othersettings.php:126 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: actions/useradminpanel.php:295 lib/applicationeditform.php:357
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: lib/applicationeditform.php:357 lib/designsettings.php:256
 msgid "Save"
 msgstr ""
 
@@ -1685,8 +1710,8 @@ msgid "Name is required."
 msgstr ""
 
 #. TRANS: Validation error shown when providing too long a name in the "Edit application" form.
-#: actions/editapplication.php:188
-msgid "Name is too long (max 255 characters)."
+#: actions/editapplication.php:188 actions/newapplication.php:169
+msgid "Name is too long (maximum 255 characters)."
 msgstr ""
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
@@ -1715,7 +1740,7 @@ msgid "Organization is required."
 msgstr ""
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#: actions/editapplication.php:223
+#: actions/editapplication.php:223 actions/newapplication.php:199
 msgid "Organization is too long (maximum 255 characters)."
 msgstr ""
 
@@ -2474,7 +2499,7 @@ msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr ""
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:180
+#: actions/imsettings.php:290 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr ""
 
@@ -2593,10 +2618,9 @@ msgstr[1] ""
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#. TRANS: Whois output.
-#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:145 actions/invite.php:159 lib/command.php:426
+#: actions/invite.php:145 actions/invite.php:159
 #, php-format
+msgctxt "INVITE"
 msgid "%1$s (%2$s)"
 msgstr ""
 
@@ -2747,7 +2771,7 @@ msgid ""
 msgstr ""
 
 #: actions/licenseadminpanel.php:156
-msgid "Invalid license title. Max length is 255 characters."
+msgid "Invalid license title. Maximum length is 255 characters."
 msgstr ""
 
 #: actions/licenseadminpanel.php:168
@@ -2915,18 +2939,10 @@ msgstr ""
 msgid "Use this form to register a new application."
 msgstr ""
 
-#: actions/newapplication.php:169
-msgid "Name is too long (maximum 255 chars)."
-msgstr ""
-
 #: actions/newapplication.php:184
 msgid "Source URL is required."
 msgstr ""
 
-#: actions/newapplication.php:199
-msgid "Organization is too long (maximum 255 chars)."
-msgstr ""
-
 #: actions/newapplication.php:266 actions/newapplication.php:275
 msgid "Could not create application."
 msgstr ""
@@ -2946,14 +2962,14 @@ msgid "New message"
 msgstr ""
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:499
+#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501
 msgid "You can't send a message to this user."
 msgstr ""
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
 #: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
-#: lib/command.php:579
+#: lib/command.php:581
 msgid "No content!"
 msgstr ""
 
@@ -2962,7 +2978,7 @@ msgid "No recipient specified."
 msgstr ""
 
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:503
+#: actions/newmessage.php:167 lib/command.php:505
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -2973,12 +2989,12 @@ msgstr ""
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:511
+#: actions/newmessage.php:188 lib/command.php:513
 #, php-format
 msgid "Direct message to %s sent."
 msgstr ""
 
-#: actions/newmessage.php:213 actions/newnotice.php:263
+#: actions/newmessage.php:213 actions/newnotice.php:264
 msgid "Ajax Error"
 msgstr ""
 
@@ -2986,17 +3002,7 @@ msgstr ""
 msgid "New notice"
 msgstr ""
 
-#: actions/newnotice.php:159 lib/mailhandler.php:60
-#, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr ""
-
-#: actions/newnotice.php:183
-#, php-format
-msgid "Max notice size is %d chars, including attachment URL."
-msgstr ""
-
-#: actions/newnotice.php:229
+#: actions/newnotice.php:230
 msgid "Notice posted"
 msgstr ""
 
@@ -3156,36 +3162,45 @@ msgstr ""
 msgid "Notice Search"
 msgstr ""
 
-#: actions/othersettings.php:60
+#: actions/othersettings.php:59
 msgid "Other settings"
 msgstr ""
 
+#. TRANS: Instructions for tab "Other" in user profile settings.
 #: actions/othersettings.php:71
 msgid "Manage various other options."
 msgstr ""
 
-#: actions/othersettings.php:108
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/othersettings.php:111
 msgid " (free service)"
 msgstr ""
 
-#: actions/othersettings.php:116
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/othersettings.php:120
 msgid "Shorten URLs with"
 msgstr ""
 
-#: actions/othersettings.php:117
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/othersettings.php:122
 msgid "Automatic shortening service to use."
 msgstr ""
 
-#: actions/othersettings.php:122
+#. TRANS: Label for checkbox.
+#: actions/othersettings.php:128
 msgid "View profile designs"
 msgstr ""
 
-#: actions/othersettings.php:123
+#. TRANS: Tooltip for checkbox.
+#: actions/othersettings.php:130
 msgid "Show or hide profile designs."
 msgstr ""
 
-#: actions/othersettings.php:153
-msgid "URL shortening service is too long (max 50 chars)."
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/othersettings.php:162
+msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr ""
 
 #: actions/otp.php:69
@@ -3649,7 +3664,7 @@ msgstr ""
 #. TRANS: Label for group location (dt). Text hidden by default.
 #: actions/profilesettings.php:149 actions/register.php:485
 #: actions/showgroup.php:267 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:177
+#: actions/userauthorization.php:166 lib/groupeditform.php:180
 #: lib/userprofile.php:165
 msgid "Location"
 msgstr ""
@@ -3968,7 +3983,7 @@ msgid "Unexpected password reset."
 msgstr ""
 
 #: actions/recoverpassword.php:365
-msgid "Password must be 6 chars or more."
+msgid "Password must be 6 characters or more."
 msgstr ""
 
 #: actions/recoverpassword.php:369
@@ -4310,7 +4325,7 @@ msgstr ""
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:172
+#: lib/applicationeditform.php:208 lib/groupeditform.php:175
 msgid "Description"
 msgstr ""
 
@@ -4452,7 +4467,7 @@ msgid "Note"
 msgstr ""
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:298 lib/groupeditform.php:184
+#: actions/showgroup.php:298 lib/groupeditform.php:187
 msgid "Aliases"
 msgstr ""
 
@@ -4573,60 +4588,84 @@ msgstr ""
 msgid "Notice deleted."
 msgstr ""
 
-#: actions/showstream.php:72
+#. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
+#: actions/showstream.php:70
 #, php-format
-msgid " tagged %s"
+msgid "%1$s tagged %2$s"
 msgstr ""
 
-#: actions/showstream.php:78
+#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#: actions/showstream.php:74
+#, php-format
+msgid "%1$s tagged %2$s, page %3$d"
+msgstr ""
+
+#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$d is the page number.
+#: actions/showstream.php:82
 #, php-format
 msgid "%1$s, page %2$d"
 msgstr ""
 
-#: actions/showstream.php:120
+#. TRANS: Title for link to notice feed.
+#. TRANS: %1$s is a user nickname, %2$s is a hashtag.
+#: actions/showstream.php:127
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr ""
 
-#: actions/showstream.php:127
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:136
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr ""
 
-#: actions/showstream.php:134
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:145
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr ""
 
-#: actions/showstream.php:141
+#: actions/showstream.php:152
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr ""
 
-#: actions/showstream.php:146
+#. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
+#. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
+#: actions/showstream.php:159
 #, php-format
 msgid "FOAF for %s"
 msgstr ""
 
-#: actions/showstream.php:197
+#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
+#: actions/showstream.php:211
 #, php-format
-msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
+msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr ""
 
-#: actions/showstream.php:202
+#. TRANS: Second sentence of empty list message for a stream for the user themselves.
+#: actions/showstream.php:217
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
 msgstr ""
 
-#: actions/showstream.php:204
+#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:221
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
 "%?status_textarea=%2$s)."
 msgstr ""
 
-#: actions/showstream.php:243
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:264
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4635,7 +4674,9 @@ msgid ""
 "follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
 
-#: actions/showstream.php:248
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:271
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4643,7 +4684,8 @@ msgid ""
 "[StatusNet](http://status.net/) tool. "
 msgstr ""
 
-#: actions/showstream.php:305
+#. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
+#: actions/showstream.php:328
 #, php-format
 msgid "Repeat of %s"
 msgstr ""
@@ -4753,31 +4795,38 @@ msgstr ""
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:56
+#. TRANS: Page title for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:55
 msgid "Site Notice"
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:67
+#. TRANS: Instructions for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:66
 msgid "Edit site-wide message"
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:103
+#. TRANS: Server error displayed when saving a site-wide notice was impossible.
+#: actions/sitenoticeadminpanel.php:101
 msgid "Unable to save site notice."
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:113
-msgid "Max length for the site-wide notice is 255 chars."
+#. TRANS: Client error displayed when a site-wide notice was longer than allowed.
+#: actions/sitenoticeadminpanel.php:112
+msgid "Maximum length for the site-wide notice is 255 characters."
 msgstr ""
 
+#. TRANS: Label for site-wide notice text field in admin panel.
 #: actions/sitenoticeadminpanel.php:176
 msgid "Site notice text"
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:178
-msgid "Site-wide notice text (255 chars max; HTML okay)"
+#. TRANS: Tooltip for site-wide notice text field in admin panel.
+#: actions/sitenoticeadminpanel.php:179
+msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:198
+#. TRANS: Title for button to save site notice in admin panel.
+#: actions/sitenoticeadminpanel.php:201
 msgid "Save site notice"
 msgstr ""
 
@@ -5218,75 +5267,91 @@ msgid ""
 msgstr ""
 
 #. TRANS: User admin panel title
-#: actions/useradminpanel.php:60
+#: actions/useradminpanel.php:58
 msgctxt "TITLE"
 msgid "User"
 msgstr ""
 
-#: actions/useradminpanel.php:71
+#. TRANS: Instruction for user admin panel.
+#: actions/useradminpanel.php:69
 msgid "User settings for this StatusNet site"
 msgstr ""
 
-#: actions/useradminpanel.php:150
+#. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
+#: actions/useradminpanel.php:147
 msgid "Invalid bio limit. Must be numeric."
 msgstr ""
 
-#: actions/useradminpanel.php:156
-msgid "Invalid welcome text. Max length is 255 characters."
+#. TRANS: Form validation error in user admin panel when welcome text is too long.
+#: actions/useradminpanel.php:154
+msgid "Invalid welcome text. Maximum length is 255 characters."
 msgstr ""
 
+#. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
+#. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
 #, php-format
-msgid "Invalid default subscripton: '%1$s' is not user."
+msgid "Invalid default subscripton: '%1$s' is not a user."
 msgstr ""
 
 #. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:106
+#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
 #: lib/personalgroupnav.php:109
 msgid "Profile"
 msgstr ""
 
-#: actions/useradminpanel.php:223
+#. TRANS: Field label in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:220
 msgid "Bio Limit"
 msgstr ""
 
-#: actions/useradminpanel.php:224
+#. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:222
 msgid "Maximum length of a profile bio in characters."
 msgstr ""
 
-#: actions/useradminpanel.php:232
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:231
 msgid "New users"
 msgstr ""
 
+#. TRANS: Field label in user admin panel for setting new user welcome text.
 #: actions/useradminpanel.php:236
 msgid "New user welcome"
 msgstr ""
 
-#: actions/useradminpanel.php:237
-msgid "Welcome text for new users (Max 255 chars)."
+#. TRANS: Tooltip in user admin panel for setting new user welcome text.
+#: actions/useradminpanel.php:238
+msgid "Welcome text for new users (maximum 255 characters)."
 msgstr ""
 
-#: actions/useradminpanel.php:242
+#. TRANS: Field label in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:244
 msgid "Default subscription"
 msgstr ""
 
-#: actions/useradminpanel.php:243
+#. TRANS: Tooltip in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:246
 msgid "Automatically subscribe new users to this user."
 msgstr ""
 
-#: actions/useradminpanel.php:252
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:256
 msgid "Invitations"
 msgstr ""
 
-#: actions/useradminpanel.php:257
+#. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:262
 msgid "Invitations enabled"
 msgstr ""
 
-#: actions/useradminpanel.php:259
+#. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:265
 msgid "Whether to allow users to invite new users."
 msgstr ""
 
-#: actions/useradminpanel.php:295
+#. TRANS: Title for button to save user settings in user admin panel.
+#: actions/useradminpanel.php:302
 msgid "Save user settings"
 msgstr ""
 
@@ -5474,7 +5539,7 @@ msgid "Plugins"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:831
+#: actions/version.php:198 lib/action.php:880
 msgid "Version"
 msgstr ""
 
@@ -5677,16 +5742,23 @@ msgstr ""
 msgid "RT @%1$s %2$s"
 msgstr ""
 
+#. TRANS: Full name of a profile or group followed by nickname in parens
+#: classes/Profile.php:164
+#, php-format
+msgctxt "FANCYNAME"
+msgid "%1$s (%2$s)"
+msgstr ""
+
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:791
+#: classes/Profile.php:812
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:800
+#: classes/Profile.php:821
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -5831,194 +5903,201 @@ msgstr ""
 msgid "Untitled page"
 msgstr ""
 
+#. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
+#: lib/action.php:310
+msgctxt "TOOLTIP"
+msgid "Show more"
+msgstr ""
+
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:477
+#: lib/action.php:526
 msgid "Primary site navigation"
 msgstr ""
 
 #. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:483
+#: lib/action.php:532
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr ""
 
 #. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:486
+#: lib/action.php:535
 msgctxt "MENU"
 msgid "Personal"
 msgstr ""
 
 #. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:488
+#: lib/action.php:537
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
 msgstr ""
 
 #. TRANS: Main menu option when logged in for access to user settings
-#: lib/action.php:491
+#: lib/action.php:540
 msgid "Account"
 msgstr ""
 
 #. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:493
+#: lib/action.php:542
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr ""
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:496
+#: lib/action.php:545
 msgid "Connect"
 msgstr ""
 
 #. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:499
+#: lib/action.php:548
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr ""
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:502 lib/groupnav.php:117
+#: lib/action.php:551 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr ""
 
 #. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:506
+#: lib/action.php:555
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr ""
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:509
+#: lib/action.php:558
 msgctxt "MENU"
 msgid "Invite"
 msgstr ""
 
 #. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:515
+#: lib/action.php:564
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr ""
 
 #. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:518
+#: lib/action.php:567
 msgctxt "MENU"
 msgid "Logout"
 msgstr ""
 
 #. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:523
+#: lib/action.php:572
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr ""
 
 #. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:526
+#: lib/action.php:575
 msgctxt "MENU"
 msgid "Register"
 msgstr ""
 
 #. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:529
+#: lib/action.php:578
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr ""
 
 #. TRANS: Main menu option when not logged in to log in
-#: lib/action.php:532
+#: lib/action.php:581
 msgctxt "MENU"
 msgid "Login"
 msgstr ""
 
 #. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:535
+#: lib/action.php:584
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr ""
 
 #. TRANS: Main menu option for help on the StatusNet site
-#: lib/action.php:538
+#: lib/action.php:587
 msgctxt "MENU"
 msgid "Help"
 msgstr ""
 
 #. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:541
+#: lib/action.php:590
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr ""
 
 #. TRANS: Main menu option when logged in or when the StatusNet instance is not private
-#: lib/action.php:544
+#: lib/action.php:593
 msgctxt "MENU"
 msgid "Search"
 msgstr ""
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:566 lib/adminpanelaction.php:387
+#: lib/action.php:615 lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr ""
 
 #. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:633
+#: lib/action.php:682
 msgid "Local views"
 msgstr ""
 
 #. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:703
+#: lib/action.php:752
 msgid "Page notice"
 msgstr ""
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:804
+#: lib/action.php:853
 msgid "Secondary site navigation"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:810
+#: lib/action.php:859
 msgid "Help"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:813
+#: lib/action.php:862
 msgid "About"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:816
+#: lib/action.php:865
 msgid "FAQ"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:821
+#: lib/action.php:870
 msgid "TOS"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:825
+#: lib/action.php:874
 msgid "Privacy"
 msgstr ""
 
-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:828
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+#: lib/action.php:877
 msgid "Source"
 msgstr ""
 
-#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:834
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+#: lib/action.php:884
 msgid "Contact"
 msgstr ""
 
-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:837
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+#: lib/action.php:887
 msgid "Badge"
 msgstr ""
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:866
+#: lib/action.php:916
 msgid "StatusNet software license"
 msgstr ""
 
@@ -6026,7 +6105,7 @@ msgstr ""
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:873
+#: lib/action.php:923
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -6034,7 +6113,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:876
+#: lib/action.php:926
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr ""
@@ -6043,7 +6122,7 @@ msgstr ""
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:883
+#: lib/action.php:933
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -6052,50 +6131,50 @@ msgid ""
 msgstr ""
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:899
+#: lib/action.php:949
 msgid "Site content license"
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:906
+#: lib/action.php:956
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:913
+#: lib/action.php:963
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:917
+#: lib/action.php:967
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:949
+#: lib/action.php:999
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1285
+#: lib/action.php:1335
 msgid "Pagination"
 msgstr ""
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1296
+#: lib/action.php:1346
 msgid "After"
 msgstr ""
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1306
+#: lib/action.php:1356
 msgid "Before"
 msgstr ""
 
@@ -6432,7 +6511,7 @@ msgid "AJAX error"
 msgstr ""
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:233 lib/mailhandler.php:142
+#: lib/channel.php:233 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr ""
 
@@ -6448,7 +6527,7 @@ msgstr ""
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:626
+#: lib/command.php:99 lib/command.php:630
 msgid "User has no last notice."
 msgstr ""
 
@@ -6514,6 +6593,14 @@ msgstr ""
 msgid "%1$s left group %2$s."
 msgstr ""
 
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: lib/command.php:426
+#, php-format
+msgctxt "WHOIS"
+msgid "%1$s (%2$s)"
+msgstr ""
+
 #. TRANS: Whois output. %s is the full name of the queried user.
 #: lib/command.php:430
 #, php-format
@@ -6551,133 +6638,137 @@ msgid ""
 "same server."
 msgstr ""
 
-#. TRANS: Message given if content is too long.
+#. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
 #: lib/command.php:488
 #, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
+msgid "Message too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] ""
+msgstr[1] ""
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:514
+#: lib/command.php:516
 msgid "Error sending direct message."
 msgstr ""
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:551
+#: lib/command.php:553
 #, php-format
 msgid "Notice from %s repeated."
 msgstr ""
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:554
+#: lib/command.php:556
 msgid "Error repeating notice."
 msgstr ""
 
-#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:589
+#: lib/command.php:591
 #, php-format
-msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
+msgid "Notice too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] ""
+msgstr[1] ""
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:600
+#: lib/command.php:604
 #, php-format
 msgid "Reply to %s sent."
 msgstr ""
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:603
+#: lib/command.php:607
 msgid "Error saving notice."
 msgstr ""
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:650
+#: lib/command.php:654
 msgid "Specify the name of the user to subscribe to."
 msgstr ""
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:659
+#: lib/command.php:663
 msgid "Can't subscribe to OMB profiles by command."
 msgstr ""
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:667
+#: lib/command.php:671
 #, php-format
 msgid "Subscribed to %s."
 msgstr ""
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:688 lib/command.php:799
+#: lib/command.php:692 lib/command.php:803
 msgid "Specify the name of the user to unsubscribe from."
 msgstr ""
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:699
+#: lib/command.php:703
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:719 lib/command.php:745
+#: lib/command.php:723 lib/command.php:749
 msgid "Command not yet implemented."
 msgstr ""
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:723
+#: lib/command.php:727
 msgid "Notification off."
 msgstr ""
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:726
+#: lib/command.php:730
 msgid "Can't turn off notification."
 msgstr ""
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:749
+#: lib/command.php:753
 msgid "Notification on."
 msgstr ""
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:752
+#: lib/command.php:756
 msgid "Can't turn on notification."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:766
+#: lib/command.php:770
 msgid "Login command is disabled."
 msgstr ""
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:779
+#: lib/command.php:783
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:808
+#: lib/command.php:812
 #, php-format
 msgid "Unsubscribed %s."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:826
+#: lib/command.php:830
 msgid "You are not subscribed to anyone."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:831
+#: lib/command.php:835
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] ""
@@ -6685,14 +6776,14 @@ msgstr[1] ""
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:853
+#: lib/command.php:857
 msgid "No one is subscribed to you."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:858
+#: lib/command.php:862
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] ""
@@ -6700,21 +6791,21 @@ msgstr[1] ""
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:880
+#: lib/command.php:884
 msgid "You are not a member of any groups."
 msgstr ""
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:885
+#: lib/command.php:889
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:900
+#: lib/command.php:904
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -6898,7 +6989,7 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr ""
 
 #: lib/groupeditform.php:163
-msgid "URL of the homepage or blog of the group or topic"
+msgid "URL of the homepage or blog of the group or topic."
 msgstr ""
 
 #: lib/groupeditform.php:168
@@ -6907,18 +6998,26 @@ msgstr ""
 
 #: lib/groupeditform.php:170
 #, php-format
-msgid "Describe the group or topic in %d characters"
-msgstr ""
+msgid "Describe the group or topic in %d character or less"
+msgid_plural "Describe the group or topic in %d characters or less"
+msgstr[0] ""
+msgstr[1] ""
 
-#: lib/groupeditform.php:179
+#: lib/groupeditform.php:182
 msgid ""
-"Location for the group, if any, like \"City, State (or Region), Country\""
+"Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr ""
 
-#: lib/groupeditform.php:187
+#: lib/groupeditform.php:190
 #, php-format
-msgid "Extra nicknames for the group, comma- or space- separated, max %d"
-msgstr ""
+msgid ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"alias allowed."
+msgid_plural ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"aliases allowed."
+msgstr[0] ""
+msgstr[1] ""
 
 #. TRANS: Menu item in the group navigation page.
 #: lib/groupnav.php:86
@@ -7370,7 +7469,7 @@ msgstr ""
 msgid "Sorry, no incoming email allowed."
 msgstr ""
 
-#: lib/mailhandler.php:228
+#: lib/mailhandler.php:229
 #, php-format
 msgid "Unsupported message type: %s"
 msgstr ""
@@ -7710,16 +7809,17 @@ msgid "Sandbox this user"
 msgstr ""
 
 #. TRANS: Fieldset legend for the search form.
-#: lib/searchaction.php:121
+#: lib/searchaction.php:120
 msgid "Search site"
 msgstr ""
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
-#: lib/searchaction.php:129
+#: lib/searchaction.php:128
 msgid "Keyword(s)"
 msgstr ""
 
+#. TRANS: Button text for searching site.
 #: lib/searchaction.php:130
 msgctxt "BUTTON"
 msgid "Search"
@@ -7809,8 +7909,8 @@ msgid "The theme file is missing or the upload failed."
 msgstr ""
 
 #: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:278 lib/themeuploader.php:282
-#: lib/themeuploader.php:290 lib/themeuploader.php:297
+#: lib/themeuploader.php:279 lib/themeuploader.php:283
+#: lib/themeuploader.php:291 lib/themeuploader.php:298
 msgid "Failed saving theme."
 msgstr ""
 
@@ -7820,29 +7920,32 @@ msgstr ""
 
 #: lib/themeuploader.php:166
 #, php-format
-msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
-msgstr ""
+msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
+msgid_plural ""
+"Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr[0] ""
+msgstr[1] ""
 
-#: lib/themeuploader.php:178
+#: lib/themeuploader.php:179
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr ""
 
-#: lib/themeuploader.php:218
+#: lib/themeuploader.php:219
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
 msgstr ""
 
-#: lib/themeuploader.php:224
+#: lib/themeuploader.php:225
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr ""
 
-#: lib/themeuploader.php:241
+#: lib/themeuploader.php:242
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr ""
 
-#: lib/themeuploader.php:259
+#: lib/themeuploader.php:260
 msgid "Error opening theme archive."
 msgstr ""
 
@@ -8022,16 +8125,21 @@ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
 msgstr[0] ""
 msgstr[1] ""
 
-#: scripts/restoreuser.php:82
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: scripts/restoreuser.php:61
 #, php-format
-msgid "Backup file for user %s (%s)"
+msgid "Getting backup from file '%s'."
 msgstr ""
 
-#: scripts/restoreuser.php:88
+#. TRANS: Commandline script output.
+#: scripts/restoreuser.php:91
 msgid "No user specified; using backup user."
 msgstr ""
 
-#: scripts/restoreuser.php:94
+#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
+#: scripts/restoreuser.php:98
 #, php-format
-msgid "%d entries in backup."
-msgstr ""
+msgid "%d entry in backup."
+msgid_plural "%d entries in backup."
+msgstr[0] ""
+msgstr[1] ""
diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po
index 902a554ba..9cc6991dc 100644
--- a/locale/sv/LC_MESSAGES/statusnet.po
+++ b/locale/sv/LC_MESSAGES/statusnet.po
@@ -11,17 +11,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-30 23:18+0000\n"
-"PO-Revision-Date: 2010-10-30 23:20:46+0000\n"
+"POT-Creation-Date: 2010-11-02 22:51+0000\n"
+"PO-Revision-Date: 2010-11-02 22:53:43+0000\n"
 "Language-Team: Swedish <http://translatewiki.net/wiki/Portal:sv>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r75708); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r75875); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: sv\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2010-10-30 09:48:40+0000\n"
+"X-POT-Import-Date: 2010-10-30 23:42:01+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -79,15 +79,20 @@ msgstr "Spara inställningar för åtkomst"
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
+#. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
+#. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #: actions/accessadminpanel.php:193 actions/emailsettings.php:228
-#: actions/imsettings.php:187 actions/pathsadminpanel.php:512
-#: actions/profilesettings.php:201 actions/smssettings.php:209
-#: actions/subscriptions.php:246 lib/applicationeditform.php:355
+#: actions/imsettings.php:187 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: lib/applicationeditform.php:355 lib/groupeditform.php:207
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Spara"
@@ -138,7 +143,7 @@ msgstr "Ingen sådan sida"
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:495 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Ingen sådan användare."
@@ -209,7 +214,9 @@ msgstr ""
 
 #. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:208
+#. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -564,8 +571,11 @@ msgstr "Fullständigt namn är för långt (max 255 tecken)."
 #. TRANS: Group edit form validation error.
 #. TRANS: Form validation error in New application form.
 #. TRANS: %d is the maximum number of characters for the description.
+#. TRANS: Group create form validation error.
+#. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:220 actions/editapplication.php:201
 #: actions/editgroup.php:216 actions/newapplication.php:178
+#: actions/newgroup.php:152
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -725,14 +735,14 @@ msgstr "Du har inte tillstånd."
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:172 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:74
 #: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
 #: actions/groupunblock.php:65 actions/imsettings.php:230
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
-#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/othersettings.php:153 actions/passwordsettings.php:138
 #: actions/profilesettings.php:221 actions/recoverpassword.php:350
 #: actions/register.php:172 actions/remotesubscribe.php:77
 #: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
@@ -912,20 +922,21 @@ msgstr "Du kan inte ta bort en annan användares status."
 
 #. TRANS: Client error displayed trying to repeat a non-existing notice through the API.
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
+#. TRANS: Error message displayed trying to delete a non-existing notice.
 #: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/deletenotice.php:58 actions/shownotice.php:92
+#: actions/deletenotice.php:61 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "Ingen sådan notis."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:535
+#: actions/apistatusesretweet.php:83 lib/command.php:537
 msgid "Cannot repeat your own notice."
 msgstr "Kan inte upprepa din egen notis."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:541
+#: actions/apistatusesretweet.php:92 lib/command.php:543
 msgid "Already repeated that notice."
 msgstr "Redan upprepat denna notis."
 
@@ -946,7 +957,8 @@ msgstr "Klient måste tillhandahålla en 'status'-parameter med ett värde."
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#: actions/apistatusesupdate.php:244
+#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
+#: lib/mailhandler.php:60
 #, fuzzy, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
@@ -961,7 +973,7 @@ msgstr "API-metod hittades inte."
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
-#: actions/apistatusesupdate.php:308
+#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
 #, fuzzy, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
@@ -1172,17 +1184,18 @@ msgstr "Välj ett kvadratiskt område i bilden som din avatar"
 msgid "Lost our file data."
 msgstr "Förlorade vår fildata."
 
-#: actions/avatarsettings.php:384
+#. TRANS: Success message for having updated a user avatar.
+#: actions/avatarsettings.php:385
 msgid "Avatar updated."
 msgstr "Avatar uppdaterad."
 
 #. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
-#: actions/avatarsettings.php:388
+#: actions/avatarsettings.php:389
 msgid "Failed updating avatar."
 msgstr "Misslyckades uppdatera avatar."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:412
+#: actions/avatarsettings.php:413
 msgid "Avatar deleted."
 msgstr "Avatar borttagen."
 
@@ -1214,8 +1227,8 @@ msgstr ""
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:154 actions/deleteapplication.php:154
-#: actions/deletegroup.php:220 actions/deletenotice.php:150
+#: actions/block.php:154 actions/deleteapplication.php:157
+#: actions/deletegroup.php:220 actions/deletenotice.php:155
 #: actions/deleteuser.php:152 actions/groupblock.php:178
 msgctxt "BUTTON"
 msgid "No"
@@ -1233,8 +1246,8 @@ msgstr "Blockera inte denna användare"
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:161 actions/deleteapplication.php:161
-#: actions/deletegroup.php:227 actions/deletenotice.php:157
+#: actions/block.php:161 actions/deleteapplication.php:164
+#: actions/deletegroup.php:227 actions/deletenotice.php:162
 #: actions/deleteuser.php:159 actions/groupblock.php:185
 msgctxt "BUTTON"
 msgid "Yes"
@@ -1352,12 +1365,13 @@ msgstr "Denna adress har redan blivit bekräftad."
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
 #. TRANS: Server error thrown on database error updating IM preferences.
 #. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
 #. TRANS: Server error thrown when user profile settings could not be updated.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #: actions/confirmaddress.php:118 actions/emailsettings.php:331
 #: actions/emailsettings.php:477 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:174
+#: actions/imsettings.php:442 actions/othersettings.php:184
 #: actions/profilesettings.php:326 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
@@ -1393,16 +1407,19 @@ msgstr "Konversationer"
 msgid "Notices"
 msgstr "Notiser"
 
-#: actions/deleteapplication.php:63
+#. TRANS: Client error displayed trying to delete an application while not logged in.
+#: actions/deleteapplication.php:62
 msgid "You must be logged in to delete an application."
 msgstr "Du måste vara inloggad för att ta bort en applikation."
 
+#. TRANS: Client error displayed trying to delete an application that does not exist.
 #: actions/deleteapplication.php:71
 msgid "Application not found."
 msgstr "Applikation hittades inte."
 
+#. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
-#: actions/deleteapplication.php:78 actions/editapplication.php:78
+#: actions/deleteapplication.php:79 actions/editapplication.php:78
 #: actions/showapplication.php:94
 msgid "You are not the owner of this application."
 msgstr "Du är inte ägaren av denna applikation."
@@ -1410,15 +1427,18 @@ msgstr "Du är inte ägaren av denna applikation."
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
 #: actions/newapplication.php:114 actions/showapplication.php:118
-#: lib/action.php:1354
+#: lib/action.php:1404
 msgid "There was a problem with your session token."
 msgstr "Det var ett problem med din sessions-token."
 
-#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+#. TRANS: Title for delete application page.
+#. TRANS: Fieldset legend on delete application page.
+#: actions/deleteapplication.php:124 actions/deleteapplication.php:149
 msgid "Delete application"
 msgstr "Ta bort applikation"
 
-#: actions/deleteapplication.php:149
+#. TRANS: Confirmation text on delete application page.
+#: actions/deleteapplication.php:152
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
 "about the application from the database, including all existing user "
@@ -1429,12 +1449,12 @@ msgstr ""
 "användaranslutningar."
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:158
+#: actions/deleteapplication.php:161
 msgid "Do not delete this application"
 msgstr "Ta inte bort denna applikation"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:164
+#: actions/deleteapplication.php:167
 msgid "Delete this application"
 msgstr "Ta bort denna applikation"
 
@@ -1470,13 +1490,14 @@ msgstr "Kunde inte uppdatera grupp."
 msgid "Deleted group %s"
 msgstr "%1$s lämnade grupp %2$s"
 
-#. TRANS: Title.
+#. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
 #: actions/deletegroup.php:176 actions/deletegroup.php:202
 #, fuzzy
 msgid "Delete group"
 msgstr "Ta bort användare"
 
+#. TRANS: Warning in form for deleleting a group.
 #: actions/deletegroup.php:206
 #, fuzzy
 msgid ""
@@ -1499,10 +1520,11 @@ msgstr "Ta inte bort denna notis"
 msgid "Delete this group"
 msgstr "Ta bort denna användare"
 
+#. TRANS: Error message displayed trying to delete a notice while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1512,11 +1534,13 @@ msgstr "Ta bort denna användare"
 msgid "Not logged in."
 msgstr "Inte inloggad."
 
-#: actions/deletenotice.php:74
+#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
+#: actions/deletenotice.php:78
 msgid "Can't delete this notice."
 msgstr "Kan inte ta bort denna notis."
 
-#: actions/deletenotice.php:106
+#. TRANS: Instructions for deleting a notice.
+#: actions/deletenotice.php:110
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
@@ -1524,21 +1548,24 @@ msgstr ""
 "Du håller på att ta bort en notis permanent. När det väl är gjort kan du "
 "inte ångra dig."
 
-#: actions/deletenotice.php:112 actions/deletenotice.php:144
+#. TRANS: Page title when deleting a notice.
+#. TRANS: Fieldset legend for the delete notice form.
+#: actions/deletenotice.php:117 actions/deletenotice.php:148
 msgid "Delete notice"
 msgstr "Ta bort notis"
 
-#: actions/deletenotice.php:147
+#. TRANS: Message for the delete notice form.
+#: actions/deletenotice.php:152
 msgid "Are you sure you want to delete this notice?"
 msgstr "Är du säker på att du vill ta bort denna notis?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:154
+#: actions/deletenotice.php:159
 msgid "Do not delete this notice"
 msgstr "Ta inte bort denna notis"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:161 lib/noticelist.php:667
+#: actions/deletenotice.php:166 lib/noticelist.php:667
 msgid "Delete this notice"
 msgstr "Ta bort denna notis"
 
@@ -1702,11 +1729,9 @@ msgstr "Återställ till standardvärde"
 
 #. TRANS: Submit button title.
 #: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
-#: actions/othersettings.php:126 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: actions/useradminpanel.php:295 lib/applicationeditform.php:357
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: lib/applicationeditform.php:357 lib/designsettings.php:256
 msgid "Save"
 msgstr "Spara"
 
@@ -1754,9 +1779,9 @@ msgid "Name is required."
 msgstr "Namn krävs."
 
 #. TRANS: Validation error shown when providing too long a name in the "Edit application" form.
-#: actions/editapplication.php:188
+#: actions/editapplication.php:188 actions/newapplication.php:169
 #, fuzzy
-msgid "Name is too long (max 255 characters)."
+msgid "Name is too long (maximum 255 characters)."
 msgstr "Namnet är för långt (max 255 tecken)."
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
@@ -1785,7 +1810,7 @@ msgid "Organization is required."
 msgstr "Organisation krävs."
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#: actions/editapplication.php:223
+#: actions/editapplication.php:223 actions/newapplication.php:199
 #, fuzzy
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "Organisation är för lång (max 255 tecken)."
@@ -2583,7 +2608,7 @@ msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Publicera ett MicroID för min Jabber/GTalk-adress."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:180
+#: actions/imsettings.php:290 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "Inställningar sparade."
 
@@ -2707,10 +2732,9 @@ msgstr[1] "Du prenumererar redan på dessa användare:"
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#. TRANS: Whois output.
-#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:145 actions/invite.php:159 lib/command.php:426
-#, php-format
+#: actions/invite.php:145 actions/invite.php:159
+#, fuzzy, php-format
+msgctxt "INVITE"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
@@ -2897,8 +2921,9 @@ msgid ""
 msgstr ""
 
 #: actions/licenseadminpanel.php:156
-msgid "Invalid license title. Max length is 255 characters."
-msgstr ""
+#, fuzzy
+msgid "Invalid license title. Maximum length is 255 characters."
+msgstr "Ogiltig välkomsttext. Maximal längd är 255 tecken."
 
 #: actions/licenseadminpanel.php:168
 msgid "Invalid license URL."
@@ -3069,20 +3094,10 @@ msgstr "Du måste vara inloggad för att registrera en applikation."
 msgid "Use this form to register a new application."
 msgstr "Använd detta formulär för att registrera en ny applikation."
 
-#: actions/newapplication.php:169
-#, fuzzy
-msgid "Name is too long (maximum 255 chars)."
-msgstr "Namnet är för långt (max 255 tecken)."
-
 #: actions/newapplication.php:184
 msgid "Source URL is required."
 msgstr "Webbadress till källa krävs."
 
-#: actions/newapplication.php:199
-#, fuzzy
-msgid "Organization is too long (maximum 255 chars)."
-msgstr "Organisation är för lång (max 255 tecken)."
-
 #: actions/newapplication.php:266 actions/newapplication.php:275
 msgid "Could not create application."
 msgstr "Kunde inte skapa applikation."
@@ -3102,14 +3117,14 @@ msgid "New message"
 msgstr "Nytt meddelande"
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:499
+#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501
 msgid "You can't send a message to this user."
 msgstr "Du kan inte skicka ett meddelande till den användaren."
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
 #: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
-#: lib/command.php:579
+#: lib/command.php:581
 msgid "No content!"
 msgstr "Inget innehåll!"
 
@@ -3118,7 +3133,7 @@ msgid "No recipient specified."
 msgstr "Ingen mottagare angiven."
 
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:503
+#: actions/newmessage.php:167 lib/command.php:505
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -3131,12 +3146,12 @@ msgstr "Meddelande skickat"
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:511
+#: actions/newmessage.php:188 lib/command.php:513
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Direktmeddelande till %s skickat."
 
-#: actions/newmessage.php:213 actions/newnotice.php:263
+#: actions/newmessage.php:213 actions/newnotice.php:264
 msgid "Ajax Error"
 msgstr "AJAX-fel"
 
@@ -3144,17 +3159,7 @@ msgstr "AJAX-fel"
 msgid "New notice"
 msgstr "Ny notis"
 
-#: actions/newnotice.php:159 lib/mailhandler.php:60
-#, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr "Det är för långt. Maximal notisstorlek är %d tecken."
-
-#: actions/newnotice.php:183
-#, php-format
-msgid "Max notice size is %d chars, including attachment URL."
-msgstr "Maximal notisstorlek är %d tecken, inklusive webbadress för bilaga."
-
-#: actions/newnotice.php:229
+#: actions/newnotice.php:230
 msgid "Notice posted"
 msgstr "Notis postad"
 
@@ -3323,36 +3328,46 @@ msgstr "Personsökning"
 msgid "Notice Search"
 msgstr "Notissökning"
 
-#: actions/othersettings.php:60
+#: actions/othersettings.php:59
 msgid "Other settings"
 msgstr "Övriga inställningar"
 
+#. TRANS: Instructions for tab "Other" in user profile settings.
 #: actions/othersettings.php:71
 msgid "Manage various other options."
 msgstr "Hantera diverse andra alternativ."
 
-#: actions/othersettings.php:108
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/othersettings.php:111
 msgid " (free service)"
-msgstr "(fri tjänst)"
+msgstr " (fri tjänst)"
 
-#: actions/othersettings.php:116
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/othersettings.php:120
 msgid "Shorten URLs with"
 msgstr "Förkorta URL:er med"
 
-#: actions/othersettings.php:117
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/othersettings.php:122
 msgid "Automatic shortening service to use."
 msgstr "Automatiska förkortningstjänster att använda."
 
-#: actions/othersettings.php:122
+#. TRANS: Label for checkbox.
+#: actions/othersettings.php:128
 msgid "View profile designs"
 msgstr "Visa profilutseenden"
 
-#: actions/othersettings.php:123
+#. TRANS: Tooltip for checkbox.
+#: actions/othersettings.php:130
 msgid "Show or hide profile designs."
 msgstr "Visa eller göm profilutseenden."
 
-#: actions/othersettings.php:153
-msgid "URL shortening service is too long (max 50 chars)."
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/othersettings.php:162
+#, fuzzy
+msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "Namnet på URL-förkortningstjänsen är för långt (max 50 tecken)."
 
 #: actions/otp.php:69
@@ -3841,7 +3856,7 @@ msgstr "Biografi"
 #. TRANS: Label for group location (dt). Text hidden by default.
 #: actions/profilesettings.php:149 actions/register.php:485
 #: actions/showgroup.php:267 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:177
+#: actions/userauthorization.php:166 lib/groupeditform.php:180
 #: lib/userprofile.php:165
 msgid "Location"
 msgstr "Plats"
@@ -4183,7 +4198,8 @@ msgid "Unexpected password reset."
 msgstr "Oväntad återställning av lösenord."
 
 #: actions/recoverpassword.php:365
-msgid "Password must be 6 chars or more."
+#, fuzzy
+msgid "Password must be 6 characters or more."
 msgstr "Lösenordet måste vara minst 6 tecken."
 
 #: actions/recoverpassword.php:369
@@ -4560,7 +4576,7 @@ msgstr "Organisation"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:172
+#: lib/applicationeditform.php:208 lib/groupeditform.php:175
 msgid "Description"
 msgstr "Beskrivning"
 
@@ -4712,7 +4728,7 @@ msgid "Note"
 msgstr "Notis"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:298 lib/groupeditform.php:184
+#: actions/showgroup.php:298 lib/groupeditform.php:187
 msgid "Aliases"
 msgstr "Alias"
 
@@ -4844,47 +4860,67 @@ msgstr "Meddelande från %1$s på %2$s"
 msgid "Notice deleted."
 msgstr "Notis borttagen."
 
-#: actions/showstream.php:72
-#, php-format
-msgid " tagged %s"
-msgstr "taggade %s"
+#. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
+#: actions/showstream.php:70
+#, fuzzy, php-format
+msgid "%1$s tagged %2$s"
+msgstr "%1$s, sida %2$d"
+
+#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#: actions/showstream.php:74
+#, fuzzy, php-format
+msgid "%1$s tagged %2$s, page %3$d"
+msgstr "Notiser taggade med %1$s, sida %2$d"
 
-#: actions/showstream.php:78
+#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$d is the page number.
+#: actions/showstream.php:82
 #, php-format
 msgid "%1$s, page %2$d"
 msgstr "%1$s, sida %2$d"
 
-#: actions/showstream.php:120
+#. TRANS: Title for link to notice feed.
+#. TRANS: %1$s is a user nickname, %2$s is a hashtag.
+#: actions/showstream.php:127
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Flöde av notiser för %1$s taggade %2$s (RSS 1.0)"
 
-#: actions/showstream.php:127
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:136
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "Flöde av notiser för %s (RSS 1.0)"
 
-#: actions/showstream.php:134
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:145
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "Flöde av notiser för %s (RSS 2.0)"
 
-#: actions/showstream.php:141
+#: actions/showstream.php:152
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "Flöde av notiser för %s (Atom)"
 
-#: actions/showstream.php:146
+#. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
+#. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
+#: actions/showstream.php:159
 #, php-format
 msgid "FOAF for %s"
 msgstr "FOAF för %s"
 
-#: actions/showstream.php:197
-#, php-format
-msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
+#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
+#: actions/showstream.php:211
+#, fuzzy, php-format
+msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr "Detta är tidslinjen för %1$s men %2$s har inte postat något än."
 
-#: actions/showstream.php:202
+#. TRANS: Second sentence of empty list message for a stream for the user themselves.
+#: actions/showstream.php:217
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -4892,7 +4928,9 @@ msgstr ""
 "Sett något intressant nyligen? Du har inte postat några notiser än. Varför "
 "inte börja nu?"
 
-#: actions/showstream.php:204
+#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:221
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -4901,7 +4939,9 @@ msgstr ""
 "Var den första att [skriva i detta ämne](%%%%action.newnotice%%%%?"
 "status_textarea=%s)!"
 
-#: actions/showstream.php:243
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:264
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4914,7 +4954,9 @@ msgstr ""
 "[StatusNet](http://status.net/). [Gå med nu](%%%%action.register%%%%) för "
 "att följa **%s**s notiser och många fler! ([Läs mer](%%%%doc.help%%%%))"
 
-#: actions/showstream.php:248
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:271
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4925,7 +4967,8 @@ msgstr ""
 "wikipedia.org/wiki/Mikroblogg)tjänst baserad på den fria programvaran "
 "[StatusNet](http://status.net/). "
 
-#: actions/showstream.php:305
+#. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
+#: actions/showstream.php:328
 #, php-format
 msgid "Repeat of %s"
 msgstr "Upprepning av %s"
@@ -5038,31 +5081,40 @@ msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 "Hur länge användare måste vänta (i sekunder) för att posta samma sak igen."
 
-#: actions/sitenoticeadminpanel.php:56
+#. TRANS: Page title for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:55
 msgid "Site Notice"
 msgstr "Webbplatsnotis"
 
-#: actions/sitenoticeadminpanel.php:67
+#. TRANS: Instructions for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:66
 msgid "Edit site-wide message"
 msgstr "Redigera webbplastsnotis"
 
-#: actions/sitenoticeadminpanel.php:103
+#. TRANS: Server error displayed when saving a site-wide notice was impossible.
+#: actions/sitenoticeadminpanel.php:101
 msgid "Unable to save site notice."
 msgstr "Kunde inte spara webbplatsnotis."
 
-#: actions/sitenoticeadminpanel.php:113
-msgid "Max length for the site-wide notice is 255 chars."
+#. TRANS: Client error displayed when a site-wide notice was longer than allowed.
+#: actions/sitenoticeadminpanel.php:112
+#, fuzzy
+msgid "Maximum length for the site-wide notice is 255 characters."
 msgstr "Maximal längd för webbplatsnotisen är 255 tecken."
 
+#. TRANS: Label for site-wide notice text field in admin panel.
 #: actions/sitenoticeadminpanel.php:176
 msgid "Site notice text"
 msgstr "Text för webbplatsnotis"
 
-#: actions/sitenoticeadminpanel.php:178
-msgid "Site-wide notice text (255 chars max; HTML okay)"
+#. TRANS: Tooltip for site-wide notice text field in admin panel.
+#: actions/sitenoticeadminpanel.php:179
+#, fuzzy
+msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr "Text för webbplatsnotis (max 255 tecken; HTML ok)"
 
-#: actions/sitenoticeadminpanel.php:198
+#. TRANS: Title for button to save site notice in admin panel.
+#: actions/sitenoticeadminpanel.php:201
 msgid "Save site notice"
 msgstr "Spara webbplatsnotis"
 
@@ -5528,77 +5580,95 @@ msgstr ""
 "2$s'."
 
 #. TRANS: User admin panel title
-#: actions/useradminpanel.php:60
+#: actions/useradminpanel.php:58
 msgctxt "TITLE"
 msgid "User"
 msgstr "Användare"
 
-#: actions/useradminpanel.php:71
+#. TRANS: Instruction for user admin panel.
+#: actions/useradminpanel.php:69
 msgid "User settings for this StatusNet site"
 msgstr ""
 
-#: actions/useradminpanel.php:150
+#. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
+#: actions/useradminpanel.php:147
 msgid "Invalid bio limit. Must be numeric."
 msgstr "Ogiltig begränsning av biografi. Måste vara numerisk."
 
-#: actions/useradminpanel.php:156
-msgid "Invalid welcome text. Max length is 255 characters."
+#. TRANS: Form validation error in user admin panel when welcome text is too long.
+#: actions/useradminpanel.php:154
+#, fuzzy
+msgid "Invalid welcome text. Maximum length is 255 characters."
 msgstr "Ogiltig välkomsttext. Maximal längd är 255 tecken."
 
+#. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
+#. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
-#, php-format
-msgid "Invalid default subscripton: '%1$s' is not user."
+#, fuzzy, php-format
+msgid "Invalid default subscripton: '%1$s' is not a user."
 msgstr "Ogiltig standardprenumeration: '%1$s' är inte användare."
 
 #. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:106
+#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
 #: lib/personalgroupnav.php:109
 msgid "Profile"
 msgstr "Profil"
 
-#: actions/useradminpanel.php:223
+#. TRANS: Field label in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:220
 msgid "Bio Limit"
 msgstr "Begränsning av biografi"
 
-#: actions/useradminpanel.php:224
+#. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:222
 msgid "Maximum length of a profile bio in characters."
 msgstr "Maximal teckenlängd av profilbiografi."
 
-#: actions/useradminpanel.php:232
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:231
 msgid "New users"
 msgstr "Nya användare"
 
+#. TRANS: Field label in user admin panel for setting new user welcome text.
 #: actions/useradminpanel.php:236
 msgid "New user welcome"
 msgstr "Välkomnande av ny användare"
 
-#: actions/useradminpanel.php:237
-msgid "Welcome text for new users (Max 255 chars)."
+#. TRANS: Tooltip in user admin panel for setting new user welcome text.
+#: actions/useradminpanel.php:238
+#, fuzzy
+msgid "Welcome text for new users (maximum 255 characters)."
 msgstr "Välkomsttext för nya användare (max 255 tecken)."
 
-#: actions/useradminpanel.php:242
+#. TRANS: Field label in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:244
 msgid "Default subscription"
 msgstr "Standardprenumerationer"
 
-#: actions/useradminpanel.php:243
+#. TRANS: Tooltip in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:246
 msgid "Automatically subscribe new users to this user."
 msgstr ""
 "Lägg automatiskt till en prenumeration på denna användare för alla nya "
 "användare."
 
-#: actions/useradminpanel.php:252
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:256
 msgid "Invitations"
 msgstr "Inbjudningar"
 
-#: actions/useradminpanel.php:257
+#. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:262
 msgid "Invitations enabled"
 msgstr "Inbjudningar aktiverade"
 
-#: actions/useradminpanel.php:259
+#. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:265
 msgid "Whether to allow users to invite new users."
 msgstr "Hurvida användare skall tillåtas bjuda in nya användare."
 
-#: actions/useradminpanel.php:295
+#. TRANS: Title for button to save user settings in user admin panel.
+#: actions/useradminpanel.php:302
 msgid "Save user settings"
 msgstr ""
 
@@ -5809,7 +5879,7 @@ msgid "Plugins"
 msgstr "Insticksmoduler"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:831
+#: actions/version.php:198 lib/action.php:880
 msgid "Version"
 msgstr "Version"
 
@@ -6018,16 +6088,23 @@ msgstr "Kunde inte spara lokal gruppinformation."
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
+#. TRANS: Full name of a profile or group followed by nickname in parens
+#: classes/Profile.php:164
+#, fuzzy, php-format
+msgctxt "FANCYNAME"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:791
+#: classes/Profile.php:812
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr "Kan inte återkalla roll \"%1$s\" för användare #%2$d; finns inte."
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:800
+#: classes/Profile.php:821
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr "Kan inte återkalla roll \"%1$s\" för användare #%2$d; databasfel."
@@ -6172,194 +6249,201 @@ msgstr "%1$s - %2$s"
 msgid "Untitled page"
 msgstr "Namnlös sida"
 
+#. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
+#: lib/action.php:310
+msgctxt "TOOLTIP"
+msgid "Show more"
+msgstr ""
+
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:477
+#: lib/action.php:526
 msgid "Primary site navigation"
 msgstr "Primär webbplatsnavigation"
 
 #. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:483
+#: lib/action.php:532
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "Personlig profil och vänners tidslinje"
 
 #. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:486
+#: lib/action.php:535
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Personligt"
 
 #. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:488
+#: lib/action.php:537
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
 msgstr "Ändra din e-post, avatar, lösenord, profil"
 
 #. TRANS: Main menu option when logged in for access to user settings
-#: lib/action.php:491
+#: lib/action.php:540
 msgid "Account"
 msgstr "Konto"
 
 #. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:493
+#: lib/action.php:542
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "Anslut till tjänster"
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:496
+#: lib/action.php:545
 msgid "Connect"
 msgstr "Anslut"
 
 #. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:499
+#: lib/action.php:548
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "Ändra webbplatskonfiguration"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:502 lib/groupnav.php:117
+#: lib/action.php:551 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Administratör"
 
 #. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:506
+#: lib/action.php:555
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Bjud in vänner och kollegor att gå med dig på %s"
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:509
+#: lib/action.php:558
 msgctxt "MENU"
 msgid "Invite"
 msgstr "Bjud in"
 
 #. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:515
+#: lib/action.php:564
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "Logga ut från webbplatsen"
 
 #. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:518
+#: lib/action.php:567
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Logga ut"
 
 #. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:523
+#: lib/action.php:572
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "Skapa ett konto"
 
 #. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:526
+#: lib/action.php:575
 msgctxt "MENU"
 msgid "Register"
 msgstr "Registrera"
 
 #. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:529
+#: lib/action.php:578
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "Logga in på webbplatsen"
 
 #. TRANS: Main menu option when not logged in to log in
-#: lib/action.php:532
+#: lib/action.php:581
 msgctxt "MENU"
 msgid "Login"
 msgstr "Logga in"
 
 #. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:535
+#: lib/action.php:584
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Hjälp mig!"
 
 #. TRANS: Main menu option for help on the StatusNet site
-#: lib/action.php:538
+#: lib/action.php:587
 msgctxt "MENU"
 msgid "Help"
 msgstr "Hjälp"
 
 #. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:541
+#: lib/action.php:590
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr "Sök efter personer eller text"
 
 #. TRANS: Main menu option when logged in or when the StatusNet instance is not private
-#: lib/action.php:544
+#: lib/action.php:593
 msgctxt "MENU"
 msgid "Search"
 msgstr "Sök"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:566 lib/adminpanelaction.php:387
+#: lib/action.php:615 lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "Webbplatsnotis"
 
 #. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:633
+#: lib/action.php:682
 msgid "Local views"
 msgstr "Lokala vyer"
 
 #. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:703
+#: lib/action.php:752
 msgid "Page notice"
 msgstr "Sidnotis"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:804
+#: lib/action.php:853
 msgid "Secondary site navigation"
 msgstr "Sekundär webbplatsnavigation"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:810
+#: lib/action.php:859
 msgid "Help"
 msgstr "Hjälp"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:813
+#: lib/action.php:862
 msgid "About"
 msgstr "Om"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:816
+#: lib/action.php:865
 msgid "FAQ"
 msgstr "Frågor & svar"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:821
+#: lib/action.php:870
 msgid "TOS"
 msgstr "Användarvillkor"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:825
+#: lib/action.php:874
 msgid "Privacy"
 msgstr "Sekretess"
 
-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:828
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+#: lib/action.php:877
 msgid "Source"
 msgstr "Källa"
 
-#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:834
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+#: lib/action.php:884
 msgid "Contact"
 msgstr "Kontakt"
 
-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:837
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+#: lib/action.php:887
 msgid "Badge"
 msgstr "Emblem"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:866
+#: lib/action.php:916
 msgid "StatusNet software license"
 msgstr "Programvarulicens för StatusNet"
 
@@ -6367,7 +6451,7 @@ msgstr "Programvarulicens för StatusNet"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:873
+#: lib/action.php:923
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -6377,7 +6461,7 @@ msgstr ""
 "%%](%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:876
+#: lib/action.php:926
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** är en mikrobloggtjänst."
@@ -6386,7 +6470,7 @@ msgstr "**%%site.name%%** är en mikrobloggtjänst."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:883
+#: lib/action.php:933
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -6398,51 +6482,51 @@ msgstr ""
 "fsf.org/licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:899
+#: lib/action.php:949
 msgid "Site content license"
 msgstr "Licens för webbplatsinnehåll"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:906
+#: lib/action.php:956
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "Innehåll och data av %1$s är privat och konfidensiell."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:913
+#: lib/action.php:963
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr "Innehåll och data copyright av %1$s. Alla rättigheter reserverade."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:917
+#: lib/action.php:967
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "Innehåll och data copyright av medarbetare. Alla rättigheter reserverade."
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:949
+#: lib/action.php:999
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr "Innehåll och data på %1$s är tillgänglig under licensen %2$s."
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1285
+#: lib/action.php:1335
 msgid "Pagination"
 msgstr "Numrering av sidor"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1296
+#: lib/action.php:1346
 msgid "After"
 msgstr "Senare"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1306
+#: lib/action.php:1356
 msgid "Before"
 msgstr "Tidigare"
 
@@ -6787,7 +6871,7 @@ msgid "AJAX error"
 msgstr "AJAX-fel"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:233 lib/mailhandler.php:142
+#: lib/channel.php:233 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "Kommando komplett"
 
@@ -6803,7 +6887,7 @@ msgstr "Notis med den ID:n finns inte."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:626
+#: lib/command.php:99 lib/command.php:630
 msgid "User has no last notice."
 msgstr "Användare har ingen sista notis."
 
@@ -6872,6 +6956,14 @@ msgstr "%1$s gick med i grupp %2$s."
 msgid "%1$s left group %2$s."
 msgstr "%1$s lämnade grupp %2$s."
 
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: lib/command.php:426
+#, fuzzy, php-format
+msgctxt "WHOIS"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
 #. TRANS: Whois output. %s is the full name of the queried user.
 #: lib/command.php:430
 #, php-format
@@ -6911,113 +7003,117 @@ msgstr ""
 "%s är en fjärrprofil; du kan bara skicka direktmeddelanden till användare på "
 "samma server."
 
-#. TRANS: Message given if content is too long.
+#. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
 #: lib/command.php:488
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr "Meddelande för långt - maximum är %1$d tecken, du skickade %2$d."
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] "Meddelande för långt - maximum är %1$d tecken, du skickade %2$d."
+msgstr[1] "Meddelande för långt - maximum är %1$d tecken, du skickade %2$d."
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:514
+#: lib/command.php:516
 msgid "Error sending direct message."
 msgstr "Fel vid sändning av direktmeddelande."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:551
+#: lib/command.php:553
 #, php-format
 msgid "Notice from %s repeated."
 msgstr "Notis från %s upprepad."
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:554
+#: lib/command.php:556
 msgid "Error repeating notice."
 msgstr "Fel vid upprepning av notis."
 
-#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:589
-#, php-format
-msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
-msgstr "Notis för långt - maximum är %1$d tecken, du skickade %2$d."
+#: lib/command.php:591
+#, fuzzy, php-format
+msgid "Notice too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] "Notis för långt - maximum är %1$d tecken, du skickade %2$d."
+msgstr[1] "Notis för långt - maximum är %1$d tecken, du skickade %2$d."
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:600
+#: lib/command.php:604
 #, php-format
 msgid "Reply to %s sent."
 msgstr "Svar på %s skickat."
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:603
+#: lib/command.php:607
 msgid "Error saving notice."
 msgstr "Fel vid sparande av notis."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:650
+#: lib/command.php:654
 msgid "Specify the name of the user to subscribe to."
 msgstr "Ange namnet på användaren att prenumerara på."
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:659
+#: lib/command.php:663
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Kan inte prenumera på OMB-profiler via kommando."
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:667
+#: lib/command.php:671
 #, php-format
 msgid "Subscribed to %s."
 msgstr "Prenumererar på %s."
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:688 lib/command.php:799
+#: lib/command.php:692 lib/command.php:803
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "Ange namnet på användaren att avsluta prenumeration på."
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:699
+#: lib/command.php:703
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr "Prenumeration på %s avslutad."
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:719 lib/command.php:745
+#: lib/command.php:723 lib/command.php:749
 msgid "Command not yet implemented."
 msgstr "Kommando inte implementerat än."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:723
+#: lib/command.php:727
 msgid "Notification off."
 msgstr "Notifikation av."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:726
+#: lib/command.php:730
 msgid "Can't turn off notification."
 msgstr "Kan inte sätta på notifikation."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:749
+#: lib/command.php:753
 msgid "Notification on."
 msgstr "Notifikation på."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:752
+#: lib/command.php:756
 msgid "Can't turn on notification."
 msgstr "Kan inte stänga av notifikation."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:766
+#: lib/command.php:770
 msgid "Login command is disabled."
 msgstr "Inloggningskommando är inaktiverat."
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:779
+#: lib/command.php:783
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
@@ -7025,20 +7121,20 @@ msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:808
+#: lib/command.php:812
 #, php-format
 msgid "Unsubscribed %s."
 msgstr "%ss prenumeration avslutad."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:826
+#: lib/command.php:830
 msgid "You are not subscribed to anyone."
 msgstr "Du prenumererar inte på någon."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:831
+#: lib/command.php:835
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Du prenumererar på denna person:"
@@ -7046,14 +7142,14 @@ msgstr[1] "Du prenumererar på dessa personer:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:853
+#: lib/command.php:857
 msgid "No one is subscribed to you."
 msgstr "Ingen prenumerar på dig."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:858
+#: lib/command.php:862
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Denna person prenumererar på dig:"
@@ -7061,21 +7157,21 @@ msgstr[1] "Dessa personer prenumererar på dig:"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:880
+#: lib/command.php:884
 msgid "You are not a member of any groups."
 msgstr "Du är inte medlem i några grupper."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:885
+#: lib/command.php:889
 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:"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:900
+#: lib/command.php:904
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -7306,7 +7402,8 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 små bokstäver eller nummer, inga punkter eller mellanslag"
 
 #: lib/groupeditform.php:163
-msgid "URL of the homepage or blog of the group or topic"
+#, fuzzy
+msgid "URL of the homepage or blog of the group or topic."
 msgstr "URL till gruppen eller ämnets hemsida eller blogg"
 
 #: lib/groupeditform.php:168
@@ -7314,19 +7411,30 @@ msgid "Describe the group or topic"
 msgstr "Beskriv gruppen eller ämnet"
 
 #: lib/groupeditform.php:170
-#, php-format
-msgid "Describe the group or topic in %d characters"
-msgstr "Beskriv gruppen eller ämnet med högst %d tecken"
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d character or less"
+msgid_plural "Describe the group or topic in %d characters or less"
+msgstr[0] "Beskriv gruppen eller ämnet med högst %d tecken"
+msgstr[1] "Beskriv gruppen eller ämnet med högst %d tecken"
 
-#: lib/groupeditform.php:179
+#: lib/groupeditform.php:182
+#, fuzzy
 msgid ""
-"Location for the group, if any, like \"City, State (or Region), Country\""
+"Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr "Plats för gruppen, om den finns, såsom \"Stad, Län, Land\""
 
-#: lib/groupeditform.php:187
-#, php-format
-msgid "Extra nicknames for the group, comma- or space- separated, max %d"
-msgstr "Extra smeknamn för gruppen, komma- eller mellanslagsseparerade, max &d"
+#: lib/groupeditform.php:190
+#, fuzzy, php-format
+msgid ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"alias allowed."
+msgid_plural ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"aliases allowed."
+msgstr[0] ""
+"Extra smeknamn för gruppen, komma- eller mellanslagsseparerade, max &d"
+msgstr[1] ""
+"Extra smeknamn för gruppen, komma- eller mellanslagsseparerade, max &d"
 
 #. TRANS: Menu item in the group navigation page.
 #: lib/groupnav.php:86
@@ -7880,7 +7988,7 @@ msgstr "Tyvärr, det är inte din inkommande e-postadress."
 msgid "Sorry, no incoming email allowed."
 msgstr "Tyvärr, ingen inkommande e-post tillåts."
 
-#: lib/mailhandler.php:228
+#: lib/mailhandler.php:229
 #, php-format
 msgid "Unsupported message type: %s"
 msgstr "Formatet %s för meddelande stödjs inte."
@@ -8229,16 +8337,17 @@ msgid "Sandbox this user"
 msgstr "Flytta denna användare till sandlådan"
 
 #. TRANS: Fieldset legend for the search form.
-#: lib/searchaction.php:121
+#: lib/searchaction.php:120
 msgid "Search site"
 msgstr "Sök webbplats"
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
-#: lib/searchaction.php:129
+#: lib/searchaction.php:128
 msgid "Keyword(s)"
 msgstr "Nyckelord"
 
+#. TRANS: Button text for searching site.
 #: lib/searchaction.php:130
 msgctxt "BUTTON"
 msgid "Search"
@@ -8328,8 +8437,8 @@ msgid "The theme file is missing or the upload failed."
 msgstr "Temafilen saknas eller uppladdningen misslyckades."
 
 #: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:278 lib/themeuploader.php:282
-#: lib/themeuploader.php:290 lib/themeuploader.php:297
+#: lib/themeuploader.php:279 lib/themeuploader.php:283
+#: lib/themeuploader.php:291 lib/themeuploader.php:298
 msgid "Failed saving theme."
 msgstr "Kunde inte spara tema."
 
@@ -8338,16 +8447,20 @@ msgid "Invalid theme: bad directory structure."
 msgstr "Ogiltigt tema: dålig katalogstruktur."
 
 #: lib/themeuploader.php:166
-#, php-format
-msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
-msgstr ""
+#, fuzzy, php-format
+msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
+msgid_plural ""
+"Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr[0] ""
+"Uppladdat tema är för stort, måste vara mindre än %d byte okomprimerat."
+msgstr[1] ""
 "Uppladdat tema är för stort, måste vara mindre än %d byte okomprimerat."
 
-#: lib/themeuploader.php:178
+#: lib/themeuploader.php:179
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr "Ogiltigt temaarkiv: filen css/display.css saknas"
 
-#: lib/themeuploader.php:218
+#: lib/themeuploader.php:219
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
@@ -8355,16 +8468,16 @@ msgstr ""
 "Tema innehåller ogiltigt fil- eller mappnamn. Använd bara ASCII-bokstäver, "
 "siffror, understreck och minustecken."
 
-#: lib/themeuploader.php:224
+#: lib/themeuploader.php:225
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr "Tema innehåller osäkra filtilläggsnamn; kan vara osäkert."
 
-#: lib/themeuploader.php:241
+#: lib/themeuploader.php:242
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr "Tema innehåller fil av typen '.%s', vilket inte är tillåtet."
 
-#: lib/themeuploader.php:259
+#: lib/themeuploader.php:260
 msgid "Error opening theme archive."
 msgstr "Fel vid öppning temaarkiv."
 
@@ -8545,23 +8658,39 @@ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
 msgstr[0] "Meddelande för långt - maximum är %1$d tecken, du skickade %2$d."
 msgstr[1] "Meddelande för långt - maximum är %1$d tecken, du skickade %2$d."
 
-#: scripts/restoreuser.php:82
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: scripts/restoreuser.php:61
 #, php-format
-msgid "Backup file for user %s (%s)"
+msgid "Getting backup from file '%s'."
 msgstr ""
 
-#: scripts/restoreuser.php:88
+#. TRANS: Commandline script output.
+#: scripts/restoreuser.php:91
 #, fuzzy
 msgid "No user specified; using backup user."
 msgstr "Ingen användar-ID angiven."
 
-#: scripts/restoreuser.php:94
+#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
+#: scripts/restoreuser.php:98
 #, php-format
-msgid "%d entries in backup."
-msgstr ""
+msgid "%d entry in backup."
+msgid_plural "%d entries in backup."
+msgstr[0] ""
+msgstr[1] ""
+
+#, fuzzy
+#~ msgid "Name is too long (maximum 255 chars)."
+#~ msgstr "Namnet är för långt (max 255 tecken)."
+
+#, fuzzy
+#~ msgid "Organization is too long (maximum 255 chars)."
+#~ msgstr "Organisation är för lång (max 255 tecken)."
+
+#~ msgid "That's too long. Max notice size is %d chars."
+#~ msgstr "Det är för långt. Maximal notisstorlek är %d tecken."
 
-#~ msgid "Description is too long (max %d chars)."
-#~ msgstr "Beskrivning är för lång (max %d tecken)."
+#~ msgid "Max notice size is %d chars, including attachment URL."
+#~ msgstr "Maximal notisstorlek är %d tecken, inklusive webbadress för bilaga."
 
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "För många alias! Maximum %d."
+#~ msgid " tagged %s"
+#~ msgstr "taggade %s"
diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po
index ac8fe24a2..5057577d1 100644
--- a/locale/te/LC_MESSAGES/statusnet.po
+++ b/locale/te/LC_MESSAGES/statusnet.po
@@ -10,17 +10,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-30 23:18+0000\n"
-"PO-Revision-Date: 2010-10-30 23:20:47+0000\n"
+"POT-Creation-Date: 2010-11-02 22:51+0000\n"
+"PO-Revision-Date: 2010-11-02 22:53:45+0000\n"
 "Language-Team: Telugu <http://translatewiki.net/wiki/Portal:te>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r75708); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r75875); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: te\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2010-10-30 09:48:40+0000\n"
+"X-POT-Import-Date: 2010-10-30 23:42:01+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -77,15 +77,20 @@ msgstr "అందుబాటు అమరికలను భద్రపరచ�
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
+#. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
+#. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #: actions/accessadminpanel.php:193 actions/emailsettings.php:228
-#: actions/imsettings.php:187 actions/pathsadminpanel.php:512
-#: actions/profilesettings.php:201 actions/smssettings.php:209
-#: actions/subscriptions.php:246 lib/applicationeditform.php:355
+#: actions/imsettings.php:187 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: lib/applicationeditform.php:355 lib/groupeditform.php:207
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "భద్రపరచు"
@@ -136,7 +141,7 @@ msgstr "అటువంటి పేజీ లేదు."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:495 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "అటువంటి వాడుకరి లేరు."
@@ -204,7 +209,9 @@ msgstr ""
 
 #. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:208
+#. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227
 #, fuzzy, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -555,8 +562,11 @@ msgstr "పూర్తి పేరు చాలా పెద్దగా ఉ�
 #. TRANS: Group edit form validation error.
 #. TRANS: Form validation error in New application form.
 #. TRANS: %d is the maximum number of characters for the description.
+#. TRANS: Group create form validation error.
+#. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:220 actions/editapplication.php:201
 #: actions/editgroup.php:216 actions/newapplication.php:178
+#: actions/newgroup.php:152
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -716,14 +726,14 @@ msgstr "మీకు అధీకరణ లేదు."
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:172 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:74
 #: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
 #: actions/groupunblock.php:65 actions/imsettings.php:230
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
-#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/othersettings.php:153 actions/passwordsettings.php:138
 #: actions/profilesettings.php:221 actions/recoverpassword.php:350
 #: actions/register.php:172 actions/remotesubscribe.php:77
 #: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
@@ -894,20 +904,21 @@ msgstr "ఇతర వాడుకరుల స్థితిని మీరు
 
 #. TRANS: Client error displayed trying to repeat a non-existing notice through the API.
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
+#. TRANS: Error message displayed trying to delete a non-existing notice.
 #: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/deletenotice.php:58 actions/shownotice.php:92
+#: actions/deletenotice.php:61 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "అటువంటి సందేశమేమీ లేదు."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:535
+#: actions/apistatusesretweet.php:83 lib/command.php:537
 msgid "Cannot repeat your own notice."
 msgstr "మీ నోటీసుని మీరే పునరావృతించలేరు."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:541
+#: actions/apistatusesretweet.php:92 lib/command.php:543
 msgid "Already repeated that notice."
 msgstr "ఇప్పటికే ఆ నోటీసుని పునరావృతించారు."
 
@@ -928,7 +939,8 @@ msgstr ""
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#: actions/apistatusesupdate.php:244
+#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
+#: lib/mailhandler.php:60
 #, fuzzy, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
@@ -943,7 +955,7 @@ msgstr "నిర్ధారణ సంకేతం కనబడలేదు."
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
-#: actions/apistatusesupdate.php:308
+#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
 #, fuzzy, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
@@ -1155,17 +1167,18 @@ msgstr "మీ అవతారానికి గానూ ఈ చిత్ర�
 msgid "Lost our file data."
 msgstr ""
 
-#: actions/avatarsettings.php:384
+#. TRANS: Success message for having updated a user avatar.
+#: actions/avatarsettings.php:385
 msgid "Avatar updated."
 msgstr "అవతారాన్ని తాజాకరించాం."
 
 #. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
-#: actions/avatarsettings.php:388
+#: actions/avatarsettings.php:389
 msgid "Failed updating avatar."
 msgstr "అవతారపు తాజాకరణ విఫలమైంది."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:412
+#: actions/avatarsettings.php:413
 msgid "Avatar deleted."
 msgstr "అవతారాన్ని తొలగించాం."
 
@@ -1196,8 +1209,8 @@ msgstr ""
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:154 actions/deleteapplication.php:154
-#: actions/deletegroup.php:220 actions/deletenotice.php:150
+#: actions/block.php:154 actions/deleteapplication.php:157
+#: actions/deletegroup.php:220 actions/deletenotice.php:155
 #: actions/deleteuser.php:152 actions/groupblock.php:178
 msgctxt "BUTTON"
 msgid "No"
@@ -1215,8 +1228,8 @@ msgstr "ఈ వాడుకరిని నిరోధించకు"
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:161 actions/deleteapplication.php:161
-#: actions/deletegroup.php:227 actions/deletenotice.php:157
+#: actions/block.php:161 actions/deleteapplication.php:164
+#: actions/deletegroup.php:227 actions/deletenotice.php:162
 #: actions/deleteuser.php:159 actions/groupblock.php:185
 msgctxt "BUTTON"
 msgid "Yes"
@@ -1333,12 +1346,13 @@ msgstr "ఆ చిరునామా ఇప్పటికే నిర్ధా
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
 #. TRANS: Server error thrown on database error updating IM preferences.
 #. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
 #. TRANS: Server error thrown when user profile settings could not be updated.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #: actions/confirmaddress.php:118 actions/emailsettings.php:331
 #: actions/emailsettings.php:477 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:174
+#: actions/imsettings.php:442 actions/othersettings.php:184
 #: actions/profilesettings.php:326 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
@@ -1374,16 +1388,19 @@ msgstr "సంభాషణ"
 msgid "Notices"
 msgstr "సందేశాలు"
 
-#: actions/deleteapplication.php:63
+#. TRANS: Client error displayed trying to delete an application while not logged in.
+#: actions/deleteapplication.php:62
 msgid "You must be logged in to delete an application."
 msgstr "ఉపకరణాలని తొలగించడానికి మీరు ప్రవేశించి ఉండాలి."
 
+#. TRANS: Client error displayed trying to delete an application that does not exist.
 #: actions/deleteapplication.php:71
 msgid "Application not found."
 msgstr "ఉపకరణం కనబడలేదు."
 
+#. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
-#: actions/deleteapplication.php:78 actions/editapplication.php:78
+#: actions/deleteapplication.php:79 actions/editapplication.php:78
 #: actions/showapplication.php:94
 msgid "You are not the owner of this application."
 msgstr "మీరు ఈ ఉపకరణం యొక్క యజమాని కాదు."
@@ -1391,15 +1408,18 @@ msgstr "మీరు ఈ ఉపకరణం యొక్క యజమాని �
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
 #: actions/newapplication.php:114 actions/showapplication.php:118
-#: lib/action.php:1354
+#: lib/action.php:1404
 msgid "There was a problem with your session token."
 msgstr ""
 
-#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+#. TRANS: Title for delete application page.
+#. TRANS: Fieldset legend on delete application page.
+#: actions/deleteapplication.php:124 actions/deleteapplication.php:149
 msgid "Delete application"
 msgstr "ఉపకరణ తొలగింపు"
 
-#: actions/deleteapplication.php:149
+#. TRANS: Confirmation text on delete application page.
+#: actions/deleteapplication.php:152
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
 "about the application from the database, including all existing user "
@@ -1409,12 +1429,12 @@ msgstr ""
 "వాడుకరుల అనుసంధానాలతో సహా, డాటాబేసు నుండి తొలగిస్తుంది."
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:158
+#: actions/deleteapplication.php:161
 msgid "Do not delete this application"
 msgstr "ఈ ఉపకరణాన్ని తొలగించకు"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:164
+#: actions/deleteapplication.php:167
 msgid "Delete this application"
 msgstr "ఈ ఉపకరణాన్ని తొలగించు"
 
@@ -1450,12 +1470,13 @@ msgstr "గుంపుని తాజాకరించలేకున్న�
 msgid "Deleted group %s"
 msgstr "%2$s గుంపు నుండి %1$s వైదొలిగారు"
 
-#. TRANS: Title.
+#. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
 #: actions/deletegroup.php:176 actions/deletegroup.php:202
 msgid "Delete group"
 msgstr "గుంపు తొలగింపు"
 
+#. TRANS: Warning in form for deleleting a group.
 #: actions/deletegroup.php:206
 #, fuzzy
 msgid ""
@@ -1476,10 +1497,11 @@ msgstr "ఈ గుంపును తొలగించకు"
 msgid "Delete this group"
 msgstr "ఈ గుంపుని తొలగించు"
 
+#. TRANS: Error message displayed trying to delete a notice while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1489,31 +1511,36 @@ msgstr "ఈ గుంపుని తొలగించు"
 msgid "Not logged in."
 msgstr "లోనికి ప్రవేశించలేదు."
 
-#: actions/deletenotice.php:74
+#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
+#: actions/deletenotice.php:78
 msgid "Can't delete this notice."
 msgstr "ఈ నోటీసుని తొలగించలేము."
 
-#: actions/deletenotice.php:106
+#. TRANS: Instructions for deleting a notice.
+#: actions/deletenotice.php:110
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
 msgstr "మీరు ఒక నోటీసుని శాశ్వతంగా తొలగించబోతున్నారు. ఇది ఒక్కసారి పూర్తయితే, దాన్నిక వెనక్కి తేలేరు."
 
-#: actions/deletenotice.php:112 actions/deletenotice.php:144
+#. TRANS: Page title when deleting a notice.
+#. TRANS: Fieldset legend for the delete notice form.
+#: actions/deletenotice.php:117 actions/deletenotice.php:148
 msgid "Delete notice"
 msgstr "నోటీసుని తొలగించు"
 
-#: actions/deletenotice.php:147
+#. TRANS: Message for the delete notice form.
+#: actions/deletenotice.php:152
 msgid "Are you sure you want to delete this notice?"
 msgstr "మీరు నిజంగానే ఈ నోటీసుని తొలగించాలనుకుంటున్నారా?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:154
+#: actions/deletenotice.php:159
 msgid "Do not delete this notice"
 msgstr "ఈ నోటీసుని తొలగించకు"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:161 lib/noticelist.php:667
+#: actions/deletenotice.php:166 lib/noticelist.php:667
 msgid "Delete this notice"
 msgstr "ఈ నోటీసుని తొలగించు"
 
@@ -1680,11 +1707,9 @@ msgstr "అప్రమేయాలని ఉపయోగించు"
 
 #. TRANS: Submit button title.
 #: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
-#: actions/othersettings.php:126 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: actions/useradminpanel.php:295 lib/applicationeditform.php:357
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: lib/applicationeditform.php:357 lib/designsettings.php:256
 msgid "Save"
 msgstr "భద్రపరచు"
 
@@ -1732,9 +1757,9 @@ msgid "Name is required."
 msgstr "పేరు తప్పనిసరి."
 
 #. TRANS: Validation error shown when providing too long a name in the "Edit application" form.
-#: actions/editapplication.php:188
+#: actions/editapplication.php:188 actions/newapplication.php:169
 #, fuzzy
-msgid "Name is too long (max 255 characters)."
+msgid "Name is too long (maximum 255 characters)."
 msgstr "పేరు చాలా పెద్దగా ఉంది (గరిష్ఠంగా 255 అక్షరాలు)."
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
@@ -1764,7 +1789,7 @@ msgid "Organization is required."
 msgstr "సంస్థ తప్పనిసరి."
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#: actions/editapplication.php:223
+#: actions/editapplication.php:223 actions/newapplication.php:199
 #, fuzzy
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "సంస్థ పేరు మరీ పెద్దగా ఉంది (255 అక్షరాలు గరిష్ఠం)."
@@ -2558,7 +2583,7 @@ msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "ప్రస్తుతం నిర్ధారించిన Jabber/GTalk చిరునామా"
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:180
+#: actions/imsettings.php:290 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "అభిరుచులు భద్రమయ్యాయి."
 
@@ -2680,10 +2705,9 @@ msgstr[1] "మీరు ఇప్పటికే ఈ వాడుకరులక
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#. TRANS: Whois output.
-#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:145 actions/invite.php:159 lib/command.php:426
-#, php-format
+#: actions/invite.php:145 actions/invite.php:159
+#, fuzzy, php-format
+msgctxt "INVITE"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
@@ -2860,8 +2884,9 @@ msgid ""
 msgstr ""
 
 #: actions/licenseadminpanel.php:156
-msgid "Invalid license title. Max length is 255 characters."
-msgstr ""
+#, fuzzy
+msgid "Invalid license title. Maximum length is 255 characters."
+msgstr "చెల్లని స్వాగత పాఠ్యం. గరిష్ఠ పొడవు 255 అక్షరాలు."
 
 #: actions/licenseadminpanel.php:168
 msgid "Invalid license URL."
@@ -3029,20 +3054,11 @@ msgstr "ఉపకరణాలని నమోదుచేసుకోడాన�
 msgid "Use this form to register a new application."
 msgstr "కొత్త ఉపకరణాన్ని నమోదుచేసుకోడానికి ఈ ఫారాన్ని ఉపయోగించండి."
 
-#: actions/newapplication.php:169
-msgid "Name is too long (maximum 255 chars)."
-msgstr "పేరు చాలా పెద్దగా ఉంది (గరిష్ఠంగా 255 అక్షరాలు)."
-
 #: actions/newapplication.php:184
 #, fuzzy
 msgid "Source URL is required."
 msgstr "పేరు తప్పనిసరి."
 
-#: actions/newapplication.php:199
-#, fuzzy
-msgid "Organization is too long (maximum 255 chars)."
-msgstr "సంస్థ పేరు మరీ పెద్దగా ఉంది (255 అక్షరాలు గరిష్ఠం)."
-
 #: actions/newapplication.php:266 actions/newapplication.php:275
 msgid "Could not create application."
 msgstr "ఉపకరణాన్ని సృష్టించలేకపోయాం."
@@ -3062,14 +3078,14 @@ msgid "New message"
 msgstr "కొత్త సందేశం"
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:499
+#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501
 msgid "You can't send a message to this user."
 msgstr "ఈ వాడుకరికి మీరు సందేశాన్ని పంపించలేరు."
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
 #: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
-#: lib/command.php:579
+#: lib/command.php:581
 msgid "No content!"
 msgstr "విషయం లేదు!"
 
@@ -3078,7 +3094,7 @@ msgid "No recipient specified."
 msgstr "ఎవరికి పంపించాలో పేర్కొనలేదు."
 
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:503
+#: actions/newmessage.php:167 lib/command.php:505
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "మీకు మీరే సందేశాన్ని పంపుకోకండి; దాని బదులు మీలో మీరే మెల్లగా చెప్పుకోండి."
@@ -3089,12 +3105,12 @@ msgstr "సందేశాన్ని పంపించాం"
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:511
+#: actions/newmessage.php:188 lib/command.php:513
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "%sకి నేరు సందేశాన్ని పంపించాం."
 
-#: actions/newmessage.php:213 actions/newnotice.php:263
+#: actions/newmessage.php:213 actions/newnotice.php:264
 msgid "Ajax Error"
 msgstr "అజాక్స్ పొరపాటు"
 
@@ -3102,17 +3118,7 @@ msgstr "అజాక్స్ పొరపాటు"
 msgid "New notice"
 msgstr "కొత్త సందేశం"
 
-#: actions/newnotice.php:159 lib/mailhandler.php:60
-#, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr "అది చాలా పొడవుంది. గరిష్ఠ నోటీసు పరిమాణం %d అక్షరాలు."
-
-#: actions/newnotice.php:183
-#, php-format
-msgid "Max notice size is %d chars, including attachment URL."
-msgstr "గరిష్ఠ నోటీసు పొడవు %d అక్షరాలు, జోడింపు URLని కలుపుకుని."
-
-#: actions/newnotice.php:229
+#: actions/newnotice.php:230
 msgid "Notice posted"
 msgstr "నోటీసుని పునరావృతించారు"
 
@@ -3279,37 +3285,47 @@ msgstr "ప్రజల అన్వేషణ"
 msgid "Notice Search"
 msgstr "నోటీసుల అన్వేషణ"
 
-#: actions/othersettings.php:60
+#: actions/othersettings.php:59
 msgid "Other settings"
 msgstr "ఇతర అమరికలు"
 
+#. TRANS: Instructions for tab "Other" in user profile settings.
 #: actions/othersettings.php:71
 msgid "Manage various other options."
 msgstr "వేరే ఇతర ఎంపికలని సంభాళించండి."
 
-#: actions/othersettings.php:108
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/othersettings.php:111
 msgid " (free service)"
 msgstr " (స్వేచ్ఛా సేవ)"
 
-#: actions/othersettings.php:116
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/othersettings.php:120
 msgid "Shorten URLs with"
 msgstr "URL కుదింపు సేవ"
 
-#: actions/othersettings.php:117
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/othersettings.php:122
 msgid "Automatic shortening service to use."
 msgstr "ఉపయోగించాల్సిన యాంత్రిక కుదింపు సేవ."
 
-#: actions/othersettings.php:122
+#. TRANS: Label for checkbox.
+#: actions/othersettings.php:128
 msgid "View profile designs"
 msgstr "ఫ్రొఫైలు రూపురేఖలు"
 
-#: actions/othersettings.php:123
+#. TRANS: Tooltip for checkbox.
+#: actions/othersettings.php:130
 #, fuzzy
 msgid "Show or hide profile designs."
 msgstr "ఫ్రొఫైలు రూపురేఖలు"
 
-#: actions/othersettings.php:153
-msgid "URL shortening service is too long (max 50 chars)."
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/othersettings.php:162
+#, fuzzy
+msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "URL కుదింపు సేవ మరీ పెద్దగా ఉంది (50 అక్షరాలు గరిష్ఠం)."
 
 #: actions/otp.php:69
@@ -3798,7 +3814,7 @@ msgstr "స్వపరిచయం"
 #. TRANS: Label for group location (dt). Text hidden by default.
 #: actions/profilesettings.php:149 actions/register.php:485
 #: actions/showgroup.php:267 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:177
+#: actions/userauthorization.php:166 lib/groupeditform.php:180
 #: lib/userprofile.php:165
 msgid "Location"
 msgstr "ప్రాంతం"
@@ -4136,7 +4152,8 @@ msgid "Unexpected password reset."
 msgstr ""
 
 #: actions/recoverpassword.php:365
-msgid "Password must be 6 chars or more."
+#, fuzzy
+msgid "Password must be 6 characters or more."
 msgstr "సంకేతపదం 6 లేదా అంతకంటే ఎక్కవ అక్షరాలుండాలి."
 
 #: actions/recoverpassword.php:369
@@ -4505,7 +4522,7 @@ msgstr "సంస్ధ"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:172
+#: lib/applicationeditform.php:208 lib/groupeditform.php:175
 msgid "Description"
 msgstr "వివరణ"
 
@@ -4652,7 +4669,7 @@ msgid "Note"
 msgstr "గమనిక"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:298 lib/groupeditform.php:184
+#: actions/showgroup.php:298 lib/groupeditform.php:187
 msgid "Aliases"
 msgstr "మారుపేర్లు"
 
@@ -4787,54 +4804,76 @@ msgstr "%2$sలో %1$sకి స్పందనలు!"
 msgid "Notice deleted."
 msgstr "నోటీసుని తొలగించాం."
 
-#: actions/showstream.php:72
-#, php-format
-msgid " tagged %s"
-msgstr ""
+#. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
+#: actions/showstream.php:70
+#, fuzzy, php-format
+msgid "%1$s tagged %2$s"
+msgstr "%1$s, %2$dవ పేజీ"
 
-#: actions/showstream.php:78
+#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#: actions/showstream.php:74
+#, fuzzy, php-format
+msgid "%1$s tagged %2$s, page %3$d"
+msgstr "%2$sలో %1$s అనే ట్యాగుతో ఉన్న నోటీసులు!"
+
+#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$d is the page number.
+#: actions/showstream.php:82
 #, php-format
 msgid "%1$s, page %2$d"
 msgstr "%1$s, %2$dవ పేజీ"
 
-#: actions/showstream.php:120
+#. TRANS: Title for link to notice feed.
+#. TRANS: %1$s is a user nickname, %2$s is a hashtag.
+#: actions/showstream.php:127
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "%s కొరకు స్పందనల ఫీడు (RSS 1.0)"
 
-#: actions/showstream.php:127
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:136
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "%s కొరకు స్పందనల ఫీడు (RSS 1.0)"
 
-#: actions/showstream.php:134
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:145
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "%s కొరకు స్పందనల ఫీడు (RSS 2.0)"
 
-#: actions/showstream.php:141
+#: actions/showstream.php:152
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "%s కొరకు స్పందనల ఫీడు (ఆటమ్)"
 
-#: actions/showstream.php:146
+#. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
+#. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
+#: actions/showstream.php:159
 #, fuzzy, php-format
 msgid "FOAF for %s"
 msgstr "%s గుంపు"
 
-#: actions/showstream.php:197
-#, php-format
-msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
+#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
+#: actions/showstream.php:211
+#, fuzzy, php-format
+msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr "ఇది %1$s యొక్క కాలరేఖ కానీ %2$s ఇంకా ఏమీ రాయలేదు."
 
-#: actions/showstream.php:202
+#. TRANS: Second sentence of empty list message for a stream for the user themselves.
+#: actions/showstream.php:217
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
 msgstr ""
 "ఈమధ్యే ఏదైనా ఆసక్తికరమైనది చూసారా? మీరు ఇంకా నోటీసులేమీ వ్రాయలేదు, మొదలుపెట్టడానికి ఇదే మంచి సమయం :)"
 
-#: actions/showstream.php:204
+#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:221
 #, fuzzy, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -4842,7 +4881,9 @@ msgid ""
 msgstr ""
 "[ఈ విషయంపై](%%%%action.newnotice%%%%?status_textarea=%s) వ్రాసే మొదటివారు మీరే అవ్వండి!"
 
-#: actions/showstream.php:243
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:264
 #, fuzzy, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4857,7 +4898,9 @@ msgstr ""
 "చాల వాటిలో భాగస్తులవ్వడానికి [ఇప్పుడే చేరండి](%%%%action.register%%%%)! ([మరింత చదవండి](%%%%"
 "doc.help%%%%))"
 
-#: actions/showstream.php:248
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:271
 #, fuzzy, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4867,7 +4910,8 @@ msgstr ""
 "ఇది %%site.name%%, స్వేచ్ఛా మృదూపకరమైన [స్టేటస్‌నెట్](http://status.net/) అనే పనిముట్టుపై "
 "ఆధారపడిన ఒక [మైక్రో-బ్లాగింగు](http://en.wikipedia.org/wiki/Micro-blogging) సేవ."
 
-#: actions/showstream.php:305
+#. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
+#: actions/showstream.php:328
 #, php-format
 msgid "Repeat of %s"
 msgstr "%s యొక్క పునరావృతం"
@@ -4980,32 +5024,41 @@ msgstr "పాఠ్యపు పరిమితి"
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr "అదే విషయాన్ని మళ్ళీ టపా చేయడానికి వాడుకరులు ఎంత సమయం (క్షణాల్లో) వేచివుండాలి."
 
-#: actions/sitenoticeadminpanel.php:56
+#. TRANS: Page title for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:55
 msgid "Site Notice"
 msgstr "సైటు గమనిక"
 
-#: actions/sitenoticeadminpanel.php:67
+#. TRANS: Instructions for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:66
 #, fuzzy
 msgid "Edit site-wide message"
 msgstr "కొత్త సందేశం"
 
-#: actions/sitenoticeadminpanel.php:103
+#. TRANS: Server error displayed when saving a site-wide notice was impossible.
+#: actions/sitenoticeadminpanel.php:101
 msgid "Unable to save site notice."
 msgstr "సైటు గమనికని భద్రపరచు"
 
-#: actions/sitenoticeadminpanel.php:113
-msgid "Max length for the site-wide notice is 255 chars."
+#. TRANS: Client error displayed when a site-wide notice was longer than allowed.
+#: actions/sitenoticeadminpanel.php:112
+#, fuzzy
+msgid "Maximum length for the site-wide notice is 255 characters."
 msgstr "సైటు-వారీ నోటీసుకి గరిష్ఠ పొడవు 255 అక్షరాలు."
 
+#. TRANS: Label for site-wide notice text field in admin panel.
 #: actions/sitenoticeadminpanel.php:176
 msgid "Site notice text"
 msgstr "సైటు గమనిక పాఠ్యం"
 
-#: actions/sitenoticeadminpanel.php:178
-msgid "Site-wide notice text (255 chars max; HTML okay)"
+#. TRANS: Tooltip for site-wide notice text field in admin panel.
+#: actions/sitenoticeadminpanel.php:179
+#, fuzzy
+msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr "సైటు-వారీ నోటీసు పాఠ్యం (255 అక్షరాలు గరిష్ఠం; HTML పర్లేదు)"
 
-#: actions/sitenoticeadminpanel.php:198
+#. TRANS: Title for button to save site notice in admin panel.
+#: actions/sitenoticeadminpanel.php:201
 msgid "Save site notice"
 msgstr "సైటు గమనికని భద్రపరచు"
 
@@ -5466,76 +5519,94 @@ msgid ""
 msgstr ""
 
 #. TRANS: User admin panel title
-#: actions/useradminpanel.php:60
+#: actions/useradminpanel.php:58
 msgctxt "TITLE"
 msgid "User"
 msgstr "వాడుకరి"
 
-#: actions/useradminpanel.php:71
+#. TRANS: Instruction for user admin panel.
+#: actions/useradminpanel.php:69
 msgid "User settings for this StatusNet site"
 msgstr ""
 
-#: actions/useradminpanel.php:150
+#. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
+#: actions/useradminpanel.php:147
 msgid "Invalid bio limit. Must be numeric."
 msgstr ""
 
-#: actions/useradminpanel.php:156
-msgid "Invalid welcome text. Max length is 255 characters."
+#. TRANS: Form validation error in user admin panel when welcome text is too long.
+#: actions/useradminpanel.php:154
+#, fuzzy
+msgid "Invalid welcome text. Maximum length is 255 characters."
 msgstr "చెల్లని స్వాగత పాఠ్యం. గరిష్ఠ పొడవు 255 అక్షరాలు."
 
+#. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
+#. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
 #, php-format
-msgid "Invalid default subscripton: '%1$s' is not user."
+msgid "Invalid default subscripton: '%1$s' is not a user."
 msgstr ""
 
 #. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:106
+#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
 #: lib/personalgroupnav.php:109
 msgid "Profile"
 msgstr "ప్రొఫైలు"
 
-#: actions/useradminpanel.php:223
+#. TRANS: Field label in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:220
 msgid "Bio Limit"
 msgstr "స్వపరిచయ పరిమితి"
 
-#: actions/useradminpanel.php:224
+#. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:222
 msgid "Maximum length of a profile bio in characters."
 msgstr "స్వపరిచయం యొక్క గరిష్ఠ పొడవు, అక్షరాలలో."
 
-#: actions/useradminpanel.php:232
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:231
 msgid "New users"
 msgstr "కొత్త వాడుకరులు"
 
+#. TRANS: Field label in user admin panel for setting new user welcome text.
 #: actions/useradminpanel.php:236
 msgid "New user welcome"
 msgstr "కొత్త వాడుకరి స్వాగతం"
 
-#: actions/useradminpanel.php:237
-msgid "Welcome text for new users (Max 255 chars)."
+#. TRANS: Tooltip in user admin panel for setting new user welcome text.
+#: actions/useradminpanel.php:238
+#, fuzzy
+msgid "Welcome text for new users (maximum 255 characters)."
 msgstr "కొత్త వాడుకరులకై స్వాగత సందేశం (255 అక్షరాలు గరిష్ఠం)."
 
-#: actions/useradminpanel.php:242
+#. TRANS: Field label in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:244
 msgid "Default subscription"
 msgstr "అప్రమేయ చందా"
 
-#: actions/useradminpanel.php:243
+#. TRANS: Tooltip in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:246
 #, fuzzy
 msgid "Automatically subscribe new users to this user."
 msgstr "ఉపయోగించాల్సిన యాంత్రిక కుదింపు సేవ."
 
-#: actions/useradminpanel.php:252
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:256
 msgid "Invitations"
 msgstr "ఆహ్వానాలు"
 
-#: actions/useradminpanel.php:257
+#. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:262
 msgid "Invitations enabled"
 msgstr "ఆహ్వానాలని చేతనంచేసాం"
 
-#: actions/useradminpanel.php:259
+#. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:265
 msgid "Whether to allow users to invite new users."
 msgstr "వాడుకరులను కొత్త వారిని ఆహ్వానించడానికి అనుమతించాలా వద్దా."
 
-#: actions/useradminpanel.php:295
+#. TRANS: Title for button to save user settings in user admin panel.
+#: actions/useradminpanel.php:302
 msgid "Save user settings"
 msgstr "వాడుకరి అమరికలను భద్రపరచు"
 
@@ -5725,7 +5796,7 @@ msgid "Plugins"
 msgstr "ప్లగిన్లు"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:831
+#: actions/version.php:198 lib/action.php:880
 msgid "Version"
 msgstr "సంచిక"
 
@@ -5932,16 +6003,23 @@ msgstr "స్థానిక గుంపుని తాజాకరించ�
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
+#. TRANS: Full name of a profile or group followed by nickname in parens
+#: classes/Profile.php:164
+#, fuzzy, php-format
+msgctxt "FANCYNAME"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:791
+#: classes/Profile.php:812
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:800
+#: classes/Profile.php:821
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6089,195 +6167,202 @@ msgstr "%1$s - %2$s"
 msgid "Untitled page"
 msgstr "శీర్షికలేని పేజీ"
 
+#. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
+#: lib/action.php:310
+msgctxt "TOOLTIP"
+msgid "Show more"
+msgstr ""
+
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:477
+#: lib/action.php:526
 msgid "Primary site navigation"
 msgstr "ప్రాధమిక సైటు మార్గదర్శిని"
 
 #. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:483
+#: lib/action.php:532
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr ""
 
 #. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:486
+#: lib/action.php:535
 msgctxt "MENU"
 msgid "Personal"
 msgstr "వ్యక్తిగత"
 
 #. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:488
+#: lib/action.php:537
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
 msgstr "మీ ఈమెయిలు, అవతారం, సంకేతపదం మరియు ప్రౌఫైళ్ళను మార్చుకోండి"
 
 #. TRANS: Main menu option when logged in for access to user settings
-#: lib/action.php:491
+#: lib/action.php:540
 msgid "Account"
 msgstr "ఖాతా"
 
 #. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:493
+#: lib/action.php:542
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "అనుసంధానాలు"
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:496
+#: lib/action.php:545
 msgid "Connect"
 msgstr "అనుసంధానించు"
 
 #. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:499
+#: lib/action.php:548
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "సైటు స్వరూపణాన్ని మార్చండి"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:502 lib/groupnav.php:117
+#: lib/action.php:551 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "నిర్వాహకులు"
 
 #. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:506
+#: lib/action.php:555
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "%sలో తోడుకై మీ స్నేహితులని మరియు సహోద్యోగులని ఆహ్వానించండి"
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:509
+#: lib/action.php:558
 msgctxt "MENU"
 msgid "Invite"
 msgstr "ఆహ్వానించు"
 
 #. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:515
+#: lib/action.php:564
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "సైటు నుండి నిష్క్రమించు"
 
 #. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:518
+#: lib/action.php:567
 msgctxt "MENU"
 msgid "Logout"
 msgstr "నిష్క్రమించు"
 
 #. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:523
+#: lib/action.php:572
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "ఖాతాని సృష్టించుకోండి"
 
 #. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:526
+#: lib/action.php:575
 msgctxt "MENU"
 msgid "Register"
 msgstr "నమోదు"
 
 #. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:529
+#: lib/action.php:578
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "సైటు లోనికి ప్రవేశించండి"
 
 #. TRANS: Main menu option when not logged in to log in
-#: lib/action.php:532
+#: lib/action.php:581
 msgctxt "MENU"
 msgid "Login"
 msgstr "ప్రవేశించు"
 
 #. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:535
+#: lib/action.php:584
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "సహాయం కావాలి!"
 
 #. TRANS: Main menu option for help on the StatusNet site
-#: lib/action.php:538
+#: lib/action.php:587
 msgctxt "MENU"
 msgid "Help"
 msgstr "సహాయం"
 
 #. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:541
+#: lib/action.php:590
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr "ప్రజలు లేదా పాఠ్యం కొరకు వెతకండి"
 
 #. TRANS: Main menu option when logged in or when the StatusNet instance is not private
-#: lib/action.php:544
+#: lib/action.php:593
 msgctxt "MENU"
 msgid "Search"
 msgstr "వెతుకు"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:566 lib/adminpanelaction.php:387
+#: lib/action.php:615 lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "సైటు గమనిక"
 
 #. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:633
+#: lib/action.php:682
 msgid "Local views"
 msgstr "స్థానిక వీక్షణలు"
 
 #. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:703
+#: lib/action.php:752
 msgid "Page notice"
 msgstr "పేజీ గమనిక"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:804
+#: lib/action.php:853
 msgid "Secondary site navigation"
 msgstr "ద్వితీయ సైటు మార్గదర్శిని"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:810
+#: lib/action.php:859
 msgid "Help"
 msgstr "సహాయం"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:813
+#: lib/action.php:862
 msgid "About"
 msgstr "గురించి"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:816
+#: lib/action.php:865
 msgid "FAQ"
 msgstr "ప్రశ్నలు"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:821
+#: lib/action.php:870
 msgid "TOS"
 msgstr "సేవా నియమాలు"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:825
+#: lib/action.php:874
 msgid "Privacy"
 msgstr "అంతరంగికత"
 
-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:828
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+#: lib/action.php:877
 msgid "Source"
 msgstr "మూలము"
 
-#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:834
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+#: lib/action.php:884
 msgid "Contact"
 msgstr "సంప్రదించు"
 
-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:837
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+#: lib/action.php:887
 msgid "Badge"
 msgstr "బాడ్జి"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:866
+#: lib/action.php:916
 msgid "StatusNet software license"
 msgstr "స్టేటస్‌నెట్ మృదూపకరణ లైసెన్సు"
 
@@ -6285,7 +6370,7 @@ msgstr "స్టేటస్‌నెట్ మృదూపకరణ లైస�
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:873
+#: lib/action.php:923
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -6295,7 +6380,7 @@ msgstr ""
 "అందిస్తున్న సూక్ష్మ బ్లాగింగు సేవ."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:876
+#: lib/action.php:926
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** అనేది మైక్రో బ్లాగింగు సదుపాయం."
@@ -6304,7 +6389,7 @@ msgstr "**%%site.name%%** అనేది మైక్రో బ్లాగి�
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:883
+#: lib/action.php:933
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -6316,50 +6401,50 @@ msgstr ""
 "పై నడుస్తుంది."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:899
+#: lib/action.php:949
 msgid "Site content license"
 msgstr "స్టేటస్‌నెట్ మృదూపకరణ లైసెన్సు"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:906
+#: lib/action.php:956
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:913
+#: lib/action.php:963
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:917
+#: lib/action.php:967
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:949
+#: lib/action.php:999
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1285
+#: lib/action.php:1335
 msgid "Pagination"
 msgstr "పేజీకరణ"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1296
+#: lib/action.php:1346
 msgid "After"
 msgstr "తర్వాత"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1306
+#: lib/action.php:1356
 msgid "Before"
 msgstr "ఇంతక్రితం"
 
@@ -6709,7 +6794,7 @@ msgid "AJAX error"
 msgstr "అజాక్స్ పొరపాటు"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:233 lib/mailhandler.php:142
+#: lib/channel.php:233 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "ఆదేశం పూర్తయ్యింది"
 
@@ -6726,7 +6811,7 @@ msgstr "ఆ ఈమెయిలు చిరునామా లేదా వా�
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:626
+#: lib/command.php:99 lib/command.php:630
 #, fuzzy
 msgid "User has no last notice."
 msgstr "వాడుకరికి ప్రొఫైలు లేదు."
@@ -6796,6 +6881,14 @@ msgstr ""
 msgid "%1$s left group %2$s."
 msgstr ""
 
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: lib/command.php:426
+#, fuzzy, php-format
+msgctxt "WHOIS"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
 #. TRANS: Whois output. %s is the full name of the queried user.
 #: lib/command.php:430
 #, php-format
@@ -6833,138 +6926,142 @@ msgid ""
 "same server."
 msgstr ""
 
-#. TRANS: Message given if content is too long.
+#. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
 #: lib/command.php:488
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr "నోటిసు చాలా పొడవుగా ఉంది - %1$d అక్షరాలు గరిష్ఠం, మీరు %2$d పంపించారు."
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] "నోటిసు చాలా పొడవుగా ఉంది - %1$d అక్షరాలు గరిష్ఠం, మీరు %2$d పంపించారు."
+msgstr[1] "నోటిసు చాలా పొడవుగా ఉంది - %1$d అక్షరాలు గరిష్ఠం, మీరు %2$d పంపించారు."
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:514
+#: lib/command.php:516
 #, fuzzy
 msgid "Error sending direct message."
 msgstr "నేరుగా సందేశాలు పంపడం నుండి మిమ్మల్ని నిషేధించారు."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:551
+#: lib/command.php:553
 #, fuzzy, php-format
 msgid "Notice from %s repeated."
 msgstr "సందేశాలు"
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:554
+#: lib/command.php:556
 msgid "Error repeating notice."
 msgstr "నోటీసుని పునరావృతించడంలో పొరపాటు."
 
-#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:589
+#: lib/command.php:591
 #, fuzzy, php-format
-msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
-msgstr "నోటిసు చాలా పొడవుగా ఉంది - %d అక్షరాలు గరిష్ఠం, మీరు %d పంపించారు"
+msgid "Notice too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] "నోటిసు చాలా పొడవుగా ఉంది - %d అక్షరాలు గరిష్ఠం, మీరు %d పంపించారు"
+msgstr[1] "నోటిసు చాలా పొడవుగా ఉంది - %d అక్షరాలు గరిష్ఠం, మీరు %d పంపించారు"
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:600
+#: lib/command.php:604
 #, fuzzy, php-format
 msgid "Reply to %s sent."
 msgstr "%sకి స్పందనలు"
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:603
+#: lib/command.php:607
 msgid "Error saving notice."
 msgstr "నోటీసుని భద్రపరచడంలో పొరపాటు."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:650
+#: lib/command.php:654
 msgid "Specify the name of the user to subscribe to."
 msgstr "ఏవరికి చందా చేరాలనుకుంటున్నారో ఆ వాడుకరి పేరుని ఇవ్వండి."
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:659
+#: lib/command.php:663
 msgid "Can't subscribe to OMB profiles by command."
 msgstr ""
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:667
+#: lib/command.php:671
 #, php-format
 msgid "Subscribed to %s."
 msgstr "%sకి చందా చేరారు."
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:688 lib/command.php:799
+#: lib/command.php:692 lib/command.php:803
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "ఎవరినుండైతే చందావిరమించాలనుకుంటున్నారో ఆ వాడుకరి పేరుని ఇవ్వండి."
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:699
+#: lib/command.php:703
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:719 lib/command.php:745
+#: lib/command.php:723 lib/command.php:749
 #, fuzzy
 msgid "Command not yet implemented."
 msgstr "క్షమించండి, ఈ ఆదేశం ఇంకా అమలుపరచబడలేదు."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:723
+#: lib/command.php:727
 #, fuzzy
 msgid "Notification off."
 msgstr "నిర్ధారణ సంకేతం లేదు."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:726
+#: lib/command.php:730
 msgid "Can't turn off notification."
 msgstr ""
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:749
+#: lib/command.php:753
 #, fuzzy
 msgid "Notification on."
 msgstr "నిర్ధారణ సంకేతం లేదు."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:752
+#: lib/command.php:756
 #, fuzzy
 msgid "Can't turn on notification."
 msgstr "మీ నోటీసుని మీరే పునరావృతించలేరు."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:766
+#: lib/command.php:770
 msgid "Login command is disabled."
 msgstr ""
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:779
+#: lib/command.php:783
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr "ఈ లంకెని ఒకేసారి ఉపయోగించగలరు మరియు అది 2 నిమిషాల వరకు మాత్రమే చెల్లుతుంది: %s."
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:808
+#: lib/command.php:812
 #, php-format
 msgid "Unsubscribed %s."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:826
+#: lib/command.php:830
 msgid "You are not subscribed to anyone."
 msgstr "మీరు ఎవరికీ చందాచేరలేదు."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:831
+#: lib/command.php:835
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "%sకి స్పందనలు"
@@ -6972,14 +7069,14 @@ msgstr[1] "%sకి స్పందనలు"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:853
+#: lib/command.php:857
 msgid "No one is subscribed to you."
 msgstr "మీకు చందాదార్లు ఎవరూ లేరు."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:858
+#: lib/command.php:862
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "%sకి స్పందనలు"
@@ -6987,21 +7084,21 @@ msgstr[1] "%sకి స్పందనలు"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:880
+#: lib/command.php:884
 msgid "You are not a member of any groups."
 msgstr "మీరు ఏ గుంపులోనూ సభ్యులు కాదు."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:885
+#: lib/command.php:889
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!"
 msgstr[1] "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:900
+#: lib/command.php:904
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -7192,7 +7289,8 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 చిన్నబడి అక్షరాలు లేదా అంకెలు, విరామచిహ్నాలు మరియు ఖాళీలు తప్ప"
 
 #: lib/groupeditform.php:163
-msgid "URL of the homepage or blog of the group or topic"
+#, fuzzy
+msgid "URL of the homepage or blog of the group or topic."
 msgstr "ఈ ఉపకరణం యొక్క హోమ్&zwnj;పేజీ చిరునామా"
 
 #: lib/groupeditform.php:168
@@ -7200,19 +7298,28 @@ msgid "Describe the group or topic"
 msgstr "గుంపుని లేదా విషయాన్ని వివరించండి"
 
 #: lib/groupeditform.php:170
-#, php-format
-msgid "Describe the group or topic in %d characters"
-msgstr "గుంపు లేదా విషయాన్ని గురించి %d అక్షరాల్లో వివరించండి"
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d character or less"
+msgid_plural "Describe the group or topic in %d characters or less"
+msgstr[0] "గుంపు లేదా విషయాన్ని గురించి %d అక్షరాల్లో వివరించండి"
+msgstr[1] "గుంపు లేదా విషయాన్ని గురించి %d అక్షరాల్లో వివరించండి"
 
-#: lib/groupeditform.php:179
+#: lib/groupeditform.php:182
+#, fuzzy
 msgid ""
-"Location for the group, if any, like \"City, State (or Region), Country\""
+"Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr "గుంపు యొక్క ప్రాంతం, ఉంటే, \"నగరం, రాష్ట్రం (లేదా ప్రాంతం), దేశం\""
 
-#: lib/groupeditform.php:187
+#: lib/groupeditform.php:190
 #, php-format
-msgid "Extra nicknames for the group, comma- or space- separated, max %d"
-msgstr ""
+msgid ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"alias allowed."
+msgid_plural ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"aliases allowed."
+msgstr[0] ""
+msgstr[1] ""
 
 #. TRANS: Menu item in the group navigation page.
 #: lib/groupnav.php:86
@@ -7756,7 +7863,7 @@ msgstr "క్షమించండి, అది మీ లోనికివ�
 msgid "Sorry, no incoming email allowed."
 msgstr "క్షమించండి, అది మీ లోనికివచ్చు ఈమెయిలు చిరునామా కాదు."
 
-#: lib/mailhandler.php:228
+#: lib/mailhandler.php:229
 #, fuzzy, php-format
 msgid "Unsupported message type: %s"
 msgstr "%s కి నేరు సందేశాలు"
@@ -8105,16 +8212,17 @@ msgid "Sandbox this user"
 msgstr "ఈ వాడుకరిని నిరోధించు"
 
 #. TRANS: Fieldset legend for the search form.
-#: lib/searchaction.php:121
+#: lib/searchaction.php:120
 msgid "Search site"
 msgstr "సైటుని వెతుకు"
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
-#: lib/searchaction.php:129
+#: lib/searchaction.php:128
 msgid "Keyword(s)"
 msgstr "కీపదము(లు)"
 
+#. TRANS: Button text for searching site.
 #: lib/searchaction.php:130
 msgctxt "BUTTON"
 msgid "Search"
@@ -8204,8 +8312,8 @@ msgid "The theme file is missing or the upload failed."
 msgstr ""
 
 #: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:278 lib/themeuploader.php:282
-#: lib/themeuploader.php:290 lib/themeuploader.php:297
+#: lib/themeuploader.php:279 lib/themeuploader.php:283
+#: lib/themeuploader.php:291 lib/themeuploader.php:298
 #, fuzzy
 msgid "Failed saving theme."
 msgstr "అవతారపు తాజాకరణ విఫలమైంది."
@@ -8216,29 +8324,32 @@ msgstr ""
 
 #: lib/themeuploader.php:166
 #, php-format
-msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
-msgstr ""
+msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
+msgid_plural ""
+"Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr[0] ""
+msgstr[1] ""
 
-#: lib/themeuploader.php:178
+#: lib/themeuploader.php:179
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr ""
 
-#: lib/themeuploader.php:218
+#: lib/themeuploader.php:219
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
 msgstr ""
 
-#: lib/themeuploader.php:224
+#: lib/themeuploader.php:225
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr ""
 
-#: lib/themeuploader.php:241
+#: lib/themeuploader.php:242
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr ""
 
-#: lib/themeuploader.php:259
+#: lib/themeuploader.php:260
 msgid "Error opening theme archive."
 msgstr "నిరోధాన్ని తొలగించడంలో పొరపాటు."
 
@@ -8420,23 +8531,35 @@ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
 msgstr[0] "నోటిసు చాలా పొడవుగా ఉంది - %1$d అక్షరాలు గరిష్ఠం, మీరు %2$d పంపించారు."
 msgstr[1] "నోటిసు చాలా పొడవుగా ఉంది - %1$d అక్షరాలు గరిష్ఠం, మీరు %2$d పంపించారు."
 
-#: scripts/restoreuser.php:82
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: scripts/restoreuser.php:61
 #, php-format
-msgid "Backup file for user %s (%s)"
+msgid "Getting backup from file '%s'."
 msgstr ""
 
-#: scripts/restoreuser.php:88
+#. TRANS: Commandline script output.
+#: scripts/restoreuser.php:91
 #, fuzzy
 msgid "No user specified; using backup user."
 msgstr "గుంపు ఏమీ పేర్కొనలేదు."
 
-#: scripts/restoreuser.php:94
+#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
+#: scripts/restoreuser.php:98
 #, php-format
-msgid "%d entries in backup."
-msgstr ""
+msgid "%d entry in backup."
+msgid_plural "%d entries in backup."
+msgstr[0] ""
+msgstr[1] ""
+
+#~ msgid "Name is too long (maximum 255 chars)."
+#~ msgstr "పేరు చాలా పెద్దగా ఉంది (గరిష్ఠంగా 255 అక్షరాలు)."
+
+#, fuzzy
+#~ msgid "Organization is too long (maximum 255 chars)."
+#~ msgstr "సంస్థ పేరు మరీ పెద్దగా ఉంది (255 అక్షరాలు గరిష్ఠం)."
 
-#~ msgid "Description is too long (max %d chars)."
-#~ msgstr "వివరణ చాలా పెద్దగా ఉంది (%d అక్షరాలు గరిష్ఠం)."
+#~ msgid "That's too long. Max notice size is %d chars."
+#~ msgstr "అది చాలా పొడవుంది. గరిష్ఠ నోటీసు పరిమాణం %d అక్షరాలు."
 
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "చాలా మారుపేర్లు! %d గరిష్ఠం."
+#~ msgid "Max notice size is %d chars, including attachment URL."
+#~ msgstr "గరిష్ఠ నోటీసు పొడవు %d అక్షరాలు, జోడింపు URLని కలుపుకుని."
diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po
index 61def584b..a99fd9bc4 100644
--- a/locale/tr/LC_MESSAGES/statusnet.po
+++ b/locale/tr/LC_MESSAGES/statusnet.po
@@ -11,17 +11,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-30 23:18+0000\n"
-"PO-Revision-Date: 2010-10-30 23:20:49+0000\n"
+"POT-Creation-Date: 2010-11-02 22:51+0000\n"
+"PO-Revision-Date: 2010-11-02 22:53:46+0000\n"
 "Language-Team: Turkish <http://translatewiki.net/wiki/Portal:tr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r75708); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r75875); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tr\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2010-10-30 09:48:40+0000\n"
+"X-POT-Import-Date: 2010-10-30 23:42:01+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -79,15 +79,20 @@ msgstr "Erişim ayarlarını kaydet"
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
+#. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
+#. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #: actions/accessadminpanel.php:193 actions/emailsettings.php:228
-#: actions/imsettings.php:187 actions/pathsadminpanel.php:512
-#: actions/profilesettings.php:201 actions/smssettings.php:209
-#: actions/subscriptions.php:246 lib/applicationeditform.php:355
+#: actions/imsettings.php:187 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: lib/applicationeditform.php:355 lib/groupeditform.php:207
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Kaydet"
@@ -138,7 +143,7 @@ msgstr "Böyle bir kullanıcı yok."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:495 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Böyle bir kullanıcı yok."
@@ -212,7 +217,9 @@ msgstr ""
 
 #. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:208
+#. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -567,8 +574,11 @@ msgstr "Tam isim çok uzun (azm: 255 karakter)."
 #. TRANS: Group edit form validation error.
 #. TRANS: Form validation error in New application form.
 #. TRANS: %d is the maximum number of characters for the description.
+#. TRANS: Group create form validation error.
+#. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:220 actions/editapplication.php:201
 #: actions/editgroup.php:216 actions/newapplication.php:178
+#: actions/newgroup.php:152
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -726,14 +736,14 @@ msgstr "Takip talebine izin verildi"
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:172 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:74
 #: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
 #: actions/groupunblock.php:65 actions/imsettings.php:230
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
-#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/othersettings.php:153 actions/passwordsettings.php:138
 #: actions/profilesettings.php:221 actions/recoverpassword.php:350
 #: actions/register.php:172 actions/remotesubscribe.php:77
 #: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
@@ -915,20 +925,21 @@ msgstr "Başka bir kullanıcının durum mesajını silemezsiniz."
 
 #. TRANS: Client error displayed trying to repeat a non-existing notice through the API.
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
+#. TRANS: Error message displayed trying to delete a non-existing notice.
 #: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/deletenotice.php:58 actions/shownotice.php:92
+#: actions/deletenotice.php:61 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "Böyle bir durum mesajı yok."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:535
+#: actions/apistatusesretweet.php:83 lib/command.php:537
 msgid "Cannot repeat your own notice."
 msgstr "Kendi durum mesajınızı tekrarlayamazsınız."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:541
+#: actions/apistatusesretweet.php:92 lib/command.php:543
 msgid "Already repeated that notice."
 msgstr "Bu durum mesajı zaten tekrarlanmış."
 
@@ -949,7 +960,8 @@ msgstr "İstemci, bir değere sahip 'status' parametresi sağlamalı."
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#: actions/apistatusesupdate.php:244
+#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
+#: lib/mailhandler.php:60
 #, fuzzy, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
@@ -963,7 +975,7 @@ msgstr "Onay kodu bulunamadı."
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
-#: actions/apistatusesupdate.php:308
+#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
 #, fuzzy, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
@@ -1176,17 +1188,18 @@ msgstr "Resimden kullanıcı resminiz olacak bir kare alanı seçin"
 msgid "Lost our file data."
 msgstr ""
 
-#: actions/avatarsettings.php:384
+#. TRANS: Success message for having updated a user avatar.
+#: actions/avatarsettings.php:385
 msgid "Avatar updated."
 msgstr "Avatar güncellendi."
 
 #. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
-#: actions/avatarsettings.php:388
+#: actions/avatarsettings.php:389
 msgid "Failed updating avatar."
 msgstr "Avatar güncellemede hata."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:412
+#: actions/avatarsettings.php:413
 msgid "Avatar deleted."
 msgstr "Kullanıcı resmi silindi."
 
@@ -1219,8 +1232,8 @@ msgstr ""
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:154 actions/deleteapplication.php:154
-#: actions/deletegroup.php:220 actions/deletenotice.php:150
+#: actions/block.php:154 actions/deleteapplication.php:157
+#: actions/deletegroup.php:220 actions/deletenotice.php:155
 #: actions/deleteuser.php:152 actions/groupblock.php:178
 msgctxt "BUTTON"
 msgid "No"
@@ -1238,8 +1251,8 @@ msgstr "Bu kullanıcıyı engelleme"
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:161 actions/deleteapplication.php:161
-#: actions/deletegroup.php:227 actions/deletenotice.php:157
+#: actions/block.php:161 actions/deleteapplication.php:164
+#: actions/deletegroup.php:227 actions/deletenotice.php:162
 #: actions/deleteuser.php:159 actions/groupblock.php:185
 msgctxt "BUTTON"
 msgid "Yes"
@@ -1356,12 +1369,13 @@ msgstr "O adres daha önce onaylanmış."
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
 #. TRANS: Server error thrown on database error updating IM preferences.
 #. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
 #. TRANS: Server error thrown when user profile settings could not be updated.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #: actions/confirmaddress.php:118 actions/emailsettings.php:331
 #: actions/emailsettings.php:477 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:174
+#: actions/imsettings.php:442 actions/othersettings.php:184
 #: actions/profilesettings.php:326 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
@@ -1397,16 +1411,19 @@ msgstr "Konuşma"
 msgid "Notices"
 msgstr "Durum mesajları"
 
-#: actions/deleteapplication.php:63
+#. TRANS: Client error displayed trying to delete an application while not logged in.
+#: actions/deleteapplication.php:62
 msgid "You must be logged in to delete an application."
 msgstr "Bir uygulamayı silmek için giriş yapmış olmanız gerekir."
 
+#. TRANS: Client error displayed trying to delete an application that does not exist.
 #: actions/deleteapplication.php:71
 msgid "Application not found."
 msgstr "Onay kodu bulunamadı."
 
+#. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
-#: actions/deleteapplication.php:78 actions/editapplication.php:78
+#: actions/deleteapplication.php:79 actions/editapplication.php:78
 #: actions/showapplication.php:94
 msgid "You are not the owner of this application."
 msgstr "Bu uygulamanın sahibi değilsiniz."
@@ -1414,15 +1431,18 @@ msgstr "Bu uygulamanın sahibi değilsiniz."
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
 #: actions/newapplication.php:114 actions/showapplication.php:118
-#: lib/action.php:1354
+#: lib/action.php:1404
 msgid "There was a problem with your session token."
 msgstr ""
 
-#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+#. TRANS: Title for delete application page.
+#. TRANS: Fieldset legend on delete application page.
+#: actions/deleteapplication.php:124 actions/deleteapplication.php:149
 msgid "Delete application"
 msgstr "Uygulamayı sil"
 
-#: actions/deleteapplication.php:149
+#. TRANS: Confirmation text on delete application page.
+#: actions/deleteapplication.php:152
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
 "about the application from the database, including all existing user "
@@ -1433,12 +1453,12 @@ msgstr ""
 "temizleyecektir."
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:158
+#: actions/deleteapplication.php:161
 msgid "Do not delete this application"
 msgstr "Bu uygulamayı silme"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:164
+#: actions/deleteapplication.php:167
 msgid "Delete this application"
 msgstr "Bu uygulamayı sil"
 
@@ -1475,13 +1495,14 @@ msgstr "Grup güncellenemedi."
 msgid "Deleted group %s"
 msgstr "%1$s'in %2$s'deki durum mesajları "
 
-#. TRANS: Title.
+#. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
 #: actions/deletegroup.php:176 actions/deletegroup.php:202
 #, fuzzy
 msgid "Delete group"
 msgstr "Kullanıcıyı sil"
 
+#. TRANS: Warning in form for deleleting a group.
 #: actions/deletegroup.php:206
 #, fuzzy
 msgid ""
@@ -1504,10 +1525,11 @@ msgstr "Bu durum mesajını silme"
 msgid "Delete this group"
 msgstr "Bu kullanıcıyı sil"
 
+#. TRANS: Error message displayed trying to delete a notice while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1517,11 +1539,13 @@ msgstr "Bu kullanıcıyı sil"
 msgid "Not logged in."
 msgstr "Giriş yapılmadı."
 
-#: actions/deletenotice.php:74
+#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
+#: actions/deletenotice.php:78
 msgid "Can't delete this notice."
 msgstr "Bu durum mesajı silinemiyor."
 
-#: actions/deletenotice.php:106
+#. TRANS: Instructions for deleting a notice.
+#: actions/deletenotice.php:110
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
@@ -1529,21 +1553,24 @@ msgstr ""
 "Bir durum mesajını kalıcı olarak silmek üzeresiniz. Bu bir kez yapıldığında, "
 "geri alınamaz."
 
-#: actions/deletenotice.php:112 actions/deletenotice.php:144
+#. TRANS: Page title when deleting a notice.
+#. TRANS: Fieldset legend for the delete notice form.
+#: actions/deletenotice.php:117 actions/deletenotice.php:148
 msgid "Delete notice"
 msgstr "Durum mesajını sil"
 
-#: actions/deletenotice.php:147
+#. TRANS: Message for the delete notice form.
+#: actions/deletenotice.php:152
 msgid "Are you sure you want to delete this notice?"
 msgstr "Bu durum mesajını silmek istediğinizden emin misiniz?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:154
+#: actions/deletenotice.php:159
 msgid "Do not delete this notice"
 msgstr "Bu durum mesajını silme"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:161 lib/noticelist.php:667
+#: actions/deletenotice.php:166 lib/noticelist.php:667
 msgid "Delete this notice"
 msgstr "Bu durum mesajını sil"
 
@@ -1707,11 +1734,9 @@ msgstr "Öntanımlıya geri dön"
 
 #. TRANS: Submit button title.
 #: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
-#: actions/othersettings.php:126 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: actions/useradminpanel.php:295 lib/applicationeditform.php:357
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: lib/applicationeditform.php:357 lib/designsettings.php:256
 msgid "Save"
 msgstr "Kaydet"
 
@@ -1759,9 +1784,9 @@ msgid "Name is required."
 msgstr "İsim gereklidir."
 
 #. TRANS: Validation error shown when providing too long a name in the "Edit application" form.
-#: actions/editapplication.php:188
+#: actions/editapplication.php:188 actions/newapplication.php:169
 #, fuzzy
-msgid "Name is too long (max 255 characters)."
+msgid "Name is too long (maximum 255 characters)."
 msgstr "İsim çok uzun (maksimum: 255 karakter)."
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
@@ -1790,7 +1815,7 @@ msgid "Organization is required."
 msgstr "Organizasyon gereklidir."
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#: actions/editapplication.php:223
+#: actions/editapplication.php:223 actions/newapplication.php:199
 #, fuzzy
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "Organizasyon çok uzun (maksimum 255 karakter)."
@@ -2588,7 +2613,7 @@ msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Onaylanmış Jabber/Gtalk adresi."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:180
+#: actions/imsettings.php:290 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "Tercihler kaydedildi."
 
@@ -2712,12 +2737,11 @@ msgstr[0] "Bize o profili yollamadınız"
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#. TRANS: Whois output.
-#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:145 actions/invite.php:159 lib/command.php:426
-#, php-format
+#: actions/invite.php:145 actions/invite.php:159
+#, fuzzy, php-format
+msgctxt "INVITE"
 msgid "%1$s (%2$s)"
-msgstr ""
+msgstr "%1$s'in %2$s'deki durum mesajları "
 
 #. TRANS: Message displayed inviting users to use a StatusNet site while the invited user
 #. TRANS: already uses a this StatusNet site. Plural form is based on the number of
@@ -2865,7 +2889,8 @@ msgid ""
 msgstr ""
 
 #: actions/licenseadminpanel.php:156
-msgid "Invalid license title. Max length is 255 characters."
+#, fuzzy
+msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "Geçersiz lisans başlığı. En fazla uzunluk 255 karakterdir."
 
 #: actions/licenseadminpanel.php:168
@@ -3043,20 +3068,10 @@ msgstr ""
 msgid "Use this form to register a new application."
 msgstr ""
 
-#: actions/newapplication.php:169
-#, fuzzy
-msgid "Name is too long (maximum 255 chars)."
-msgstr "İsim çok uzun (maksimum: 255 karakter)."
-
 #: actions/newapplication.php:184
 msgid "Source URL is required."
 msgstr ""
 
-#: actions/newapplication.php:199
-#, fuzzy
-msgid "Organization is too long (maximum 255 chars)."
-msgstr "Organizasyon çok uzun (maksimum 255 karakter)."
-
 #: actions/newapplication.php:266 actions/newapplication.php:275
 msgid "Could not create application."
 msgstr "Eposta onayı silinemedi."
@@ -3076,7 +3091,7 @@ msgid "New message"
 msgstr "Yeni mesaj"
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:499
+#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501
 #, fuzzy
 msgid "You can't send a message to this user."
 msgstr "Bize o profili yollamadınız"
@@ -3084,7 +3099,7 @@ msgstr "Bize o profili yollamadınız"
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
 #: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
-#: lib/command.php:579
+#: lib/command.php:581
 msgid "No content!"
 msgstr "İçerik yok!"
 
@@ -3093,7 +3108,7 @@ msgid "No recipient specified."
 msgstr ""
 
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:503
+#: actions/newmessage.php:167 lib/command.php:505
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -3104,12 +3119,12 @@ msgstr ""
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:511
+#: actions/newmessage.php:188 lib/command.php:513
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "%s kullanıcısına özel mesaj gönderildi."
 
-#: actions/newmessage.php:213 actions/newnotice.php:263
+#: actions/newmessage.php:213 actions/newnotice.php:264
 msgid "Ajax Error"
 msgstr "Ajax Hatası"
 
@@ -3117,18 +3132,7 @@ msgstr "Ajax Hatası"
 msgid "New notice"
 msgstr "Yeni durum mesajı"
 
-#: actions/newnotice.php:159 lib/mailhandler.php:60
-#, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr "Bu çok uzun. Maksimum durum mesajı boyutu %d karakterdir."
-
-#: actions/newnotice.php:183
-#, php-format
-msgid "Max notice size is %d chars, including attachment URL."
-msgstr ""
-"Maksimum durum mesajı boyutu, eklenti bağlantıları dahil %d karakterdir."
-
-#: actions/newnotice.php:229
+#: actions/newnotice.php:230
 msgid "Notice posted"
 msgstr "Durum mesajı gönderildi"
 
@@ -3290,37 +3294,46 @@ msgstr "Kişi Arama"
 msgid "Notice Search"
 msgstr "Durum Mesajı Arama"
 
-#: actions/othersettings.php:60
+#: actions/othersettings.php:59
 msgid "Other settings"
 msgstr "Profil ayarları"
 
+#. TRANS: Instructions for tab "Other" in user profile settings.
 #: actions/othersettings.php:71
 msgid "Manage various other options."
 msgstr ""
 
-#: actions/othersettings.php:108
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/othersettings.php:111
 msgid " (free service)"
 msgstr ""
 
-#: actions/othersettings.php:116
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/othersettings.php:120
 msgid "Shorten URLs with"
 msgstr "Bağlantıları şununla kısalt"
 
-#: actions/othersettings.php:117
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/othersettings.php:122
 msgid "Automatic shortening service to use."
 msgstr "Kullanılacak otomatik kısaltma servisi."
 
-#: actions/othersettings.php:122
+#. TRANS: Label for checkbox.
+#: actions/othersettings.php:128
 msgid "View profile designs"
 msgstr "Profil dizaynlarını görüntüle"
 
-#: actions/othersettings.php:123
+#. TRANS: Tooltip for checkbox.
+#: actions/othersettings.php:130
 msgid "Show or hide profile designs."
 msgstr ""
 
-#: actions/othersettings.php:153
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/othersettings.php:162
 #, fuzzy
-msgid "URL shortening service is too long (max 50 chars)."
+msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "Yer bilgisi çok uzun (azm: 255 karakter)."
 
 #: actions/otp.php:69
@@ -3814,7 +3827,7 @@ msgstr "Hakkında"
 #. TRANS: Label for group location (dt). Text hidden by default.
 #: actions/profilesettings.php:149 actions/register.php:485
 #: actions/showgroup.php:267 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:177
+#: actions/userauthorization.php:166 lib/groupeditform.php:180
 #: lib/userprofile.php:165
 msgid "Location"
 msgstr "Yer"
@@ -4152,7 +4165,8 @@ msgid "Unexpected password reset."
 msgstr "Beklemeğen parola sıfırlaması."
 
 #: actions/recoverpassword.php:365
-msgid "Password must be 6 chars or more."
+#, fuzzy
+msgid "Password must be 6 characters or more."
 msgstr "Parola 6 veya daha fazla karakterden oluşmalıdır."
 
 #: actions/recoverpassword.php:369
@@ -4516,7 +4530,7 @@ msgstr "Organizasyon"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:172
+#: lib/applicationeditform.php:208 lib/groupeditform.php:175
 msgid "Description"
 msgstr "Tanım"
 
@@ -4659,7 +4673,7 @@ msgid "Note"
 msgstr "Not"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:298 lib/groupeditform.php:184
+#: actions/showgroup.php:298 lib/groupeditform.php:187
 msgid "Aliases"
 msgstr "Diğerisimler"
 
@@ -4782,60 +4796,86 @@ msgstr ""
 msgid "Notice deleted."
 msgstr "Durum mesajı silindi."
 
-#: actions/showstream.php:72
-#, php-format
-msgid " tagged %s"
-msgstr ""
+#. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
+#: actions/showstream.php:70
+#, fuzzy, php-format
+msgid "%1$s tagged %2$s"
+msgstr "%s ve arkadaşları"
+
+#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#: actions/showstream.php:74
+#, fuzzy, php-format
+msgid "%1$s tagged %2$s, page %3$d"
+msgstr "%s adli kullanicinin durum mesajlari"
 
-#: actions/showstream.php:78
+#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$d is the page number.
+#: actions/showstream.php:82
 #, fuzzy, php-format
 msgid "%1$s, page %2$d"
 msgstr "%s ve arkadaşları"
 
-#: actions/showstream.php:120
+#. TRANS: Title for link to notice feed.
+#. TRANS: %1$s is a user nickname, %2$s is a hashtag.
+#: actions/showstream.php:127
 #, fuzzy, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "%s için durum RSS beslemesi"
 
-#: actions/showstream.php:127
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:136
 #, fuzzy, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "%s için durum RSS beslemesi"
 
-#: actions/showstream.php:134
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:145
 #, fuzzy, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "%s için durum RSS beslemesi"
 
-#: actions/showstream.php:141
+#: actions/showstream.php:152
 #, fuzzy, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "%s için durum RSS beslemesi"
 
-#: actions/showstream.php:146
+#. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
+#. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
+#: actions/showstream.php:159
 #, php-format
 msgid "FOAF for %s"
 msgstr ""
 
-#: actions/showstream.php:197
-#, php-format
-msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
+#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
+#: actions/showstream.php:211
+#, fuzzy, php-format
+msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr ""
+"Bu, %s ve arkadaşlarının zaman çizelgesi ama henüz hiç kimse bir şey "
+"göndermemiş."
 
-#: actions/showstream.php:202
+#. TRANS: Second sentence of empty list message for a stream for the user themselves.
+#: actions/showstream.php:217
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
 msgstr ""
 
-#: actions/showstream.php:204
+#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:221
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
 "%?status_textarea=%2$s)."
 msgstr ""
 
-#: actions/showstream.php:243
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:264
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4844,7 +4884,9 @@ msgid ""
 "follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
 
-#: actions/showstream.php:248
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:271
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4852,7 +4894,8 @@ msgid ""
 "[StatusNet](http://status.net/) tool. "
 msgstr ""
 
-#: actions/showstream.php:305
+#. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
+#: actions/showstream.php:328
 #, fuzzy, php-format
 msgid "Repeat of %s"
 msgstr "%s için cevaplar"
@@ -4965,33 +5008,41 @@ msgstr ""
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:56
+#. TRANS: Page title for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:55
 msgid "Site Notice"
 msgstr "Durum mesajları"
 
-#: actions/sitenoticeadminpanel.php:67
+#. TRANS: Instructions for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:66
 msgid "Edit site-wide message"
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:103
+#. TRANS: Server error displayed when saving a site-wide notice was impossible.
+#: actions/sitenoticeadminpanel.php:101
 #, fuzzy
 msgid "Unable to save site notice."
 msgstr "Durum mesajını kaydederken hata oluştu."
 
-#: actions/sitenoticeadminpanel.php:113
-msgid "Max length for the site-wide notice is 255 chars."
-msgstr ""
+#. TRANS: Client error displayed when a site-wide notice was longer than allowed.
+#: actions/sitenoticeadminpanel.php:112
+#, fuzzy
+msgid "Maximum length for the site-wide notice is 255 characters."
+msgstr "Geçersiz lisans başlığı. En fazla uzunluk 255 karakterdir."
 
+#. TRANS: Label for site-wide notice text field in admin panel.
 #: actions/sitenoticeadminpanel.php:176
 #, fuzzy
 msgid "Site notice text"
 msgstr "Yeni durum mesajı"
 
-#: actions/sitenoticeadminpanel.php:178
-msgid "Site-wide notice text (255 chars max; HTML okay)"
+#. TRANS: Tooltip for site-wide notice text field in admin panel.
+#: actions/sitenoticeadminpanel.php:179
+msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:198
+#. TRANS: Title for button to save site notice in admin panel.
+#: actions/sitenoticeadminpanel.php:201
 #, fuzzy
 msgid "Save site notice"
 msgstr "Yeni durum mesajı"
@@ -5462,78 +5513,96 @@ msgid ""
 msgstr ""
 
 #. TRANS: User admin panel title
-#: actions/useradminpanel.php:60
+#: actions/useradminpanel.php:58
 msgctxt "TITLE"
 msgid "User"
 msgstr ""
 
-#: actions/useradminpanel.php:71
+#. TRANS: Instruction for user admin panel.
+#: actions/useradminpanel.php:69
 msgid "User settings for this StatusNet site"
 msgstr ""
 
-#: actions/useradminpanel.php:150
+#. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
+#: actions/useradminpanel.php:147
 msgid "Invalid bio limit. Must be numeric."
 msgstr ""
 
-#: actions/useradminpanel.php:156
-msgid "Invalid welcome text. Max length is 255 characters."
-msgstr ""
+#. TRANS: Form validation error in user admin panel when welcome text is too long.
+#: actions/useradminpanel.php:154
+#, fuzzy
+msgid "Invalid welcome text. Maximum length is 255 characters."
+msgstr "Geçersiz lisans başlığı. En fazla uzunluk 255 karakterdir."
 
+#. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
+#. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
 #, php-format
-msgid "Invalid default subscripton: '%1$s' is not user."
+msgid "Invalid default subscripton: '%1$s' is not a user."
 msgstr ""
 
 #. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:106
+#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
 #: lib/personalgroupnav.php:109
 msgid "Profile"
 msgstr "Profil"
 
-#: actions/useradminpanel.php:223
+#. TRANS: Field label in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:220
 msgid "Bio Limit"
 msgstr ""
 
-#: actions/useradminpanel.php:224
+#. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:222
 msgid "Maximum length of a profile bio in characters."
 msgstr ""
 
-#: actions/useradminpanel.php:232
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:231
 msgid "New users"
 msgstr "Yeni kullanıcılar"
 
+#. TRANS: Field label in user admin panel for setting new user welcome text.
 #: actions/useradminpanel.php:236
 msgid "New user welcome"
 msgstr "Yeni kullanıcı karşılaması"
 
-#: actions/useradminpanel.php:237
-msgid "Welcome text for new users (Max 255 chars)."
+#. TRANS: Tooltip in user admin panel for setting new user welcome text.
+#: actions/useradminpanel.php:238
+#, fuzzy
+msgid "Welcome text for new users (maximum 255 characters)."
 msgstr "Yeni kullanıcılar için hoşgeldiniz metni (En fazla 255 karakter)."
 
-#: actions/useradminpanel.php:242
+#. TRANS: Field label in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:244
 #, fuzzy
 msgid "Default subscription"
 msgstr "Bütün abonelikler"
 
-#: actions/useradminpanel.php:243
+#. TRANS: Tooltip in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:246
 #, fuzzy
 msgid "Automatically subscribe new users to this user."
 msgstr "Takip talebine izin verildi"
 
-#: actions/useradminpanel.php:252
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:256
 #, fuzzy
 msgid "Invitations"
 msgstr "Yer"
 
-#: actions/useradminpanel.php:257
+#. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:262
 msgid "Invitations enabled"
 msgstr ""
 
-#: actions/useradminpanel.php:259
+#. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:265
 msgid "Whether to allow users to invite new users."
 msgstr ""
 
-#: actions/useradminpanel.php:295
+#. TRANS: Title for button to save user settings in user admin panel.
+#: actions/useradminpanel.php:302
 msgid "Save user settings"
 msgstr ""
 
@@ -5726,7 +5795,7 @@ msgid "Plugins"
 msgstr "Eklentiler"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:831
+#: actions/version.php:198 lib/action.php:880
 msgid "Version"
 msgstr "Sürüm"
 
@@ -5937,16 +6006,23 @@ msgstr "Profil kaydedilemedi."
 msgid "RT @%1$s %2$s"
 msgstr ""
 
+#. TRANS: Full name of a profile or group followed by nickname in parens
+#: classes/Profile.php:164
+#, fuzzy, php-format
+msgctxt "FANCYNAME"
+msgid "%1$s (%2$s)"
+msgstr "%1$s'in %2$s'deki durum mesajları "
+
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:791
+#: classes/Profile.php:812
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:800
+#: classes/Profile.php:821
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6093,60 +6169,66 @@ msgstr "%1$s'in %2$s'deki durum mesajları "
 msgid "Untitled page"
 msgstr "Başlıksız sayfa"
 
+#. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
+#: lib/action.php:310
+msgctxt "TOOLTIP"
+msgid "Show more"
+msgstr ""
+
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:477
+#: lib/action.php:526
 msgid "Primary site navigation"
 msgstr ""
 
 #. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:483
+#: lib/action.php:532
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "Kişisel profil ve arkadaşların zaman çizelgesi"
 
 #. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:486
+#: lib/action.php:535
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Kişisel"
 
 #. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:488
+#: lib/action.php:537
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
 msgstr "E-postanızı, kullanıcı resminizi, parolanızı, profilinizi değiştirin"
 
 #. TRANS: Main menu option when logged in for access to user settings
-#: lib/action.php:491
+#: lib/action.php:540
 msgid "Account"
 msgstr "Hesap"
 
 #. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:493
+#: lib/action.php:542
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "Servislere bağlan"
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:496
+#: lib/action.php:545
 msgid "Connect"
 msgstr "Bağlan"
 
 #. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:499
+#: lib/action.php:548
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "Site yapılandırmasını değiştir"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:502 lib/groupnav.php:117
+#: lib/action.php:551 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Yönetim"
 
 #. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:506
+#: lib/action.php:555
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
@@ -6155,138 +6237,139 @@ msgstr ""
 "edin"
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:509
+#: lib/action.php:558
 msgctxt "MENU"
 msgid "Invite"
 msgstr "Davet et"
 
 #. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:515
+#: lib/action.php:564
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr ""
 
 #. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:518
+#: lib/action.php:567
 #, fuzzy
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Çıkış"
 
 #. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:523
+#: lib/action.php:572
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "Bir hesap oluştur"
 
 #. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:526
+#: lib/action.php:575
 msgctxt "MENU"
 msgid "Register"
 msgstr "Kayıt"
 
 #. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:529
+#: lib/action.php:578
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "Siteye giriş"
 
 #. TRANS: Main menu option when not logged in to log in
-#: lib/action.php:532
+#: lib/action.php:581
 msgctxt "MENU"
 msgid "Login"
 msgstr "Giriş"
 
 #. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:535
+#: lib/action.php:584
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Bana yardım et!"
 
 #. TRANS: Main menu option for help on the StatusNet site
-#: lib/action.php:538
+#: lib/action.php:587
 msgctxt "MENU"
 msgid "Help"
 msgstr "Yardım"
 
 #. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:541
+#: lib/action.php:590
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr "Kişi ya da yazılar için arama yap"
 
 #. TRANS: Main menu option when logged in or when the StatusNet instance is not private
-#: lib/action.php:544
+#: lib/action.php:593
 msgctxt "MENU"
 msgid "Search"
 msgstr "Ara"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:566 lib/adminpanelaction.php:387
+#: lib/action.php:615 lib/adminpanelaction.php:387
 #, fuzzy
 msgid "Site notice"
 msgstr "Yeni durum mesajı"
 
 #. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:633
+#: lib/action.php:682
 msgid "Local views"
 msgstr ""
 
 #. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:703
+#: lib/action.php:752
 #, fuzzy
 msgid "Page notice"
 msgstr "Yeni durum mesajı"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:804
+#: lib/action.php:853
 #, fuzzy
 msgid "Secondary site navigation"
 msgstr "Abonelikler"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:810
+#: lib/action.php:859
 msgid "Help"
 msgstr "Yardım"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:813
+#: lib/action.php:862
 msgid "About"
 msgstr "Hakkında"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:816
+#: lib/action.php:865
 msgid "FAQ"
 msgstr "SSS"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:821
+#: lib/action.php:870
 msgid "TOS"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:825
+#: lib/action.php:874
 msgid "Privacy"
 msgstr "Gizlilik"
 
-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:828
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+#: lib/action.php:877
 msgid "Source"
 msgstr "Kaynak"
 
-#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:834
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+#: lib/action.php:884
 msgid "Contact"
 msgstr "İletişim"
 
-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:837
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+#: lib/action.php:887
 msgid "Badge"
 msgstr ""
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:866
+#: lib/action.php:916
 msgid "StatusNet software license"
 msgstr "StatusNet yazılım lisansı"
 
@@ -6294,7 +6377,7 @@ msgstr "StatusNet yazılım lisansı"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:873
+#: lib/action.php:923
 #, fuzzy, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -6304,7 +6387,7 @@ msgstr ""
 "hazırlanan anında mesajlaşma ağıdır. "
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:876
+#: lib/action.php:926
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** bir aninda mesajlaşma sosyal ağıdır."
@@ -6313,7 +6396,7 @@ msgstr "**%%site.name%%** bir aninda mesajlaşma sosyal ağıdır."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:883
+#: lib/action.php:933
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -6325,50 +6408,50 @@ msgstr ""
 "microbloglama yazılımının %s. versiyonunu kullanmaktadır."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:899
+#: lib/action.php:949
 msgid "Site content license"
 msgstr "Site içeriği lisansı"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:906
+#: lib/action.php:956
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:913
+#: lib/action.php:963
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:917
+#: lib/action.php:967
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:949
+#: lib/action.php:999
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1285
+#: lib/action.php:1335
 msgid "Pagination"
 msgstr ""
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1296
+#: lib/action.php:1346
 msgid "After"
 msgstr "Sonra"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1306
+#: lib/action.php:1356
 msgid "Before"
 msgstr "Önce"
 
@@ -6717,7 +6800,7 @@ msgid "AJAX error"
 msgstr ""
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:233 lib/mailhandler.php:142
+#: lib/channel.php:233 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr ""
 
@@ -6733,7 +6816,7 @@ msgstr ""
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:626
+#: lib/command.php:99 lib/command.php:630
 #, fuzzy
 msgid "User has no last notice."
 msgstr "Kullanıcının profili yok."
@@ -6800,6 +6883,14 @@ msgstr ""
 msgid "%1$s left group %2$s."
 msgstr ""
 
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: lib/command.php:426
+#, fuzzy, php-format
+msgctxt "WHOIS"
+msgid "%1$s (%2$s)"
+msgstr "%1$s'in %2$s'deki durum mesajları "
+
 #. TRANS: Whois output. %s is the full name of the queried user.
 #: lib/command.php:430
 #, php-format
@@ -6837,131 +6928,133 @@ msgid ""
 "same server."
 msgstr ""
 
-#. TRANS: Message given if content is too long.
+#. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
 #: lib/command.php:488
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] "Bu çok uzun. Maksimum durum mesajı boyutu %d karakterdir."
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:514
+#: lib/command.php:516
 #, fuzzy
 msgid "Error sending direct message."
 msgstr "Kullanıcı ayarlamada hata oluştu."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:551
+#: lib/command.php:553
 #, fuzzy, php-format
 msgid "Notice from %s repeated."
 msgstr "Durum mesajları"
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:554
+#: lib/command.php:556
 msgid "Error repeating notice."
 msgstr "Kullanıcı ayarlamada hata oluştu."
 
-#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:589
-#, php-format
-msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
+#: lib/command.php:591
+#, fuzzy, php-format
+msgid "Notice too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] "Bu çok uzun. Maksimum durum mesajı boyutu %d karakterdir."
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:600
+#: lib/command.php:604
 #, fuzzy, php-format
 msgid "Reply to %s sent."
 msgstr "%s için cevaplar"
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:603
+#: lib/command.php:607
 #, fuzzy
 msgid "Error saving notice."
 msgstr "Durum mesajını kaydederken hata oluştu."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:650
+#: lib/command.php:654
 msgid "Specify the name of the user to subscribe to."
 msgstr ""
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:659
+#: lib/command.php:663
 #, fuzzy
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Bize o profili yollamadınız"
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:667
+#: lib/command.php:671
 #, php-format
 msgid "Subscribed to %s."
 msgstr ""
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:688 lib/command.php:799
+#: lib/command.php:692 lib/command.php:803
 msgid "Specify the name of the user to unsubscribe from."
 msgstr ""
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:699
+#: lib/command.php:703
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:719 lib/command.php:745
+#: lib/command.php:723 lib/command.php:749
 msgid "Command not yet implemented."
 msgstr ""
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:723
+#: lib/command.php:727
 #, fuzzy
 msgid "Notification off."
 msgstr "Onay kodu yok."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:726
+#: lib/command.php:730
 msgid "Can't turn off notification."
 msgstr ""
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:749
+#: lib/command.php:753
 #, fuzzy
 msgid "Notification on."
 msgstr "Onay kodu yok."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:752
+#: lib/command.php:756
 msgid "Can't turn on notification."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:766
+#: lib/command.php:770
 msgid "Login command is disabled."
 msgstr ""
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:779
+#: lib/command.php:783
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:808
+#: lib/command.php:812
 #, php-format
 msgid "Unsubscribed %s."
 msgstr ""
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:826
+#: lib/command.php:830
 #, fuzzy
 msgid "You are not subscribed to anyone."
 msgstr "Bize o profili yollamadınız"
@@ -6969,14 +7062,14 @@ msgstr "Bize o profili yollamadınız"
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:831
+#: lib/command.php:835
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Bize o profili yollamadınız"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:853
+#: lib/command.php:857
 #, fuzzy
 msgid "No one is subscribed to you."
 msgstr "Uzaktan abonelik"
@@ -6984,14 +7077,14 @@ msgstr "Uzaktan abonelik"
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:858
+#: lib/command.php:862
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Uzaktan abonelik"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:880
+#: lib/command.php:884
 #, fuzzy
 msgid "You are not a member of any groups."
 msgstr "Bize o profili yollamadınız"
@@ -6999,13 +7092,13 @@ msgstr "Bize o profili yollamadınız"
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:885
+#: lib/command.php:889
 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"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:900
+#: lib/command.php:904
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -7200,7 +7293,7 @@ msgstr ""
 
 #: lib/groupeditform.php:163
 #, fuzzy
-msgid "URL of the homepage or blog of the group or topic"
+msgid "URL of the homepage or blog of the group or topic."
 msgstr ""
 "Web Sitenizin, blogunuzun ya da varsa başka bir sitedeki profilinizin adresi"
 
@@ -7211,19 +7304,25 @@ msgstr "Kendinizi ve ilgi alanlarınızı 140 karakter ile anlatın"
 
 #: lib/groupeditform.php:170
 #, fuzzy, php-format
-msgid "Describe the group or topic in %d characters"
-msgstr "Kendinizi ve ilgi alanlarınızı 140 karakter ile anlatın"
+msgid "Describe the group or topic in %d character or less"
+msgid_plural "Describe the group or topic in %d characters or less"
+msgstr[0] "Kendinizi ve ilgi alanlarınızı 140 karakter ile anlatın"
 
-#: lib/groupeditform.php:179
+#: lib/groupeditform.php:182
 #, fuzzy
 msgid ""
-"Location for the group, if any, like \"City, State (or Region), Country\""
+"Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr "Bulunduğunuz yer, \"Şehir, Eyalet (veya Bölge), Ülke\" gibi"
 
-#: lib/groupeditform.php:187
+#: lib/groupeditform.php:190
 #, php-format
-msgid "Extra nicknames for the group, comma- or space- separated, max %d"
-msgstr ""
+msgid ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"alias allowed."
+msgid_plural ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"aliases allowed."
+msgstr[0] ""
 
 #. TRANS: Menu item in the group navigation page.
 #: lib/groupnav.php:86
@@ -7687,7 +7786,7 @@ msgstr "Yanlış IM adresi."
 msgid "Sorry, no incoming email allowed."
 msgstr ""
 
-#: lib/mailhandler.php:228
+#: lib/mailhandler.php:229
 #, fuzzy, php-format
 msgid "Unsupported message type: %s"
 msgstr "Desteklenmeyen görüntü dosyası biçemi."
@@ -8043,17 +8142,18 @@ msgid "Sandbox this user"
 msgstr "Böyle bir kullanıcı yok."
 
 #. TRANS: Fieldset legend for the search form.
-#: lib/searchaction.php:121
+#: lib/searchaction.php:120
 #, fuzzy
 msgid "Search site"
 msgstr "Ara"
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
-#: lib/searchaction.php:129
+#: lib/searchaction.php:128
 msgid "Keyword(s)"
 msgstr ""
 
+#. TRANS: Button text for searching site.
 #: lib/searchaction.php:130
 msgctxt "BUTTON"
 msgid "Search"
@@ -8147,8 +8247,8 @@ msgid "The theme file is missing or the upload failed."
 msgstr ""
 
 #: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:278 lib/themeuploader.php:282
-#: lib/themeuploader.php:290 lib/themeuploader.php:297
+#: lib/themeuploader.php:279 lib/themeuploader.php:283
+#: lib/themeuploader.php:291 lib/themeuploader.php:298
 #, fuzzy
 msgid "Failed saving theme."
 msgstr "Avatar güncellemede hata."
@@ -8159,29 +8259,31 @@ msgstr ""
 
 #: lib/themeuploader.php:166
 #, php-format
-msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
-msgstr ""
+msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
+msgid_plural ""
+"Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr[0] ""
 
-#: lib/themeuploader.php:178
+#: lib/themeuploader.php:179
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr ""
 
-#: lib/themeuploader.php:218
+#: lib/themeuploader.php:219
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
 msgstr ""
 
-#: lib/themeuploader.php:224
+#: lib/themeuploader.php:225
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr ""
 
-#: lib/themeuploader.php:241
+#: lib/themeuploader.php:242
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr ""
 
-#: lib/themeuploader.php:259
+#: lib/themeuploader.php:260
 #, fuzzy
 msgid "Error opening theme archive."
 msgstr "Uzaktaki profili güncellemede hata oluştu"
@@ -8364,23 +8466,36 @@ msgid "Message too long. Maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
 msgstr[0] "Bu çok uzun. Maksimum durum mesajı boyutu %d karakterdir."
 
-#: scripts/restoreuser.php:82
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: scripts/restoreuser.php:61
 #, php-format
-msgid "Backup file for user %s (%s)"
+msgid "Getting backup from file '%s'."
 msgstr ""
 
-#: scripts/restoreuser.php:88
+#. TRANS: Commandline script output.
+#: scripts/restoreuser.php:91
 #, fuzzy
 msgid "No user specified; using backup user."
 msgstr "Yeni durum mesajı"
 
-#: scripts/restoreuser.php:94
+#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
+#: scripts/restoreuser.php:98
 #, php-format
-msgid "%d entries in backup."
-msgstr ""
+msgid "%d entry in backup."
+msgid_plural "%d entries in backup."
+msgstr[0] ""
+
+#, fuzzy
+#~ msgid "Name is too long (maximum 255 chars)."
+#~ msgstr "İsim çok uzun (maksimum: 255 karakter)."
+
+#, fuzzy
+#~ msgid "Organization is too long (maximum 255 chars)."
+#~ msgstr "Organizasyon çok uzun (maksimum 255 karakter)."
 
-#~ msgid "Description is too long (max %d chars)."
-#~ msgstr "Yer bilgisi çok uzun (azm: %d karakter)."
+#~ msgid "That's too long. Max notice size is %d chars."
+#~ msgstr "Bu çok uzun. Maksimum durum mesajı boyutu %d karakterdir."
 
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "Çok fazla diğerisim! En fazla %d."
+#~ msgid "Max notice size is %d chars, including attachment URL."
+#~ msgstr ""
+#~ "Maksimum durum mesajı boyutu, eklenti bağlantıları dahil %d karakterdir."
diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po
index 4bd646cf3..370d97736 100644
--- a/locale/uk/LC_MESSAGES/statusnet.po
+++ b/locale/uk/LC_MESSAGES/statusnet.po
@@ -12,18 +12,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-30 23:18+0000\n"
-"PO-Revision-Date: 2010-10-30 23:20:50+0000\n"
+"POT-Creation-Date: 2010-11-02 22:51+0000\n"
+"PO-Revision-Date: 2010-11-02 22:53:47+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r75708); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r75875); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
-"X-POT-Import-Date: 2010-10-30 09:48:40+0000\n"
+"X-POT-Import-Date: 2010-10-30 23:42:01+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -82,15 +82,20 @@ msgstr "Зберегти параметри доступу"
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
+#. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
+#. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #: actions/accessadminpanel.php:193 actions/emailsettings.php:228
-#: actions/imsettings.php:187 actions/pathsadminpanel.php:512
-#: actions/profilesettings.php:201 actions/smssettings.php:209
-#: actions/subscriptions.php:246 lib/applicationeditform.php:355
+#: actions/imsettings.php:187 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: lib/applicationeditform.php:355 lib/groupeditform.php:207
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Зберегти"
@@ -141,7 +146,7 @@ msgstr "Немає такої сторінки."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:495 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Такого користувача немає."
@@ -212,7 +217,9 @@ msgstr ""
 
 #. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:208
+#. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -572,8 +579,11 @@ msgstr "Повне ім’я надто довге (не більше 255 сим
 #. TRANS: Group edit form validation error.
 #. TRANS: Form validation error in New application form.
 #. TRANS: %d is the maximum number of characters for the description.
+#. TRANS: Group create form validation error.
+#. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:220 actions/editapplication.php:201
 #: actions/editgroup.php:216 actions/newapplication.php:178
+#: actions/newgroup.php:152
 #, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -731,14 +741,14 @@ msgstr "Токен запиту вже авторизовано."
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:172 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:74
 #: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
 #: actions/groupunblock.php:65 actions/imsettings.php:230
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
-#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/othersettings.php:153 actions/passwordsettings.php:138
 #: actions/profilesettings.php:221 actions/recoverpassword.php:350
 #: actions/register.php:172 actions/remotesubscribe.php:77
 #: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
@@ -918,20 +928,21 @@ msgstr "Ви не можете видалити статус іншого кор
 
 #. TRANS: Client error displayed trying to repeat a non-existing notice through the API.
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
+#. TRANS: Error message displayed trying to delete a non-existing notice.
 #: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/deletenotice.php:58 actions/shownotice.php:92
+#: actions/deletenotice.php:61 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "Такого допису немає."
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:535
+#: actions/apistatusesretweet.php:83 lib/command.php:537
 msgid "Cannot repeat your own notice."
 msgstr "Не можна повторювати власні дописи."
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:541
+#: actions/apistatusesretweet.php:92 lib/command.php:543
 msgid "Already repeated that notice."
 msgstr "Цей допис вже повторено."
 
@@ -952,7 +963,8 @@ msgstr "Клієнт мусить надати параметр «статус»
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#: actions/apistatusesupdate.php:244
+#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
+#: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
@@ -967,7 +979,7 @@ msgstr "Початковий допис не знайдено."
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
-#: actions/apistatusesupdate.php:308
+#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
 #, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
@@ -1149,21 +1161,18 @@ msgstr "Перегляд"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
 #: actions/avatarsettings.php:155
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "Видалити"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
 #: actions/avatarsettings.php:173
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Завантажити"
 
 #. TRANS: Button on avatar upload crop form to confirm a selected crop as avatar.
 #: actions/avatarsettings.php:243
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Crop"
 msgstr "Втяти"
@@ -1183,17 +1192,18 @@ msgstr "Оберіть квадратну ділянку зображення, �
 msgid "Lost our file data."
 msgstr "Дані вашого файлу загублено."
 
-#: actions/avatarsettings.php:384
+#. TRANS: Success message for having updated a user avatar.
+#: actions/avatarsettings.php:385
 msgid "Avatar updated."
 msgstr "Аватару оновлено."
 
 #. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
-#: actions/avatarsettings.php:388
+#: actions/avatarsettings.php:389
 msgid "Failed updating avatar."
 msgstr "Оновлення аватари невдале."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:412
+#: actions/avatarsettings.php:413
 msgid "Avatar deleted."
 msgstr "Аватару видалено."
 
@@ -1225,8 +1235,8 @@ msgstr ""
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:154 actions/deleteapplication.php:154
-#: actions/deletegroup.php:220 actions/deletenotice.php:150
+#: actions/block.php:154 actions/deleteapplication.php:157
+#: actions/deletegroup.php:220 actions/deletenotice.php:155
 #: actions/deleteuser.php:152 actions/groupblock.php:178
 msgctxt "BUTTON"
 msgid "No"
@@ -1244,8 +1254,8 @@ msgstr "Не блокувати цього користувача"
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:161 actions/deleteapplication.php:161
-#: actions/deletegroup.php:227 actions/deletenotice.php:157
+#: actions/block.php:161 actions/deleteapplication.php:164
+#: actions/deletegroup.php:227 actions/deletenotice.php:162
 #: actions/deleteuser.php:159 actions/groupblock.php:185
 msgctxt "BUTTON"
 msgid "Yes"
@@ -1313,7 +1323,6 @@ msgstr "Розблокувати користувача"
 
 #. TRANS: Button text for unblocking a user from a group.
 #: actions/blockedfromgroup.php:323
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Unblock"
 msgstr "Розблокувати"
@@ -1362,12 +1371,13 @@ msgstr "Цю адресу вже підтверджено."
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
 #. TRANS: Server error thrown on database error updating IM preferences.
 #. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
 #. TRANS: Server error thrown when user profile settings could not be updated.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #: actions/confirmaddress.php:118 actions/emailsettings.php:331
 #: actions/emailsettings.php:477 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:174
+#: actions/imsettings.php:442 actions/othersettings.php:184
 #: actions/profilesettings.php:326 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
@@ -1376,9 +1386,8 @@ msgstr "Не вдалося оновити користувача."
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
 #: actions/confirmaddress.php:132
-#, fuzzy
 msgid "Could not delete address confirmation."
-msgstr "Не вдалося видалити підтвердження ІМ."
+msgstr "Не вдалося видалити адресу підтвердження."
 
 #. TRANS: Title for the contact address confirmation action.
 #: actions/confirmaddress.php:150
@@ -1403,16 +1412,19 @@ msgstr "Розмова"
 msgid "Notices"
 msgstr "Дописи"
 
-#: actions/deleteapplication.php:63
+#. TRANS: Client error displayed trying to delete an application while not logged in.
+#: actions/deleteapplication.php:62
 msgid "You must be logged in to delete an application."
 msgstr "Ви маєте спочатку увійти, аби мати змогу видалити додаток."
 
+#. TRANS: Client error displayed trying to delete an application that does not exist.
 #: actions/deleteapplication.php:71
 msgid "Application not found."
 msgstr "Додаток не виявлено."
 
+#. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
-#: actions/deleteapplication.php:78 actions/editapplication.php:78
+#: actions/deleteapplication.php:79 actions/editapplication.php:78
 #: actions/showapplication.php:94
 msgid "You are not the owner of this application."
 msgstr "Ви не є власником цього додатку."
@@ -1420,15 +1432,18 @@ msgstr "Ви не є власником цього додатку."
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
 #: actions/newapplication.php:114 actions/showapplication.php:118
-#: lib/action.php:1354
+#: lib/action.php:1404
 msgid "There was a problem with your session token."
 msgstr "Виникли певні проблеми з токеном поточної сесії."
 
-#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+#. TRANS: Title for delete application page.
+#. TRANS: Fieldset legend on delete application page.
+#: actions/deleteapplication.php:124 actions/deleteapplication.php:149
 msgid "Delete application"
 msgstr "Видалити додаток"
 
-#: actions/deleteapplication.php:149
+#. TRANS: Confirmation text on delete application page.
+#: actions/deleteapplication.php:152
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
 "about the application from the database, including all existing user "
@@ -1439,12 +1454,12 @@ msgstr ""
 "додатку користувачів."
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:158
+#: actions/deleteapplication.php:161
 msgid "Do not delete this application"
 msgstr "Не видаляти додаток"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:164
+#: actions/deleteapplication.php:167
 msgid "Delete this application"
 msgstr "Видалити додаток"
 
@@ -1478,12 +1493,13 @@ msgstr "Не вдалося видалити спільноту %s."
 msgid "Deleted group %s"
 msgstr "Спільноту %s видалено"
 
-#. TRANS: Title.
+#. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
 #: actions/deletegroup.php:176 actions/deletegroup.php:202
 msgid "Delete group"
 msgstr "Видалити спільноту"
 
+#. TRANS: Warning in form for deleleting a group.
 #: actions/deletegroup.php:206
 msgid ""
 "Are you sure you want to delete this group? This will clear all data about "
@@ -1504,10 +1520,11 @@ msgstr "Не видаляти цю спільноту"
 msgid "Delete this group"
 msgstr "Видалити спільноту"
 
+#. TRANS: Error message displayed trying to delete a notice while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1517,31 +1534,36 @@ msgstr "Видалити спільноту"
 msgid "Not logged in."
 msgstr "Не увійшли."
 
-#: actions/deletenotice.php:74
+#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
+#: actions/deletenotice.php:78
 msgid "Can't delete this notice."
 msgstr "Не можна видалити цей допис."
 
-#: actions/deletenotice.php:106
+#. TRANS: Instructions for deleting a notice.
+#: actions/deletenotice.php:110
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
 msgstr "Ви видаляєте допис назавжди. Ця дія є незворотною."
 
-#: actions/deletenotice.php:112 actions/deletenotice.php:144
+#. TRANS: Page title when deleting a notice.
+#. TRANS: Fieldset legend for the delete notice form.
+#: actions/deletenotice.php:117 actions/deletenotice.php:148
 msgid "Delete notice"
 msgstr "Видалити допис"
 
-#: actions/deletenotice.php:147
+#. TRANS: Message for the delete notice form.
+#: actions/deletenotice.php:152
 msgid "Are you sure you want to delete this notice?"
 msgstr "Ви впевненні, що бажаєте видалити цей допис?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:154
+#: actions/deletenotice.php:159
 msgid "Do not delete this notice"
 msgstr "Не видаляти цей допис"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:161 lib/noticelist.php:667
+#: actions/deletenotice.php:166 lib/noticelist.php:667
 msgid "Delete this notice"
 msgstr "Видалити допис"
 
@@ -1703,11 +1725,9 @@ msgstr "Повернутись до початкових налаштувань"
 
 #. TRANS: Submit button title.
 #: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
-#: actions/othersettings.php:126 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: actions/useradminpanel.php:295 lib/applicationeditform.php:357
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: lib/applicationeditform.php:357 lib/designsettings.php:256
 msgid "Save"
 msgstr "Зберегти"
 
@@ -1755,8 +1775,9 @@ msgid "Name is required."
 msgstr "Потрібне ім’я."
 
 #. TRANS: Validation error shown when providing too long a name in the "Edit application" form.
-#: actions/editapplication.php:188
-msgid "Name is too long (max 255 characters)."
+#: actions/editapplication.php:188 actions/newapplication.php:169
+#, fuzzy
+msgid "Name is too long (maximum 255 characters)."
 msgstr "Ім’я задовге (не більше 255 знаків)."
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
@@ -1785,7 +1806,7 @@ msgid "Organization is required."
 msgstr "Потрібна організація."
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#: actions/editapplication.php:223
+#: actions/editapplication.php:223 actions/newapplication.php:199
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "Назва організації надто довга (не більше 255 знаків)."
 
@@ -2585,7 +2606,7 @@ msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Позначати міткою MicroID мою адресу Jabber/GTalk."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:180
+#: actions/imsettings.php:290 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "Преференції збережно."
 
@@ -2708,10 +2729,9 @@ msgstr[2] "Ви вже підписані до цих користувачів:"
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#. TRANS: Whois output.
-#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:145 actions/invite.php:159 lib/command.php:426
-#, php-format
+#: actions/invite.php:145 actions/invite.php:159
+#, fuzzy, php-format
+msgctxt "INVITE"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
@@ -2901,7 +2921,8 @@ msgstr ""
 "використовувати варіант «Всі права захищені»."
 
 #: actions/licenseadminpanel.php:156
-msgid "Invalid license title. Max length is 255 characters."
+#, fuzzy
+msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "Помилковий назва ліцензії. Максимальна довжина — 255 символів."
 
 #: actions/licenseadminpanel.php:168
@@ -3078,18 +3099,10 @@ msgstr "Ви маєте спочатку увійти, аби мати змог�
 msgid "Use this form to register a new application."
 msgstr "Скористайтесь цією формою, щоб зареєструвати новий додаток."
 
-#: actions/newapplication.php:169
-msgid "Name is too long (maximum 255 chars)."
-msgstr "Ім’я надто довге (не більше 255 символів)."
-
 #: actions/newapplication.php:184
 msgid "Source URL is required."
 msgstr "Потрібна URL-адреса."
 
-#: actions/newapplication.php:199
-msgid "Organization is too long (maximum 255 chars)."
-msgstr "Назва організації надто довга (не більше 255 знаків)."
-
 #: actions/newapplication.php:266 actions/newapplication.php:275
 msgid "Could not create application."
 msgstr "Не вдалося створити додаток."
@@ -3109,14 +3122,14 @@ msgid "New message"
 msgstr "Нове повідомлення"
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:499
+#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501
 msgid "You can't send a message to this user."
 msgstr "Ви не можете надіслати повідомлення цьому користувачеві."
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
 #: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
-#: lib/command.php:579
+#: lib/command.php:581
 msgid "No content!"
 msgstr "Немає змісту!"
 
@@ -3125,7 +3138,7 @@ msgid "No recipient specified."
 msgstr "Жодного отримувача не визначено."
 
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:503
+#: actions/newmessage.php:167 lib/command.php:505
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -3137,12 +3150,12 @@ msgstr "Повідомлення надіслано"
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:511
+#: actions/newmessage.php:188 lib/command.php:513
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Пряме повідомлення для %s надіслано."
 
-#: actions/newmessage.php:213 actions/newnotice.php:263
+#: actions/newmessage.php:213 actions/newnotice.php:264
 msgid "Ajax Error"
 msgstr "Помилка в Ajax"
 
@@ -3150,19 +3163,7 @@ msgstr "Помилка в Ajax"
 msgid "New notice"
 msgstr "Новий допис"
 
-#: actions/newnotice.php:159 lib/mailhandler.php:60
-#, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr "Надто довго. Максимальний розмір допису — %d знаків."
-
-#: actions/newnotice.php:183
-#, php-format
-msgid "Max notice size is %d chars, including attachment URL."
-msgstr ""
-"Максимальна довжина допису становить %d знаків, включно з URL-адресою "
-"вкладення."
-
-#: actions/newnotice.php:229
+#: actions/newnotice.php:230
 msgid "Notice posted"
 msgstr "Допис надіслано"
 
@@ -3334,36 +3335,46 @@ msgstr "Пошук людей"
 msgid "Notice Search"
 msgstr "Пошук дописів"
 
-#: actions/othersettings.php:60
+#: actions/othersettings.php:59
 msgid "Other settings"
 msgstr "Інші опції"
 
+#. TRANS: Instructions for tab "Other" in user profile settings.
 #: actions/othersettings.php:71
 msgid "Manage various other options."
 msgstr "Керування деякими іншими опціями."
 
-#: actions/othersettings.php:108
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/othersettings.php:111
 msgid " (free service)"
 msgstr " (вільний сервіс)"
 
-#: actions/othersettings.php:116
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/othersettings.php:120
 msgid "Shorten URLs with"
 msgstr "Скорочення URL"
 
-#: actions/othersettings.php:117
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/othersettings.php:122
 msgid "Automatic shortening service to use."
 msgstr "Доступні сервіси."
 
-#: actions/othersettings.php:122
+#. TRANS: Label for checkbox.
+#: actions/othersettings.php:128
 msgid "View profile designs"
 msgstr "Переглядати дизайн користувачів"
 
-#: actions/othersettings.php:123
+#. TRANS: Tooltip for checkbox.
+#: actions/othersettings.php:130
 msgid "Show or hide profile designs."
 msgstr "Показувати або приховувати дизайни сторінок окремих користувачів."
 
-#: actions/othersettings.php:153
-msgid "URL shortening service is too long (max 50 chars)."
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/othersettings.php:162
+#, fuzzy
+msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "Сервіс скорочення URL-адрес надто довгий (50 знаків максимум)."
 
 #: actions/otp.php:69
@@ -3834,7 +3845,7 @@ msgstr "Про себе"
 #. TRANS: Label for group location (dt). Text hidden by default.
 #: actions/profilesettings.php:149 actions/register.php:485
 #: actions/showgroup.php:267 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:177
+#: actions/userauthorization.php:166 lib/groupeditform.php:180
 #: lib/userprofile.php:165
 msgid "Location"
 msgstr "Розташування"
@@ -4175,7 +4186,8 @@ msgid "Unexpected password reset."
 msgstr "Несподіване скидання паролю."
 
 #: actions/recoverpassword.php:365
-msgid "Password must be 6 chars or more."
+#, fuzzy
+msgid "Password must be 6 characters or more."
 msgstr "Пароль має складатись з 6-ти або більше знаків."
 
 #: actions/recoverpassword.php:369
@@ -4550,7 +4562,7 @@ msgstr "Організація"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:172
+#: lib/applicationeditform.php:208 lib/groupeditform.php:175
 msgid "Description"
 msgstr "Опис"
 
@@ -4702,7 +4714,7 @@ msgid "Note"
 msgstr "Зауваження"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:298 lib/groupeditform.php:184
+#: actions/showgroup.php:298 lib/groupeditform.php:187
 msgid "Aliases"
 msgstr "Додаткові імена"
 
@@ -4754,14 +4766,12 @@ msgstr "Всі учасники"
 
 #. TRANS: Label for creation date in statistics on group page.
 #: actions/showgroup.php:458
-#, fuzzy
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Створено"
 
 #. TRANS: Label for member count in statistics on group page.
 #: actions/showgroup.php:466
-#, fuzzy
 msgctxt "LABEL"
 msgid "Members"
 msgstr "Учасники"
@@ -4835,47 +4845,67 @@ msgstr "Повідомлення від %1$s на %2$s"
 msgid "Notice deleted."
 msgstr "Допис видалено."
 
-#: actions/showstream.php:72
-#, php-format
-msgid " tagged %s"
-msgstr " позначено з %s"
+#. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
+#: actions/showstream.php:70
+#, fuzzy, php-format
+msgid "%1$s tagged %2$s"
+msgstr "%1$s, сторінка %2$d"
+
+#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#: actions/showstream.php:74
+#, fuzzy, php-format
+msgid "%1$s tagged %2$s, page %3$d"
+msgstr "Дописи з теґом %1$s, сторінка %2$d"
 
-#: actions/showstream.php:78
+#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$d is the page number.
+#: actions/showstream.php:82
 #, php-format
 msgid "%1$s, page %2$d"
 msgstr "%1$s, сторінка %2$d"
 
-#: actions/showstream.php:120
+#. TRANS: Title for link to notice feed.
+#. TRANS: %1$s is a user nickname, %2$s is a hashtag.
+#: actions/showstream.php:127
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Стрічка дописів %1$s з теґом «%2$s» (RSS 1.0)"
 
-#: actions/showstream.php:127
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:136
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "Стрічка дописів для %s (RSS 1.0)"
 
-#: actions/showstream.php:134
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:145
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "Стрічка дописів для %s (RSS 2.0)"
 
-#: actions/showstream.php:141
+#: actions/showstream.php:152
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "Стрічка дописів для %s (Atom)"
 
-#: actions/showstream.php:146
+#. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
+#. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
+#: actions/showstream.php:159
 #, php-format
 msgid "FOAF for %s"
 msgstr "FOAF для %s"
 
-#: actions/showstream.php:197
-#, php-format
-msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
+#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
+#: actions/showstream.php:211
+#, fuzzy, php-format
+msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr "Це стрічка дописів %1$s, але %2$s ще нічого не написав."
 
-#: actions/showstream.php:202
+#. TRANS: Second sentence of empty list message for a stream for the user themselves.
+#: actions/showstream.php:217
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
@@ -4883,7 +4913,9 @@ msgstr ""
 "Побачили щось цікаве нещодавно? Ви ще нічого не написали і це слушна нагода "
 "аби розпочати! :)"
 
-#: actions/showstream.php:204
+#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:221
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -4892,7 +4924,9 @@ msgstr ""
 "Ви можете «розштовхати» %1$s або [щось йому написати](%%%%action.newnotice%%%"
 "%?status_textarea=%2$s)."
 
-#: actions/showstream.php:243
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:264
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4906,7 +4940,9 @@ msgstr ""
 "register%%%%) зараз і слідкуйте за дописами **%s**, також на вас чекає "
 "багато іншого! ([Дізнатися більше](%%%%doc.help%%%%))"
 
-#: actions/showstream.php:248
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:271
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4917,7 +4953,8 @@ msgstr ""
 "(http://uk.wikipedia.org/wiki/Мікроблогінг), який працює на вільному "
 "програмному забезпеченні [StatusNet](http://status.net/). "
 
-#: actions/showstream.php:305
+#. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
+#: actions/showstream.php:328
 #, php-format
 msgid "Repeat of %s"
 msgstr "Повторення за %s"
@@ -5033,32 +5070,41 @@ msgstr ""
 "Як довго користувачі мають зачекати (в секундах) аби надіслати той самий "
 "допис ще раз."
 
-#: actions/sitenoticeadminpanel.php:56
+#. TRANS: Page title for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:55
 msgid "Site Notice"
 msgstr "Повідомлення сайту"
 
-#: actions/sitenoticeadminpanel.php:67
+#. TRANS: Instructions for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:66
 msgid "Edit site-wide message"
 msgstr "Змінити повідомлення сайту"
 
-#: actions/sitenoticeadminpanel.php:103
+#. TRANS: Server error displayed when saving a site-wide notice was impossible.
+#: actions/sitenoticeadminpanel.php:101
 msgid "Unable to save site notice."
 msgstr "Не вдається зберегти повідомлення сайту."
 
-#: actions/sitenoticeadminpanel.php:113
-msgid "Max length for the site-wide notice is 255 chars."
+#. TRANS: Client error displayed when a site-wide notice was longer than allowed.
+#: actions/sitenoticeadminpanel.php:112
+#, fuzzy
+msgid "Maximum length for the site-wide notice is 255 characters."
 msgstr "Максимальна довжина повідомлення сайту становить 255 символів."
 
+#. TRANS: Label for site-wide notice text field in admin panel.
 #: actions/sitenoticeadminpanel.php:176
 msgid "Site notice text"
 msgstr "Текст повідомлення"
 
-#: actions/sitenoticeadminpanel.php:178
-msgid "Site-wide notice text (255 chars max; HTML okay)"
+#. TRANS: Tooltip for site-wide notice text field in admin panel.
+#: actions/sitenoticeadminpanel.php:179
+#, fuzzy
+msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr ""
 "Текст повідомлення сайту (255 символів максимум; деякий HTML дозволено)"
 
-#: actions/sitenoticeadminpanel.php:198
+#. TRANS: Title for button to save site notice in admin panel.
+#: actions/sitenoticeadminpanel.php:201
 msgid "Save site notice"
 msgstr "Зберегти повідомлення сайту"
 
@@ -5520,76 +5566,94 @@ msgid ""
 msgstr "Ліцензія «%1$s» не відповідає ліцензії сайту «%2$s»."
 
 #. TRANS: User admin panel title
-#: actions/useradminpanel.php:60
+#: actions/useradminpanel.php:58
 msgctxt "TITLE"
 msgid "User"
 msgstr "Користувач"
 
-#: actions/useradminpanel.php:71
+#. TRANS: Instruction for user admin panel.
+#: actions/useradminpanel.php:69
 msgid "User settings for this StatusNet site"
 msgstr "Налаштування користувача даного сайту StatusNet"
 
-#: actions/useradminpanel.php:150
+#. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
+#: actions/useradminpanel.php:147
 msgid "Invalid bio limit. Must be numeric."
 msgstr "Помилкове обмеження біо. Це мають бути цифри."
 
-#: actions/useradminpanel.php:156
-msgid "Invalid welcome text. Max length is 255 characters."
+#. TRANS: Form validation error in user admin panel when welcome text is too long.
+#: actions/useradminpanel.php:154
+#, fuzzy
+msgid "Invalid welcome text. Maximum length is 255 characters."
 msgstr "Помилковий текст привітання. Максимальна довжина — 255 символів."
 
+#. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
+#. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
-#, php-format
-msgid "Invalid default subscripton: '%1$s' is not user."
+#, fuzzy, php-format
+msgid "Invalid default subscripton: '%1$s' is not a user."
 msgstr "Помилкова підписка за замовчуванням: «%1$s» не є користувачем."
 
 #. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:106
+#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
 #: lib/personalgroupnav.php:109
 msgid "Profile"
 msgstr "Профіль"
 
-#: actions/useradminpanel.php:223
+#. TRANS: Field label in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:220
 msgid "Bio Limit"
 msgstr "Обмеження біо"
 
-#: actions/useradminpanel.php:224
+#. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:222
 msgid "Maximum length of a profile bio in characters."
 msgstr "Максимальна довжина біо користувача в знаках."
 
-#: actions/useradminpanel.php:232
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:231
 msgid "New users"
 msgstr "Нові користувачі"
 
+#. TRANS: Field label in user admin panel for setting new user welcome text.
 #: actions/useradminpanel.php:236
 msgid "New user welcome"
 msgstr "Привітання нового користувача"
 
-#: actions/useradminpanel.php:237
-msgid "Welcome text for new users (Max 255 chars)."
+#. TRANS: Tooltip in user admin panel for setting new user welcome text.
+#: actions/useradminpanel.php:238
+#, fuzzy
+msgid "Welcome text for new users (maximum 255 characters)."
 msgstr "Текст привітання нових користувачів (255 знаків)."
 
-#: actions/useradminpanel.php:242
+#. TRANS: Field label in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:244
 msgid "Default subscription"
 msgstr "Підписка за замовчуванням"
 
-#: actions/useradminpanel.php:243
+#. TRANS: Tooltip in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:246
 msgid "Automatically subscribe new users to this user."
 msgstr "Автоматично підписувати нових користувачів до цього користувача."
 
-#: actions/useradminpanel.php:252
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:256
 msgid "Invitations"
 msgstr "Запрошення"
 
-#: actions/useradminpanel.php:257
+#. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:262
 msgid "Invitations enabled"
 msgstr "Запрошення скасовано"
 
-#: actions/useradminpanel.php:259
+#. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:265
 msgid "Whether to allow users to invite new users."
 msgstr ""
 "В той чи інший спосіб дозволити користувачам вітати нових користувачів."
 
-#: actions/useradminpanel.php:295
+#. TRANS: Title for button to save user settings in user admin panel.
+#: actions/useradminpanel.php:302
 msgid "Save user settings"
 msgstr "Зберегти налаштування користувача"
 
@@ -5802,7 +5866,7 @@ msgid "Plugins"
 msgstr "Додатки"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:831
+#: actions/version.php:198 lib/action.php:880
 msgid "Version"
 msgstr "Версія"
 
@@ -6011,16 +6075,23 @@ msgstr "Не вдалося зберегти відповідь для %1$d, %2$
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
+#. TRANS: Full name of a profile or group followed by nickname in parens
+#: classes/Profile.php:164
+#, fuzzy, php-format
+msgctxt "FANCYNAME"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:791
+#: classes/Profile.php:812
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr "Не вдалося скасувати роль «%s» для користувача #%2$s; не існує."
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:800
+#: classes/Profile.php:821
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6166,194 +6237,201 @@ msgstr "%1$s — %2$s"
 msgid "Untitled page"
 msgstr "Сторінка без заголовку"
 
+#. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
+#: lib/action.php:310
+msgctxt "TOOLTIP"
+msgid "Show more"
+msgstr ""
+
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:477
+#: lib/action.php:526
 msgid "Primary site navigation"
 msgstr "Відправна навігація по сайту"
 
 #. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:483
+#: lib/action.php:532
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "Персональний профіль і стрічка друзів"
 
 #. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:486
+#: lib/action.php:535
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Особисте"
 
 #. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:488
+#: lib/action.php:537
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
 msgstr "Змінити електронну адресу, аватару, пароль, профіль"
 
 #. TRANS: Main menu option when logged in for access to user settings
-#: lib/action.php:491
+#: lib/action.php:540
 msgid "Account"
 msgstr "Акаунт"
 
 #. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:493
+#: lib/action.php:542
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "З’єднання з сервісами"
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:496
+#: lib/action.php:545
 msgid "Connect"
 msgstr "З’єднання"
 
 #. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:499
+#: lib/action.php:548
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "Змінити конфігурацію сайту"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:502 lib/groupnav.php:117
+#: lib/action.php:551 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Адмін"
 
 #. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:506
+#: lib/action.php:555
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Запросіть друзів та колег приєднатись до вас на %s"
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:509
+#: lib/action.php:558
 msgctxt "MENU"
 msgid "Invite"
 msgstr "Запросити"
 
 #. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:515
+#: lib/action.php:564
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "Вийти з сайту"
 
 #. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:518
+#: lib/action.php:567
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Вийти"
 
 #. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:523
+#: lib/action.php:572
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "Створити новий акаунт"
 
 #. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:526
+#: lib/action.php:575
 msgctxt "MENU"
 msgid "Register"
 msgstr "Реєстрація"
 
 #. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:529
+#: lib/action.php:578
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "Увійти на сайт"
 
 #. TRANS: Main menu option when not logged in to log in
-#: lib/action.php:532
+#: lib/action.php:581
 msgctxt "MENU"
 msgid "Login"
 msgstr "Увійти"
 
 #. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:535
+#: lib/action.php:584
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Допоможіть!"
 
 #. TRANS: Main menu option for help on the StatusNet site
-#: lib/action.php:538
+#: lib/action.php:587
 msgctxt "MENU"
 msgid "Help"
 msgstr "Довідка"
 
 #. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:541
+#: lib/action.php:590
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr "Пошук людей або текстів"
 
 #. TRANS: Main menu option when logged in or when the StatusNet instance is not private
-#: lib/action.php:544
+#: lib/action.php:593
 msgctxt "MENU"
 msgid "Search"
 msgstr "Пошук"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:566 lib/adminpanelaction.php:387
+#: lib/action.php:615 lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "Об’яви на сайті"
 
 #. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:633
+#: lib/action.php:682
 msgid "Local views"
 msgstr "Огляд"
 
 #. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:703
+#: lib/action.php:752
 msgid "Page notice"
 msgstr "Зауваження сторінки"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:804
+#: lib/action.php:853
 msgid "Secondary site navigation"
 msgstr "Другорядна навігація по сайту"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:810
+#: lib/action.php:859
 msgid "Help"
 msgstr "Допомога"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:813
+#: lib/action.php:862
 msgid "About"
 msgstr "Про"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:816
+#: lib/action.php:865
 msgid "FAQ"
 msgstr "ЧаП"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:821
+#: lib/action.php:870
 msgid "TOS"
 msgstr "Умови"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:825
+#: lib/action.php:874
 msgid "Privacy"
 msgstr "Приватність"
 
-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:828
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+#: lib/action.php:877
 msgid "Source"
 msgstr "Джерело"
 
-#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:834
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+#: lib/action.php:884
 msgid "Contact"
 msgstr "Контакт"
 
-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:837
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+#: lib/action.php:887
 msgid "Badge"
 msgstr "Бедж"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:866
+#: lib/action.php:916
 msgid "StatusNet software license"
 msgstr "Ліцензія програмного забезпечення StatusNet"
 
@@ -6361,7 +6439,7 @@ msgstr "Ліцензія програмного забезпечення StatusN
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:873
+#: lib/action.php:923
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -6371,7 +6449,7 @@ msgstr ""
 "site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:876
+#: lib/action.php:926
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** — це сервіс мікроблоґів."
@@ -6380,7 +6458,7 @@ msgstr "**%%site.name%%** — це сервіс мікроблоґів."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:883
+#: lib/action.php:933
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -6392,51 +6470,51 @@ msgstr ""
 "License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:899
+#: lib/action.php:949
 msgid "Site content license"
 msgstr "Ліцензія змісту сайту"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:906
+#: lib/action.php:956
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "Зміст і дані %1$s є приватними і конфіденційними."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:913
+#: lib/action.php:963
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr "Авторські права на зміст і дані належать %1$s. Всі права захищено."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:917
+#: lib/action.php:967
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "Авторські права на зміст і дані належать розробникам. Всі права захищено."
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:949
+#: lib/action.php:999
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr "Весь зміст і дані %1$s доступні на умовах ліцензії %2$s."
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1285
+#: lib/action.php:1335
 msgid "Pagination"
 msgstr "Нумерація сторінок"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1296
+#: lib/action.php:1346
 msgid "After"
 msgstr "Вперед"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1306
+#: lib/action.php:1356
 msgid "Before"
 msgstr "Назад"
 
@@ -6781,7 +6859,7 @@ msgid "AJAX error"
 msgstr "Помилка в Ajax"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:233 lib/mailhandler.php:142
+#: lib/channel.php:233 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "Команду виконано"
 
@@ -6797,7 +6875,7 @@ msgstr "Допису з таким id не існує."
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:626
+#: lib/command.php:99 lib/command.php:630
 msgid "User has no last notice."
 msgstr "Користувач не має останнього допису."
 
@@ -6866,6 +6944,14 @@ msgstr "%1$s приєднався до спільноти %2$s."
 msgid "%1$s left group %2$s."
 msgstr "%1$s залишив спільноту %2$s."
 
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: lib/command.php:426
+#, fuzzy, php-format
+msgctxt "WHOIS"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
 #. TRANS: Whois output. %s is the full name of the queried user.
 #: lib/command.php:430
 #, php-format
@@ -6905,116 +6991,128 @@ msgstr ""
 "%s — це віддалений профіль; ви можете надсилати приватні повідомлення лише "
 "користувачам одного з вами сервісу."
 
-#. TRANS: Message given if content is too long.
+#. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
 #: lib/command.php:488
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] ""
+"Повідомлення надто довге, максимум становить %1$d символів, натомість ви "
+"надсилаєте %2$d."
+msgstr[1] ""
+"Повідомлення надто довге, максимум становить %1$d символів, натомість ви "
+"надсилаєте %2$d."
+msgstr[2] ""
 "Повідомлення надто довге, максимум становить %1$d символів, натомість ви "
 "надсилаєте %2$d."
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:514
+#: lib/command.php:516
 msgid "Error sending direct message."
 msgstr "Помилка при відправці прямого повідомлення."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:551
+#: lib/command.php:553
 #, php-format
 msgid "Notice from %s repeated."
 msgstr "Допису від %s вторували."
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:554
+#: lib/command.php:556
 msgid "Error repeating notice."
 msgstr "Помилка при повторенні допису."
 
-#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:589
-#, php-format
-msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
+#: lib/command.php:591
+#, fuzzy, php-format
+msgid "Notice too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] ""
+"Допис надто довгий, максимум становить %1$d символів, а ви надсилаєте %2$d."
+msgstr[1] ""
+"Допис надто довгий, максимум становить %1$d символів, а ви надсилаєте %2$d."
+msgstr[2] ""
 "Допис надто довгий, максимум становить %1$d символів, а ви надсилаєте %2$d."
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:600
+#: lib/command.php:604
 #, php-format
 msgid "Reply to %s sent."
 msgstr "Відповідь для %s надіслано."
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:603
+#: lib/command.php:607
 msgid "Error saving notice."
 msgstr "Проблема при збереженні допису."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:650
+#: lib/command.php:654
 msgid "Specify the name of the user to subscribe to."
 msgstr "Зазначте ім’я користувача, до якого бажаєте підписатись."
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:659
+#: lib/command.php:663
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Не можу підписатись до  профілю OMB за командою."
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:667
+#: lib/command.php:671
 #, php-format
 msgid "Subscribed to %s."
 msgstr "Тепер ви підписані на дописи %s."
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:688 lib/command.php:799
+#: lib/command.php:692 lib/command.php:803
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "Зазначте ім’я користувача, від якого бажаєте відписатись."
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:699
+#: lib/command.php:703
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr "Підписку на дописи від %s скасовано."
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:719 lib/command.php:745
+#: lib/command.php:723 lib/command.php:749
 msgid "Command not yet implemented."
 msgstr "Виконання команди ще не завершено."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:723
+#: lib/command.php:727
 msgid "Notification off."
 msgstr "Сповіщення вимкнуто."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:726
+#: lib/command.php:730
 msgid "Can't turn off notification."
 msgstr "Не можна вимкнути сповіщення."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:749
+#: lib/command.php:753
 msgid "Notification on."
 msgstr "Сповіщення увімкнуто."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:752
+#: lib/command.php:756
 msgid "Can't turn on notification."
 msgstr "Не можна увімкнути сповіщення."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:766
+#: lib/command.php:770
 msgid "Login command is disabled."
 msgstr "Команду входу відключено."
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:779
+#: lib/command.php:783
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
@@ -7022,20 +7120,20 @@ msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:808
+#: lib/command.php:812
 #, php-format
 msgid "Unsubscribed %s."
 msgstr "Підписку %s скасовано."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:826
+#: lib/command.php:830
 msgid "You are not subscribed to anyone."
 msgstr "Ви не маєте жодних підписок."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:831
+#: lib/command.php:835
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Ви підписані до цієї особи:"
@@ -7044,14 +7142,14 @@ msgstr[2] "Ви підписані до цих людей:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:853
+#: lib/command.php:857
 msgid "No one is subscribed to you."
 msgstr "Ніхто до вас не підписаний."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:858
+#: lib/command.php:862
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Ця особа є підписаною до вас:"
@@ -7060,14 +7158,14 @@ msgstr[2] "Ці люди підписані до вас:"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:880
+#: lib/command.php:884
 msgid "You are not a member of any groups."
 msgstr "Ви не залучені до жодної спільноти."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:885
+#: lib/command.php:889
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Ви є учасником спільноти:"
@@ -7075,7 +7173,7 @@ msgstr[1] "Ви є учасником таких спільнот:"
 msgstr[2] "Ви є учасником таких спільнот:"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:900
+#: lib/command.php:904
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -7302,7 +7400,8 @@ msgstr ""
 "1-64 літери нижнього регістру і цифри, ніякої пунктуації або інтервалів"
 
 #: lib/groupeditform.php:163
-msgid "URL of the homepage or blog of the group or topic"
+#, fuzzy
+msgid "URL of the homepage or blog of the group or topic."
 msgstr "URL-адреса веб-сторінки або тематичного блоґу сільноти"
 
 #: lib/groupeditform.php:168
@@ -7310,19 +7409,34 @@ msgid "Describe the group or topic"
 msgstr "Опишіть спільноту або тему"
 
 #: lib/groupeditform.php:170
-#, php-format
-msgid "Describe the group or topic in %d characters"
-msgstr "Опишіть спільноту або тему, вкладаючись у %d знаків"
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d character or less"
+msgid_plural "Describe the group or topic in %d characters or less"
+msgstr[0] "Опишіть спільноту або тему, вкладаючись у %d знаків"
+msgstr[1] "Опишіть спільноту або тему, вкладаючись у %d знаків"
+msgstr[2] "Опишіть спільноту або тему, вкладаючись у %d знаків"
 
-#: lib/groupeditform.php:179
+#: lib/groupeditform.php:182
+#, fuzzy
 msgid ""
-"Location for the group, if any, like \"City, State (or Region), Country\""
+"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/groupeditform.php:190
+#, fuzzy, php-format
+msgid ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"alias allowed."
+msgid_plural ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"aliases allowed."
+msgstr[0] ""
+"Додаткові імена для спільноти, відокремлювати комами або пробілами, максимум "
+"— %d імені"
+msgstr[1] ""
+"Додаткові імена для спільноти, відокремлювати комами або пробілами, максимум "
+"— %d імені"
+msgstr[2] ""
 "Додаткові імена для спільноти, відокремлювати комами або пробілами, максимум "
 "— %d імені"
 
@@ -7454,30 +7568,30 @@ msgstr "Тип файлу не підтримується"
 
 #. TRANS: Number of megabytes. %d is the number.
 #: lib/imagefile.php:248
-#, fuzzy, php-format
+#, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
-msgstr[0] "Мб"
-msgstr[1] "Мб"
-msgstr[2] "Мб"
+msgstr[0] "%d Мб"
+msgstr[1] "%d Мб"
+msgstr[2] "%d Мб"
 
 #. TRANS: Number of kilobytes. %d is the number.
 #: lib/imagefile.php:252
-#, fuzzy, php-format
+#, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
-msgstr[0] "кб"
-msgstr[1] "кб"
-msgstr[2] "кб"
+msgstr[0] "%d кб"
+msgstr[1] "%d кб"
+msgstr[2] "%d кб"
 
 #. TRANS: Number of bytes. %d is the number.
 #: lib/imagefile.php:255
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%d б"
+msgstr[1] "%d б"
+msgstr[2] "%d б"
 
 #: lib/jabber.php:387
 #, php-format
@@ -7885,7 +7999,7 @@ msgid "Sorry, no incoming email allowed."
 msgstr ""
 "Вибачте, але не затверджено жодної електронної адреси для вхідної пошти."
 
-#: lib/mailhandler.php:228
+#: lib/mailhandler.php:229
 #, php-format
 msgid "Unsupported message type: %s"
 msgstr "Формат повідомлення не підтримується: %s"
@@ -8231,16 +8345,17 @@ msgid "Sandbox this user"
 msgstr "Ізолювати, відіслати користувача гратися у пісочниці"
 
 #. TRANS: Fieldset legend for the search form.
-#: lib/searchaction.php:121
+#: lib/searchaction.php:120
 msgid "Search site"
 msgstr "Пошук"
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
-#: lib/searchaction.php:129
+#: lib/searchaction.php:128
 msgid "Keyword(s)"
 msgstr "Ключові слова"
 
+#. TRANS: Button text for searching site.
 #: lib/searchaction.php:130
 msgctxt "BUTTON"
 msgid "Search"
@@ -8330,8 +8445,8 @@ msgid "The theme file is missing or the upload failed."
 msgstr "Файл теми відсутній, або стався збій при завантаженні."
 
 #: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:278 lib/themeuploader.php:282
-#: lib/themeuploader.php:290 lib/themeuploader.php:297
+#: lib/themeuploader.php:279 lib/themeuploader.php:283
+#: lib/themeuploader.php:291 lib/themeuploader.php:298
 msgid "Failed saving theme."
 msgstr "Помилка при збереженні теми."
 
@@ -8340,17 +8455,25 @@ msgid "Invalid theme: bad directory structure."
 msgstr "Невірна тема: хибна структура каталогів."
 
 #: lib/themeuploader.php:166
-#, php-format
-msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
-msgstr ""
+#, fuzzy, php-format
+msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
+msgid_plural ""
+"Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr[0] ""
+"Тема, що її було завантажено, надто велика; без компресії розмір має "
+"становити менше ніж %d байтів."
+msgstr[1] ""
+"Тема, що її було завантажено, надто велика; без компресії розмір має "
+"становити менше ніж %d байтів."
+msgstr[2] ""
 "Тема, що її було завантажено, надто велика; без компресії розмір має "
 "становити менше ніж %d байтів."
 
-#: lib/themeuploader.php:178
+#: lib/themeuploader.php:179
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr "В архіві з темою є помилка: відсутній файл css/display.css"
 
-#: lib/themeuploader.php:218
+#: lib/themeuploader.php:219
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
@@ -8358,18 +8481,18 @@ msgstr ""
 "Тема містить неприпустиме ім’я файлу або теки. Використовуйте літери "
 "стандарту ASCII, цифри, знаки підкреслення та мінусу."
 
-#: lib/themeuploader.php:224
+#: lib/themeuploader.php:225
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr ""
 "У темі містяться файли, що мають небезпечні розширення; це може виявитися "
 "небезпечним."
 
-#: lib/themeuploader.php:241
+#: lib/themeuploader.php:242
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr "Тема містить файл типу «.%s», який є неприпустимим."
 
-#: lib/themeuploader.php:259
+#: lib/themeuploader.php:260
 msgid "Error opening theme archive."
 msgstr "Помилка при відкритті архіву з темою."
 
@@ -8379,7 +8502,6 @@ msgstr "Топ-дописувачі"
 
 #. TRANS: Title for the form to unblock a user.
 #: lib/unblockform.php:67
-#, fuzzy
 msgctxt "TITLE"
 msgid "Unblock"
 msgstr "Розблокувати"
@@ -8562,24 +8684,44 @@ msgstr[2] ""
 "Повідомлення надто довге. Максимум становить %1$d символів, натомість ви "
 "надсилаєте %2$d."
 
-#: scripts/restoreuser.php:82
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: scripts/restoreuser.php:61
 #, php-format
-msgid "Backup file for user %s (%s)"
-msgstr "Резервна копія файлів користувача %s (%s)"
+msgid "Getting backup from file '%s'."
+msgstr ""
 
-#: scripts/restoreuser.php:88
+#. TRANS: Commandline script output.
+#: scripts/restoreuser.php:91
 msgid "No user specified; using backup user."
 msgstr ""
 "Користувача не зазначено; для створення резервної копії потрібно зазначити "
 "користувача."
 
-#: scripts/restoreuser.php:94
-#, php-format
-msgid "%d entries in backup."
-msgstr "У резервному файлі збережено %d дописів."
+#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
+#: scripts/restoreuser.php:98
+#, fuzzy, php-format
+msgid "%d entry in backup."
+msgid_plural "%d entries in backup."
+msgstr[0] "У резервному файлі збережено %d дописів."
+msgstr[1] "У резервному файлі збережено %d дописів."
+msgstr[2] "У резервному файлі збережено %d дописів."
+
+#~ msgid "Name is too long (maximum 255 chars)."
+#~ msgstr "Ім’я надто довге (не більше 255 символів)."
+
+#~ msgid "Organization is too long (maximum 255 chars)."
+#~ msgstr "Назва організації надто довга (не більше 255 знаків)."
+
+#~ msgid "That's too long. Max notice size is %d chars."
+#~ msgstr "Надто довго. Максимальний розмір допису — %d знаків."
+
+#~ msgid "Max notice size is %d chars, including attachment URL."
+#~ msgstr ""
+#~ "Максимальна довжина допису становить %d знаків, включно з URL-адресою "
+#~ "вкладення."
 
-#~ msgid "Description is too long (max %d chars)."
-#~ msgstr "Опис надто довгий (%d знаків максимум)."
+#~ msgid " tagged %s"
+#~ msgstr " позначено з %s"
 
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "Забагато додаткових імен! Максимум становить %d."
+#~ msgid "Backup file for user %s (%s)"
+#~ msgstr "Резервна копія файлів користувача %s (%s)"
diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po
index f20bc803d..bd61cabda 100644
--- a/locale/zh_CN/LC_MESSAGES/statusnet.po
+++ b/locale/zh_CN/LC_MESSAGES/statusnet.po
@@ -14,18 +14,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-30 23:18+0000\n"
-"PO-Revision-Date: 2010-10-30 23:20:54+0000\n"
+"POT-Creation-Date: 2010-11-02 22:51+0000\n"
+"PO-Revision-Date: 2010-11-02 22:53:48+0000\n"
 "Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r75708); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r75875); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2010-10-30 09:48:40+0000\n"
+"X-POT-Import-Date: 2010-10-30 23:42:01+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -82,15 +82,20 @@ msgstr "保存访问设置"
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
+#. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
+#. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
 #: actions/accessadminpanel.php:193 actions/emailsettings.php:228
-#: actions/imsettings.php:187 actions/pathsadminpanel.php:512
-#: actions/profilesettings.php:201 actions/smssettings.php:209
-#: actions/subscriptions.php:246 lib/applicationeditform.php:355
+#: actions/imsettings.php:187 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/subscriptions.php:246 actions/useradminpanel.php:298
+#: lib/applicationeditform.php:355 lib/groupeditform.php:207
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "保存"
@@ -141,7 +146,7 @@ msgstr "没有这个页面。"
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:495 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "没有这个用户。"
@@ -211,7 +216,9 @@ msgstr ""
 
 #. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:208
+#. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -557,8 +564,11 @@ msgstr "全名过长(不能超过 255 个字符)。"
 #. TRANS: Group edit form validation error.
 #. TRANS: Form validation error in New application form.
 #. TRANS: %d is the maximum number of characters for the description.
+#. TRANS: Group create form validation error.
+#. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:220 actions/editapplication.php:201
 #: actions/editgroup.php:216 actions/newapplication.php:178
+#: actions/newgroup.php:152
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -716,14 +726,14 @@ msgstr "你没有被授权。"
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:172 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:74
 #: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
 #: actions/groupunblock.php:65 actions/imsettings.php:230
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
-#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/othersettings.php:153 actions/passwordsettings.php:138
 #: actions/profilesettings.php:221 actions/recoverpassword.php:350
 #: actions/register.php:172 actions/remotesubscribe.php:77
 #: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
@@ -901,20 +911,21 @@ msgstr "你不能删除其他用户的消息。"
 
 #. TRANS: Client error displayed trying to repeat a non-existing notice through the API.
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
+#. TRANS: Error message displayed trying to delete a non-existing notice.
 #: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/deletenotice.php:58 actions/shownotice.php:92
+#: actions/deletenotice.php:61 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "没有这条消息。"
 
 #. TRANS: Client error displayed trying to repeat an own notice through the API.
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:535
+#: actions/apistatusesretweet.php:83 lib/command.php:537
 msgid "Cannot repeat your own notice."
 msgstr "不能转发你自己的消息。"
 
 #. TRANS: Client error displayed trying to re-repeat a notice through the API.
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:541
+#: actions/apistatusesretweet.php:92 lib/command.php:543
 msgid "Already repeated that notice."
 msgstr "已转发了该消息。"
 
@@ -935,7 +946,8 @@ msgstr "客户端必须提供一个包含内容的“状态”参数。"
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#: actions/apistatusesupdate.php:244
+#: actions/apistatusesupdate.php:244 actions/newnotice.php:161
+#: lib/mailhandler.php:60
 #, fuzzy, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
@@ -949,7 +961,7 @@ msgstr "API方法没有找到。"
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
-#: actions/apistatusesupdate.php:308
+#: actions/apistatusesupdate.php:308 actions/newnotice.php:184
 #, fuzzy, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
@@ -1158,17 +1170,18 @@ msgstr "请选择一块方形区域作为你的头像"
 msgid "Lost our file data."
 msgstr "文件数据丢失"
 
-#: actions/avatarsettings.php:384
+#. TRANS: Success message for having updated a user avatar.
+#: actions/avatarsettings.php:385
 msgid "Avatar updated."
 msgstr "头像已更新。"
 
 #. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
-#: actions/avatarsettings.php:388
+#: actions/avatarsettings.php:389
 msgid "Failed updating avatar."
 msgstr "更新头像失败。"
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:412
+#: actions/avatarsettings.php:413
 msgid "Avatar deleted."
 msgstr "头像已删除。"
 
@@ -1199,8 +1212,8 @@ msgstr ""
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:154 actions/deleteapplication.php:154
-#: actions/deletegroup.php:220 actions/deletenotice.php:150
+#: actions/block.php:154 actions/deleteapplication.php:157
+#: actions/deletegroup.php:220 actions/deletenotice.php:155
 #: actions/deleteuser.php:152 actions/groupblock.php:178
 msgctxt "BUTTON"
 msgid "No"
@@ -1218,8 +1231,8 @@ msgstr "不要屏蔽这个用户"
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:161 actions/deleteapplication.php:161
-#: actions/deletegroup.php:227 actions/deletenotice.php:157
+#: actions/block.php:161 actions/deleteapplication.php:164
+#: actions/deletegroup.php:227 actions/deletenotice.php:162
 #: actions/deleteuser.php:159 actions/groupblock.php:185
 msgctxt "BUTTON"
 msgid "Yes"
@@ -1336,12 +1349,13 @@ msgstr "此地址已被确认过了。"
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
 #. TRANS: Server error thrown on database error updating IM preferences.
 #. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
 #. TRANS: Server error thrown when user profile settings could not be updated.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #: actions/confirmaddress.php:118 actions/emailsettings.php:331
 #: actions/emailsettings.php:477 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:174
+#: actions/imsettings.php:442 actions/othersettings.php:184
 #: actions/profilesettings.php:326 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
@@ -1377,16 +1391,19 @@ msgstr "对话"
 msgid "Notices"
 msgstr "消息"
 
-#: actions/deleteapplication.php:63
+#. TRANS: Client error displayed trying to delete an application while not logged in.
+#: actions/deleteapplication.php:62
 msgid "You must be logged in to delete an application."
 msgstr "你必须登录后才能删除应用。"
 
+#. TRANS: Client error displayed trying to delete an application that does not exist.
 #: actions/deleteapplication.php:71
 msgid "Application not found."
 msgstr "未找到应用。"
 
+#. TRANS: Client error displayed trying to delete an application the current user does not own.
 #. TRANS: Client error displayed trying to edit an application while not being its owner.
-#: actions/deleteapplication.php:78 actions/editapplication.php:78
+#: actions/deleteapplication.php:79 actions/editapplication.php:78
 #: actions/showapplication.php:94
 msgid "You are not the owner of this application."
 msgstr "你不是该应用的拥有者。"
@@ -1394,15 +1411,18 @@ msgstr "你不是该应用的拥有者。"
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
 #: actions/newapplication.php:114 actions/showapplication.php:118
-#: lib/action.php:1354
+#: lib/action.php:1404
 msgid "There was a problem with your session token."
 msgstr "你的 session token 出现了问题。"
 
-#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+#. TRANS: Title for delete application page.
+#. TRANS: Fieldset legend on delete application page.
+#: actions/deleteapplication.php:124 actions/deleteapplication.php:149
 msgid "Delete application"
 msgstr "删除应用"
 
-#: actions/deleteapplication.php:149
+#. TRANS: Confirmation text on delete application page.
+#: actions/deleteapplication.php:152
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
 "about the application from the database, including all existing user "
@@ -1412,12 +1432,12 @@ msgstr ""
 "用户关联。"
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:158
+#: actions/deleteapplication.php:161
 msgid "Do not delete this application"
 msgstr "不删除该应用"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:164
+#: actions/deleteapplication.php:167
 msgid "Delete this application"
 msgstr "删除这个应用"
 
@@ -1453,13 +1473,14 @@ msgstr "无法更新小组"
 msgid "Deleted group %s"
 msgstr "%1$s离开了%2$s小组。"
 
-#. TRANS: Title.
+#. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
 #: actions/deletegroup.php:176 actions/deletegroup.php:202
 #, fuzzy
 msgid "Delete group"
 msgstr "删除用户"
 
+#. TRANS: Warning in form for deleleting a group.
 #: actions/deletegroup.php:206
 #, fuzzy
 msgid ""
@@ -1481,10 +1502,11 @@ msgstr "不要删除这个消息"
 msgid "Delete this group"
 msgstr "删除这个用户"
 
+#. TRANS: Error message displayed trying to delete a notice while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1494,31 +1516,36 @@ msgstr "删除这个用户"
 msgid "Not logged in."
 msgstr "未登录。"
 
-#: actions/deletenotice.php:74
+#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
+#: actions/deletenotice.php:78
 msgid "Can't delete this notice."
 msgstr "无法删除这条消息。"
 
-#: actions/deletenotice.php:106
+#. TRANS: Instructions for deleting a notice.
+#: actions/deletenotice.php:110
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
 msgstr "你即将永久删除一条消息，此操作无法撤销。"
 
-#: actions/deletenotice.php:112 actions/deletenotice.php:144
+#. TRANS: Page title when deleting a notice.
+#. TRANS: Fieldset legend for the delete notice form.
+#: actions/deletenotice.php:117 actions/deletenotice.php:148
 msgid "Delete notice"
 msgstr "删除消息"
 
-#: actions/deletenotice.php:147
+#. TRANS: Message for the delete notice form.
+#: actions/deletenotice.php:152
 msgid "Are you sure you want to delete this notice?"
 msgstr "你确定要删除这条消息吗？"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:154
+#: actions/deletenotice.php:159
 msgid "Do not delete this notice"
 msgstr "不要删除这个消息"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:161 lib/noticelist.php:667
+#: actions/deletenotice.php:166 lib/noticelist.php:667
 msgid "Delete this notice"
 msgstr "删除"
 
@@ -1679,11 +1706,9 @@ msgstr "重置到默认"
 
 #. TRANS: Submit button title.
 #: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
-#: actions/othersettings.php:126 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: actions/useradminpanel.php:295 lib/applicationeditform.php:357
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: lib/applicationeditform.php:357 lib/designsettings.php:256
 msgid "Save"
 msgstr "保存"
 
@@ -1731,9 +1756,9 @@ msgid "Name is required."
 msgstr "名字为必填项。"
 
 #. TRANS: Validation error shown when providing too long a name in the "Edit application" form.
-#: actions/editapplication.php:188
+#: actions/editapplication.php:188 actions/newapplication.php:169
 #, fuzzy
-msgid "Name is too long (max 255 characters)."
+msgid "Name is too long (maximum 255 characters)."
 msgstr "名称过长(不能超过255个字符)。"
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
@@ -1762,7 +1787,7 @@ msgid "Organization is required."
 msgstr "组织名称必填。"
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#: actions/editapplication.php:223
+#: actions/editapplication.php:223 actions/newapplication.php:199
 #, fuzzy
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "组织名称过长（不能超过255个字符）。"
@@ -2542,7 +2567,7 @@ msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "公开 Jabber/GTalk 帐号的 MicroID。"
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:180
+#: actions/imsettings.php:290 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "首选项已保存。"
 
@@ -2662,10 +2687,9 @@ msgstr[0] "你已经关注了这些用户："
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#. TRANS: Whois output.
-#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:145 actions/invite.php:159 lib/command.php:426
-#, php-format
+#: actions/invite.php:145 actions/invite.php:159
+#, fuzzy, php-format
+msgctxt "INVITE"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
@@ -2838,7 +2862,8 @@ msgid ""
 msgstr "当使用版权所有的许可协议时，你必须指定内容的所有者。"
 
 #: actions/licenseadminpanel.php:156
-msgid "Invalid license title. Max length is 255 characters."
+#, fuzzy
+msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "无效的许可协议标题。最大长度255个字符。"
 
 #: actions/licenseadminpanel.php:168
@@ -3007,20 +3032,10 @@ msgstr "你必须登录才能登记你的应用。"
 msgid "Use this form to register a new application."
 msgstr "通过此表单登记一个新的应用。"
 
-#: actions/newapplication.php:169
-#, fuzzy
-msgid "Name is too long (maximum 255 chars)."
-msgstr "名称过长(不能超过255个字符)。"
-
 #: actions/newapplication.php:184
 msgid "Source URL is required."
 msgstr "Source URL 必填。"
 
-#: actions/newapplication.php:199
-#, fuzzy
-msgid "Organization is too long (maximum 255 chars)."
-msgstr "组织名称过长（不能超过255个字符）。"
-
 #: actions/newapplication.php:266 actions/newapplication.php:275
 msgid "Could not create application."
 msgstr "无法创建应用。"
@@ -3040,14 +3055,14 @@ msgid "New message"
 msgstr "新消息"
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:499
+#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501
 msgid "You can't send a message to this user."
 msgstr "无法向此用户发送消息。"
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
 #: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
-#: lib/command.php:579
+#: lib/command.php:581
 msgid "No content!"
 msgstr "没有内容！"
 
@@ -3056,7 +3071,7 @@ msgid "No recipient specified."
 msgstr "没有收件人。"
 
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:503
+#: actions/newmessage.php:167 lib/command.php:505
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "不要向自己发送消息；跟自己悄悄说就得了。"
@@ -3067,12 +3082,12 @@ msgstr "消息已发送"
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:511
+#: actions/newmessage.php:188 lib/command.php:513
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "向%s发送私信成功。"
 
-#: actions/newmessage.php:213 actions/newnotice.php:263
+#: actions/newmessage.php:213 actions/newnotice.php:264
 msgid "Ajax Error"
 msgstr "Ajax错误"
 
@@ -3080,17 +3095,7 @@ msgstr "Ajax错误"
 msgid "New notice"
 msgstr "新消息"
 
-#: actions/newnotice.php:159 lib/mailhandler.php:60
-#, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr "太长了。最长的消息长度是%d个字符。"
-
-#: actions/newnotice.php:183
-#, php-format
-msgid "Max notice size is %d chars, including attachment URL."
-msgstr "每条消息最长%d字符，包括附件的链接 URL。"
-
-#: actions/newnotice.php:229
+#: actions/newnotice.php:230
 msgid "Notice posted"
 msgstr "消息已发布。"
 
@@ -3258,36 +3263,46 @@ msgstr "搜索用户"
 msgid "Notice Search"
 msgstr "搜索消息"
 
-#: actions/othersettings.php:60
+#: actions/othersettings.php:59
 msgid "Other settings"
 msgstr "其他设置"
 
+#. TRANS: Instructions for tab "Other" in user profile settings.
 #: actions/othersettings.php:71
 msgid "Manage various other options."
 msgstr "管理其他选项。"
 
-#: actions/othersettings.php:108
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/othersettings.php:111
 msgid " (free service)"
 msgstr "（免费服务）"
 
-#: actions/othersettings.php:116
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/othersettings.php:120
 msgid "Shorten URLs with"
 msgstr "缩短 URL 使用"
 
-#: actions/othersettings.php:117
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/othersettings.php:122
 msgid "Automatic shortening service to use."
 msgstr "要使用的自动短网址服务。"
 
-#: actions/othersettings.php:122
+#. TRANS: Label for checkbox.
+#: actions/othersettings.php:128
 msgid "View profile designs"
 msgstr "查看个人页面外观"
 
-#: actions/othersettings.php:123
+#. TRANS: Tooltip for checkbox.
+#: actions/othersettings.php:130
 msgid "Show or hide profile designs."
 msgstr "显示或隐藏个人页面外观。"
 
-#: actions/othersettings.php:153
-msgid "URL shortening service is too long (max 50 chars)."
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/othersettings.php:162
+#, fuzzy
+msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "短网址服务过长(不能超过50个字符)。"
 
 #: actions/otp.php:69
@@ -3772,7 +3787,7 @@ msgstr "自述"
 #. TRANS: Label for group location (dt). Text hidden by default.
 #: actions/profilesettings.php:149 actions/register.php:485
 #: actions/showgroup.php:267 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:177
+#: actions/userauthorization.php:166 lib/groupeditform.php:180
 #: lib/userprofile.php:165
 msgid "Location"
 msgstr "位置"
@@ -4097,7 +4112,8 @@ msgid "Unexpected password reset."
 msgstr "未预料的密码重置。"
 
 #: actions/recoverpassword.php:365
-msgid "Password must be 6 chars or more."
+#, fuzzy
+msgid "Password must be 6 characters or more."
 msgstr "密码必须是 6 个字符或更多。"
 
 #: actions/recoverpassword.php:369
@@ -4460,7 +4476,7 @@ msgstr "组织名称必填。"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:172
+#: lib/applicationeditform.php:208 lib/groupeditform.php:175
 msgid "Description"
 msgstr "描述"
 
@@ -4606,7 +4622,7 @@ msgid "Note"
 msgstr "注释"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:298 lib/groupeditform.php:184
+#: actions/showgroup.php:298 lib/groupeditform.php:187
 msgid "Aliases"
 msgstr "别名"
 
@@ -4738,53 +4754,75 @@ msgstr "来自 %1$s 的 %2$s 消息"
 msgid "Notice deleted."
 msgstr "消息已删除"
 
-#: actions/showstream.php:72
-#, php-format
-msgid " tagged %s"
-msgstr "带%s标签的"
+#. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
+#: actions/showstream.php:70
+#, fuzzy, php-format
+msgid "%1$s tagged %2$s"
+msgstr "%1$s，第%2$d页"
 
-#: actions/showstream.php:78
+#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#: actions/showstream.php:74
+#, fuzzy, php-format
+msgid "%1$s tagged %2$s, page %3$d"
+msgstr "带%1$s标签的消息，第%2$d页"
+
+#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$d is the page number.
+#: actions/showstream.php:82
 #, php-format
 msgid "%1$s, page %2$d"
 msgstr "%1$s，第%2$d页"
 
-#: actions/showstream.php:120
+#. TRANS: Title for link to notice feed.
+#. TRANS: %1$s is a user nickname, %2$s is a hashtag.
+#: actions/showstream.php:127
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "%1$s的有%2$s标签的消息聚合 (RSS 1.0)"
 
-#: actions/showstream.php:127
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:136
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "%s的消息聚合 (RSS 1.0)"
 
-#: actions/showstream.php:134
+#. TRANS: Title for link to notice feed.
+#. TRANS: %s is a user nickname.
+#: actions/showstream.php:145
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "%s的消息聚合 (RSS 2.0)"
 
-#: actions/showstream.php:141
+#: actions/showstream.php:152
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "%s的消息聚合 (Atom)"
 
-#: actions/showstream.php:146
+#. TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend.
+#. TRANS: More information at http://www.foaf-project.org. %s is a user nickname.
+#: actions/showstream.php:159
 #, php-format
 msgid "FOAF for %s"
 msgstr "%s的FOAF"
 
-#: actions/showstream.php:197
-#, php-format
-msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
+#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
+#: actions/showstream.php:211
+#, fuzzy, php-format
+msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr "这是%1$s的时间线，但是%2$s还没有发布任何内容。"
 
-#: actions/showstream.php:202
+#. TRANS: Second sentence of empty list message for a stream for the user themselves.
+#: actions/showstream.php:217
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
 msgstr "最近看到了什么有趣的消息了么？你还没有发布消息呢，现在开始吧 :)"
 
-#: actions/showstream.php:204
+#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:221
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
@@ -4793,7 +4831,9 @@ msgstr ""
 "你可以试着呼叫%1$s或给他们 [发一些消息](%%%%action.newnotice%%%%?"
 "status_textarea=%2$s)。"
 
-#: actions/showstream.php:243
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:264
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4806,7 +4846,9 @@ msgstr ""
 "E5%BE%AE%E5%8D%9A%E5%AE%A2)服务。[现在加入](%%%%action.register%%%%)并关注**%"
 "s**的消息和享受更多乐趣! （[阅读更多](%%%%doc.help%%%%)）"
 
-#: actions/showstream.php:248
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:271
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4817,7 +4859,8 @@ msgstr ""
 "[StatusNet](http://status.net/)的[微博客](http://zh.wikipedia.org/zh-hans/%"
 "E5%BE%AE%E5%8D%9A%E5%AE%A2)。"
 
-#: actions/showstream.php:305
+#. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
+#: actions/showstream.php:328
 #, php-format
 msgid "Repeat of %s"
 msgstr "%s 的转发"
@@ -4927,31 +4970,40 @@ msgstr "防刷新限制"
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr "用户再次发布相同内容时需要等待的时间（秒）。"
 
-#: actions/sitenoticeadminpanel.php:56
+#. TRANS: Page title for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:55
 msgid "Site Notice"
 msgstr "网站公告"
 
-#: actions/sitenoticeadminpanel.php:67
+#. TRANS: Instructions for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:66
 msgid "Edit site-wide message"
 msgstr "编辑整个网站的公告"
 
-#: actions/sitenoticeadminpanel.php:103
+#. TRANS: Server error displayed when saving a site-wide notice was impossible.
+#: actions/sitenoticeadminpanel.php:101
 msgid "Unable to save site notice."
 msgstr "无法保存网站公告。"
 
-#: actions/sitenoticeadminpanel.php:113
-msgid "Max length for the site-wide notice is 255 chars."
+#. TRANS: Client error displayed when a site-wide notice was longer than allowed.
+#: actions/sitenoticeadminpanel.php:112
+#, fuzzy
+msgid "Maximum length for the site-wide notice is 255 characters."
 msgstr "整个网站的公告最长限制为255字符。"
 
+#. TRANS: Label for site-wide notice text field in admin panel.
 #: actions/sitenoticeadminpanel.php:176
 msgid "Site notice text"
 msgstr "网站公告文字"
 
-#: actions/sitenoticeadminpanel.php:178
-msgid "Site-wide notice text (255 chars max; HTML okay)"
+#. TRANS: Tooltip for site-wide notice text field in admin panel.
+#: actions/sitenoticeadminpanel.php:179
+#, fuzzy
+msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr "整个网站的公告文字（最长255字符；可使用HTML）"
 
-#: actions/sitenoticeadminpanel.php:198
+#. TRANS: Title for button to save site notice in admin panel.
+#: actions/sitenoticeadminpanel.php:201
 msgid "Save site notice"
 msgstr "保存网站公告"
 
@@ -5403,75 +5455,93 @@ msgid ""
 msgstr "Listenee stream 许可证“‘%1$s” 与本网站的许可证 “%2$s”不兼容。"
 
 #. TRANS: User admin panel title
-#: actions/useradminpanel.php:60
+#: actions/useradminpanel.php:58
 msgctxt "TITLE"
 msgid "User"
 msgstr "用户"
 
-#: actions/useradminpanel.php:71
+#. TRANS: Instruction for user admin panel.
+#: actions/useradminpanel.php:69
 msgid "User settings for this StatusNet site"
 msgstr "这个 StatusNet 网站的用户设置"
 
-#: actions/useradminpanel.php:150
+#. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
+#: actions/useradminpanel.php:147
 msgid "Invalid bio limit. Must be numeric."
 msgstr "无效的自述限制，必须为数字。"
 
-#: actions/useradminpanel.php:156
-msgid "Invalid welcome text. Max length is 255 characters."
+#. TRANS: Form validation error in user admin panel when welcome text is too long.
+#: actions/useradminpanel.php:154
+#, fuzzy
+msgid "Invalid welcome text. Maximum length is 255 characters."
 msgstr "无效的欢迎文字。最大长度255个字符。"
 
+#. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
+#. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
-#, php-format
-msgid "Invalid default subscripton: '%1$s' is not user."
+#, fuzzy, php-format
+msgid "Invalid default subscripton: '%1$s' is not a user."
 msgstr "无效的默认关注：“%1$s”不是一个用户。"
 
 #. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:106
+#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
 #: lib/personalgroupnav.php:109
 msgid "Profile"
 msgstr "个人信息"
 
-#: actions/useradminpanel.php:223
+#. TRANS: Field label in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:220
 msgid "Bio Limit"
 msgstr "自述限制"
 
-#: actions/useradminpanel.php:224
+#. TRANS: Tooltip in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:222
 msgid "Maximum length of a profile bio in characters."
 msgstr "个人资料自述最长的字符数。"
 
-#: actions/useradminpanel.php:232
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:231
 msgid "New users"
 msgstr "新用户"
 
+#. TRANS: Field label in user admin panel for setting new user welcome text.
 #: actions/useradminpanel.php:236
 msgid "New user welcome"
 msgstr "新用户欢迎"
 
-#: actions/useradminpanel.php:237
-msgid "Welcome text for new users (Max 255 chars)."
+#. TRANS: Tooltip in user admin panel for setting new user welcome text.
+#: actions/useradminpanel.php:238
+#, fuzzy
+msgid "Welcome text for new users (maximum 255 characters)."
 msgstr "给新用户的欢迎文字(不能超过255个字符)。"
 
-#: actions/useradminpanel.php:242
+#. TRANS: Field label in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:244
 msgid "Default subscription"
 msgstr "默认关注"
 
-#: actions/useradminpanel.php:243
+#. TRANS: Tooltip in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:246
 msgid "Automatically subscribe new users to this user."
 msgstr "自动关注所有关注我的人 (这个选项适合机器人)"
 
-#: actions/useradminpanel.php:252
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:256
 msgid "Invitations"
 msgstr "邀请"
 
-#: actions/useradminpanel.php:257
+#. TRANS: Field label for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:262
 msgid "Invitations enabled"
 msgstr "邀请已启用"
 
-#: actions/useradminpanel.php:259
+#. TRANS: Tooltip for checkbox in user admin panel for allowing users to invite friend using site e-mail.
+#: actions/useradminpanel.php:265
 msgid "Whether to allow users to invite new users."
 msgstr "是否允许用户发送注册邀请。"
 
-#: actions/useradminpanel.php:295
+#. TRANS: Title for button to save user settings in user admin panel.
+#: actions/useradminpanel.php:302
 msgid "Save user settings"
 msgstr "保存用户设置"
 
@@ -5668,7 +5738,7 @@ msgid "Plugins"
 msgstr "插件"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:831
+#: actions/version.php:198 lib/action.php:880
 msgid "Version"
 msgstr "版本"
 
@@ -5872,16 +5942,23 @@ msgstr "无法保存回复，%1$d 对 %2$d。"
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
+#. TRANS: Full name of a profile or group followed by nickname in parens
+#: classes/Profile.php:164
+#, fuzzy, php-format
+msgctxt "FANCYNAME"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:791
+#: classes/Profile.php:812
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr "无法取消用户#%2$d的\\\"%1$s\\\"权限，不存在。"
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:800
+#: classes/Profile.php:821
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr "无法取消用户#%2$d的\\\"%1$s\\\"权限，数据库错误。"
@@ -6026,194 +6103,201 @@ msgstr "%1$s - %2$s"
 msgid "Untitled page"
 msgstr "无标题页"
 
+#. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
+#: lib/action.php:310
+msgctxt "TOOLTIP"
+msgid "Show more"
+msgstr ""
+
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:477
+#: lib/action.php:526
 msgid "Primary site navigation"
 msgstr "主站导航"
 
 #. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:483
+#: lib/action.php:532
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "个人资料及朋友的时间线"
 
 #. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:486
+#: lib/action.php:535
 msgctxt "MENU"
 msgid "Personal"
 msgstr "个人"
 
 #. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:488
+#: lib/action.php:537
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
 msgstr "修改你的 email 地址、头像、密码、资料"
 
 #. TRANS: Main menu option when logged in for access to user settings
-#: lib/action.php:491
+#: lib/action.php:540
 msgid "Account"
 msgstr "帐号"
 
 #. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:493
+#: lib/action.php:542
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "关联的服务"
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:496
+#: lib/action.php:545
 msgid "Connect"
 msgstr "关联"
 
 #. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:499
+#: lib/action.php:548
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "更改网站配置"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:502 lib/groupnav.php:117
+#: lib/action.php:551 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "管理"
 
 #. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:506
+#: lib/action.php:555
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "邀请好友和同事加入%s。"
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:509
+#: lib/action.php:558
 msgctxt "MENU"
 msgid "Invite"
 msgstr "邀请"
 
 #. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:515
+#: lib/action.php:564
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "从网站登出"
 
 #. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:518
+#: lib/action.php:567
 msgctxt "MENU"
 msgid "Logout"
 msgstr "登出"
 
 #. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:523
+#: lib/action.php:572
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "创建一个账户"
 
 #. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:526
+#: lib/action.php:575
 msgctxt "MENU"
 msgid "Register"
 msgstr "注册"
 
 #. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:529
+#: lib/action.php:578
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "登录这个网站"
 
 #. TRANS: Main menu option when not logged in to log in
-#: lib/action.php:532
+#: lib/action.php:581
 msgctxt "MENU"
 msgid "Login"
 msgstr "登录"
 
 #. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:535
+#: lib/action.php:584
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "帮助我！"
 
 #. TRANS: Main menu option for help on the StatusNet site
-#: lib/action.php:538
+#: lib/action.php:587
 msgctxt "MENU"
 msgid "Help"
 msgstr "帮助"
 
 #. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:541
+#: lib/action.php:590
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr "搜索人或文字"
 
 #. TRANS: Main menu option when logged in or when the StatusNet instance is not private
-#: lib/action.php:544
+#: lib/action.php:593
 msgctxt "MENU"
 msgid "Search"
 msgstr "搜索"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:566 lib/adminpanelaction.php:387
+#: lib/action.php:615 lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "网站消息"
 
 #. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:633
+#: lib/action.php:682
 msgid "Local views"
 msgstr "本地显示"
 
 #. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:703
+#: lib/action.php:752
 msgid "Page notice"
 msgstr "页面消息"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:804
+#: lib/action.php:853
 msgid "Secondary site navigation"
 msgstr "副站导航"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:810
+#: lib/action.php:859
 msgid "Help"
 msgstr "帮助"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:813
+#: lib/action.php:862
 msgid "About"
 msgstr "关于"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:816
+#: lib/action.php:865
 msgid "FAQ"
 msgstr "FAQ"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:821
+#: lib/action.php:870
 msgid "TOS"
 msgstr "条款"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:825
+#: lib/action.php:874
 msgid "Privacy"
 msgstr "隐私"
 
-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:828
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+#: lib/action.php:877
 msgid "Source"
 msgstr "源码"
 
-#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:834
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+#: lib/action.php:884
 msgid "Contact"
 msgstr "联系"
 
-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:837
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+#: lib/action.php:887
 msgid "Badge"
 msgstr "挂件"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:866
+#: lib/action.php:916
 msgid "StatusNet software license"
 msgstr "StatusNet 软件许可证"
 
@@ -6221,7 +6305,7 @@ msgstr "StatusNet 软件许可证"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:873
+#: lib/action.php:923
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -6231,7 +6315,7 @@ msgstr ""
 "broughtbyurl%%)。"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:876
+#: lib/action.php:926
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** 是一个微博客服务。"
@@ -6240,7 +6324,7 @@ msgstr "**%%site.name%%** 是一个微博客服务。"
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:883
+#: lib/action.php:933
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -6251,50 +6335,50 @@ msgstr ""
 "(http://www.fsf.org/licensing/licenses/agpl-3.0.html)授权。"
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:899
+#: lib/action.php:949
 msgid "Site content license"
 msgstr "网站内容许可协议"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:906
+#: lib/action.php:956
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "%1$s的内容和数据是私人且保密的。"
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:913
+#: lib/action.php:963
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr "内容和数据%1$s版权所有并保留所有权利。"
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:917
+#: lib/action.php:967
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr "内容和数据贡献者版权所有并保留所有权利。"
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:949
+#: lib/action.php:999
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr "所有%1$s的内容和数据在%2$s许可下有效。"
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1285
+#: lib/action.php:1335
 msgid "Pagination"
 msgstr "分页"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1296
+#: lib/action.php:1346
 msgid "After"
 msgstr "之后"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1306
+#: lib/action.php:1356
 msgid "Before"
 msgstr "之前"
 
@@ -6633,7 +6717,7 @@ msgid "AJAX error"
 msgstr "AJAX 错误"
 
 #. TRANS: E-mail subject when a command has completed.
-#: lib/channel.php:233 lib/mailhandler.php:142
+#: lib/channel.php:233 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr "执行完毕"
 
@@ -6649,7 +6733,7 @@ msgstr "没有此 id 的消息。"
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:626
+#: lib/command.php:99 lib/command.php:630
 msgid "User has no last notice."
 msgstr "用户没有最后一条的消息。"
 
@@ -6718,6 +6802,14 @@ msgstr "%1$s加入了%2$s小组。"
 msgid "%1$s left group %2$s."
 msgstr "%1$s离开了%2$s小组。"
 
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: lib/command.php:426
+#, fuzzy, php-format
+msgctxt "WHOIS"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
 #. TRANS: Whois output. %s is the full name of the queried user.
 #: lib/command.php:430
 #, php-format
@@ -6755,167 +6847,169 @@ msgid ""
 "same server."
 msgstr "%s是一个远程的用户；你只能给同一个服务器上的用户发送私信。"
 
-#. TRANS: Message given if content is too long.
+#. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
 #: lib/command.php:488
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr "消息包含%2$d个字符，超出长度限制 - 不能超过%1$d个字符。"
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] "消息包含%2$d个字符，超出长度限制 - 不能超过%1$d个字符。"
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:514
+#: lib/command.php:516
 msgid "Error sending direct message."
 msgstr "发送消息出错。"
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:551
+#: lib/command.php:553
 #, php-format
 msgid "Notice from %s repeated."
 msgstr "来自 %s 的消息已转发。"
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:554
+#: lib/command.php:556
 msgid "Error repeating notice."
 msgstr "转发消息时出错。"
 
-#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:589
-#, php-format
-msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
-msgstr "消息过长 - 最长%1$d个字符，你发送的是%2$d。"
+#: lib/command.php:591
+#, fuzzy, php-format
+msgid "Notice too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] "消息过长 - 最长%1$d个字符，你发送的是%2$d。"
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:600
+#: lib/command.php:604
 #, php-format
 msgid "Reply to %s sent."
 msgstr "给 %s 的回复已发送。"
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:603
+#: lib/command.php:607
 msgid "Error saving notice."
 msgstr "保存消息时出错。"
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:650
+#: lib/command.php:654
 msgid "Specify the name of the user to subscribe to."
 msgstr "指定要关注的用户名。"
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:659
+#: lib/command.php:663
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "无法通过命令行关注 OMB 用户。"
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:667
+#: lib/command.php:671
 #, php-format
 msgid "Subscribed to %s."
 msgstr "已关注%s。"
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:688 lib/command.php:799
+#: lib/command.php:692 lib/command.php:803
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "指定要取消关注的用户名。"
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:699
+#: lib/command.php:703
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr "取消关注%s。"
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:719 lib/command.php:745
+#: lib/command.php:723 lib/command.php:749
 msgid "Command not yet implemented."
 msgstr "命令尚未实现。"
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:723
+#: lib/command.php:727
 msgid "Notification off."
 msgstr "通知已关闭。"
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:726
+#: lib/command.php:730
 msgid "Can't turn off notification."
 msgstr "无法关闭通知。"
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:749
+#: lib/command.php:753
 msgid "Notification on."
 msgstr "通知已开启。"
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:752
+#: lib/command.php:756
 msgid "Can't turn on notification."
 msgstr "无法开启通知。"
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:766
+#: lib/command.php:770
 msgid "Login command is disabled."
 msgstr "登录命令被禁用。"
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:779
+#: lib/command.php:783
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr "这个链接只能使用一次并且仅在2分钟内有效：%s。"
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:808
+#: lib/command.php:812
 #, php-format
 msgid "Unsubscribed %s."
 msgstr "已取消关注%s。"
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:826
+#: lib/command.php:830
 msgid "You are not subscribed to anyone."
 msgstr "你没有关注任何人。"
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:831
+#: lib/command.php:835
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "你已关注了这个用户："
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:853
+#: lib/command.php:857
 msgid "No one is subscribed to you."
 msgstr "没有人关注你。"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:858
+#: lib/command.php:862
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "这个用户正在关注你："
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:880
+#: lib/command.php:884
 msgid "You are not a member of any groups."
 msgstr "你还未成为任何一个小组的成员。"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:885
+#: lib/command.php:889
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "你是该小组成员："
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:900
+#: lib/command.php:904
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -7139,7 +7233,8 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1 到 64 个小写字母或数字，不包含标点或空格"
 
 #: lib/groupeditform.php:163
-msgid "URL of the homepage or blog of the group or topic"
+#, fuzzy
+msgid "URL of the homepage or blog of the group or topic."
 msgstr "这个小组或主题的主页或博客 URL"
 
 #: lib/groupeditform.php:168
@@ -7147,19 +7242,26 @@ msgid "Describe the group or topic"
 msgstr "小组或主题的描述"
 
 #: lib/groupeditform.php:170
-#, php-format
-msgid "Describe the group or topic in %d characters"
-msgstr "小组或主题的描述，不能超过%d个字符"
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d character or less"
+msgid_plural "Describe the group or topic in %d characters or less"
+msgstr[0] "小组或主题的描述，不能超过%d个字符"
 
-#: lib/groupeditform.php:179
+#: lib/groupeditform.php:182
+#, fuzzy
 msgid ""
-"Location for the group, if any, like \"City, State (or Region), Country\""
+"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 "该小组额外的昵称，用逗号或者空格分隔开，最长%d"
+#: lib/groupeditform.php:190
+#, fuzzy, php-format
+msgid ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"alias allowed."
+msgid_plural ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"aliases allowed."
+msgstr[0] "该小组额外的昵称，用逗号或者空格分隔开，最长%d"
 
 #. TRANS: Menu item in the group navigation page.
 #: lib/groupnav.php:86
@@ -7708,7 +7810,7 @@ msgstr "抱歉，这个不是你的收信电子邮件地址。"
 msgid "Sorry, no incoming email allowed."
 msgstr "抱歉，现在不允许电子邮件发布。"
 
-#: lib/mailhandler.php:228
+#: lib/mailhandler.php:229
 #, php-format
 msgid "Unsupported message type: %s"
 msgstr "不支持的信息格式：%s"
@@ -8049,16 +8151,17 @@ msgid "Sandbox this user"
 msgstr "将这个用户放入沙盒。"
 
 #. TRANS: Fieldset legend for the search form.
-#: lib/searchaction.php:121
+#: lib/searchaction.php:120
 msgid "Search site"
 msgstr "搜索帮助"
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
-#: lib/searchaction.php:129
+#: lib/searchaction.php:128
 msgid "Keyword(s)"
 msgstr "关键词"
 
+#. TRANS: Button text for searching site.
 #: lib/searchaction.php:130
 msgctxt "BUTTON"
 msgid "Search"
@@ -8148,8 +8251,8 @@ msgid "The theme file is missing or the upload failed."
 msgstr "主题文件丢失或上传失败。"
 
 #: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:278 lib/themeuploader.php:282
-#: lib/themeuploader.php:290 lib/themeuploader.php:297
+#: lib/themeuploader.php:279 lib/themeuploader.php:283
+#: lib/themeuploader.php:291 lib/themeuploader.php:298
 msgid "Failed saving theme."
 msgstr "保存主题失败"
 
@@ -8158,31 +8261,33 @@ msgid "Invalid theme: bad directory structure."
 msgstr "无效的主题：目录结构损坏。"
 
 #: lib/themeuploader.php:166
-#, php-format
-msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
-msgstr "上传的主题过大，解压后必须小于%d字节。"
+#, fuzzy, php-format
+msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
+msgid_plural ""
+"Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr[0] "上传的主题过大，解压后必须小于%d字节。"
 
-#: lib/themeuploader.php:178
+#: lib/themeuploader.php:179
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr "无效的主题存档：css/display.css 文件丢失"
 
-#: lib/themeuploader.php:218
+#: lib/themeuploader.php:219
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
 msgstr ""
 "主题包含无效的文件或文件夹的名称。请只使用 ASCII 字母，数字，下划线和减号。"
 
-#: lib/themeuploader.php:224
+#: lib/themeuploader.php:225
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr "主题包含不安全的文件扩展名，可能有危险。"
 
-#: lib/themeuploader.php:241
+#: lib/themeuploader.php:242
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr "主题包含不允许的”.%s“格式文件。"
 
-#: lib/themeuploader.php:259
+#: lib/themeuploader.php:260
 msgid "Error opening theme archive."
 msgstr "打开主题文件时出错。"
 
@@ -8358,22 +8463,40 @@ msgid "Message too long. Maximum is %1$d character, you sent %2$d."
 msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
 msgstr[0] "消息包含%2$d个字符，超出长度限制 - 不能超过%1$d个字符。"
 
-#: scripts/restoreuser.php:82
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: scripts/restoreuser.php:61
 #, php-format
-msgid "Backup file for user %s (%s)"
-msgstr "用户 %s (%s) 的备份文件"
+msgid "Getting backup from file '%s'."
+msgstr ""
 
-#: scripts/restoreuser.php:88
+#. TRANS: Commandline script output.
+#: scripts/restoreuser.php:91
 msgid "No user specified; using backup user."
 msgstr "没有用户被指定；使用备份用户。"
 
-#: scripts/restoreuser.php:94
-#, php-format
-msgid "%d entries in backup."
-msgstr "备份中有 %d 个条目。"
+#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
+#: scripts/restoreuser.php:98
+#, fuzzy, php-format
+msgid "%d entry in backup."
+msgid_plural "%d entries in backup."
+msgstr[0] "备份中有 %d 个条目。"
+
+#, fuzzy
+#~ msgid "Name is too long (maximum 255 chars)."
+#~ msgstr "名称过长(不能超过255个字符)。"
+
+#, fuzzy
+#~ msgid "Organization is too long (maximum 255 chars)."
+#~ msgstr "组织名称过长（不能超过255个字符）。"
+
+#~ msgid "That's too long. Max notice size is %d chars."
+#~ msgstr "太长了。最长的消息长度是%d个字符。"
+
+#~ msgid "Max notice size is %d chars, including attachment URL."
+#~ msgstr "每条消息最长%d字符，包括附件的链接 URL。"
 
-#~ msgid "Description is too long (max %d chars)."
-#~ msgstr "描述过长(不能超过%d 个字符)。"
+#~ msgid " tagged %s"
+#~ msgstr "带%s标签的"
 
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "太多别名了！最多%d 个。"
+#~ msgid "Backup file for user %s (%s)"
+#~ msgstr "用户 %s (%s) 的备份文件"
diff --git a/plugins/GroupFavorited/groupfavoritedaction.php b/plugins/GroupFavorited/groupfavoritedaction.php
index dbd37abbc..dcbf7d0bc 100644
--- a/plugins/GroupFavorited/groupfavoritedaction.php
+++ b/plugins/GroupFavorited/groupfavoritedaction.php
@@ -41,12 +41,7 @@ class GroupFavoritedAction extends ShowgroupAction
      */
     function title()
     {
-        if (!empty($this->group->fullname)) {
-            // @todo Create a core method to create this properly. i18n issue.
-            $base = $this->group->fullname . ' (' . $this->group->nickname . ')';
-        } else {
-            $base = $this->group->nickname;
-        }
+        $base = $this->group->getFancyName();
 
         if ($this->page == 1) {
             // TRANS: %s is a group name.
diff --git a/plugins/Mapstraction/allmap.php b/plugins/Mapstraction/allmap.php
index 6e2e1d122..62d8d0445 100644
--- a/plugins/Mapstraction/allmap.php
+++ b/plugins/Mapstraction/allmap.php
@@ -61,12 +61,7 @@ class AllmapAction extends MapAction
 
     function title()
     {
-        if (!empty($this->profile->fullname)) {
-            // @todo FIXME: Bad i18n. Should be "%1$s (%2$s)".
-            $base = $this->profile->fullname . ' (' . $this->user->nickname . ') ';
-        } else {
-            $base = $this->user->nickname;
-        }
+        $base = $this->profile->getFancyName();
 
         if ($this->page == 1) {
             // TRANS: Page title.
diff --git a/plugins/Mapstraction/usermap.php b/plugins/Mapstraction/usermap.php
index 0ee956159..54412146e 100644
--- a/plugins/Mapstraction/usermap.php
+++ b/plugins/Mapstraction/usermap.php
@@ -58,12 +58,7 @@ class UsermapAction extends MapAction
 
     function title()
     {
-        if (!empty($this->profile->fullname)) {
-            // @todo FIXME: Bad i18n. Should be '%1$s (%2$s)'
-            $base = $this->profile->fullname . ' (' . $this->user->nickname . ')';
-        } else {
-            $base = $this->user->nickname;
-        }
+        $base = $this->profile->getFancyName();
 
         if ($this->page == 1) {
             // @todo CHECKME: inconsisten with paged variant below. " map" missing.
diff --git a/plugins/OStatus/classes/Ostatus_profile.php b/plugins/OStatus/classes/Ostatus_profile.php
index 1ae9717c7..3dd00de29 100644
--- a/plugins/OStatus/classes/Ostatus_profile.php
+++ b/plugins/OStatus/classes/Ostatus_profile.php
@@ -150,10 +150,10 @@ class Ostatus_profile extends Managed_DataObject
         } else if ($this->group_id && !$this->profile_id) {
             return true;
         } else if ($this->group_id && $this->profile_id) {
-            // TRANS: Server exception.
+            // TRANS: Server exception. %s is a URI.
             throw new ServerException(sprintf(_m('Invalid ostatus_profile state: both group and profile IDs set for %s.'),$this->uri));
         } else {
-            // TRANS: Server exception.
+            // TRANS: Server exception. %s is a URI.
             throw new ServerException(sprintf(_m('Invalid ostatus_profile state: both group and profile IDs empty for %s.'),$this->uri));
         }
     }
@@ -367,6 +367,7 @@ class Ostatus_profile extends Managed_DataObject
         } else if ($feed->localName == 'rss') { // @fixme check namespace
             $this->processRssFeed($feed, $source);
         } else {
+            // TRANS: Exception.
             throw new Exception(_m('Unknown feed format.'));
         }
     }
@@ -390,6 +391,7 @@ class Ostatus_profile extends Managed_DataObject
         $channels = $rss->getElementsByTagName('channel');
 
         if ($channels->length == 0) {
+            // TRANS: Exception.
             throw new Exception(_m('RSS feed without a channel.'));
         } else if ($channels->length > 1) {
             common_log(LOG_WARNING, __METHOD__ . ": more than one channel in an RSS feed");
@@ -517,7 +519,7 @@ class Ostatus_profile extends Managed_DataObject
             $sourceContent = $note->title;
         } else {
             // @fixme fetch from $sourceUrl?
-            // TRANS: Client exception. %s is a source URL.
+            // TRANS: Client exception. %s is a source URI.
             throw new ClientException(sprintf(_m('No content for notice %s.'),$sourceUri));
         }
 
@@ -551,7 +553,8 @@ class Ostatus_profile extends Managed_DataObject
                 // so we can fold-out the full version inline.
 
                 // @fixme I18N this tooltip will be saved with the site's default language
-                // TRANS: Shown when a notice is longer than supported and/or when attachments are present. At runtime this will usually be replaced with localized text from StatusNet core messages.
+                // TRANS: Shown when a notice is longer than supported and/or when attachments are present. At runtime
+                // TRANS: this will usually be replaced with localised text from StatusNet core messages.
                 $showMoreText = _m('Show more');
                 $attachUrl = common_local_url('attachment',
                                               array('attachment' => $attachment->id));
@@ -802,7 +805,7 @@ class Ostatus_profile extends Managed_DataObject
             return self::ensureFeedURL($feedurl, $hints);
         }
 
-        // TRANS: Exception.
+        // TRANS: Exception. %s is a URL.
         throw new Exception(sprintf(_m('Could not find a feed URL for profile page %s.'),$finalUrl));
     }
 
@@ -940,6 +943,7 @@ class Ostatus_profile extends Managed_DataObject
         }
 
         // XXX: make some educated guesses here
+        // TRANS: Feed sub exception.
         throw new FeedSubException(_m('Can\'t find enough profile information to make a feed.'));
     }
 
@@ -999,6 +1003,7 @@ class Ostatus_profile extends Managed_DataObject
             return;
         }
         if (!common_valid_http_url($url)) {
+            // TRANS: Server exception. %s is a URL.
             throw new ServerException(sprintf(_m("Invalid avatar URL %s."), $url));
         }
 
@@ -1009,6 +1014,7 @@ class Ostatus_profile extends Managed_DataObject
         }
         if (!$self) {
             throw new ServerException(sprintf(
+                // TRANS: Server exception. %s is a URI.
                 _m("Tried to update avatar for unsaved remote profile %s."),
                 $this->uri));
         }
@@ -1018,6 +1024,7 @@ class Ostatus_profile extends Managed_DataObject
         $temp_filename = tempnam(sys_get_temp_dir(), 'listener_avatar');
         try {
             if (!copy($url, $temp_filename)) {
+                // TRANS: Server exception. %s is a URL.
                 throw new ServerException(sprintf(_m("Unable to fetch avatar from %s."), $url));
             }
 
@@ -1300,7 +1307,7 @@ class Ostatus_profile extends Managed_DataObject
 
             $oprofile->profile_id = $profile->insert();
             if (!$oprofile->profile_id) {
-            // TRANS: Exception.
+            // TRANS: Server exception.
                 throw new ServerException(_m('Can\'t save local profile.'));
             }
         } else {
@@ -1311,7 +1318,7 @@ class Ostatus_profile extends Managed_DataObject
 
             $oprofile->group_id = $group->insert();
             if (!$oprofile->group_id) {
-                // TRANS: Exception.
+                // TRANS: Server exception.
                 throw new ServerException(_m('Can\'t save local profile.'));
             }
         }
@@ -1319,7 +1326,7 @@ class Ostatus_profile extends Managed_DataObject
         $ok = $oprofile->insert();
 
         if (!$ok) {
-            // TRANS: Exception.
+            // TRANS: Server exception.
             throw new ServerException(_m('Can\'t save OStatus profile.'));
         }
 
@@ -1758,6 +1765,7 @@ class Ostatus_profile extends Managed_DataObject
 
         if ($file_id === false) {
             common_log_db_error($file, "INSERT", __FILE__);
+            // TRANS: Server exception.
             throw new ServerException(_m('Could not store HTML content of long post as file.'));
         }
 
diff --git a/plugins/OStatus/locale/OStatus.pot b/plugins/OStatus/locale/OStatus.pot
index 2473e730f..745a87c98 100644
--- a/plugins/OStatus/locale/OStatus.pot
+++ b/plugins/OStatus/locale/OStatus.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-27 23:43+0000\n"
+"POT-Creation-Date: 2010-11-02 22:51+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"
@@ -119,13 +119,13 @@ msgstr ""
 msgid "Attempting to end PuSH subscription for feed with no hub."
 msgstr ""
 
-#. TRANS: Server exception.
+#. TRANS: Server exception. %s is a URI.
 #: classes/Ostatus_profile.php:192
 #, php-format
 msgid "Invalid ostatus_profile state: both group and profile IDs set for %s."
 msgstr ""
 
-#. TRANS: Server exception.
+#. TRANS: Server exception. %s is a URI.
 #: classes/Ostatus_profile.php:195
 #, php-format
 msgid "Invalid ostatus_profile state: both group and profile IDs empty for %s."
@@ -145,105 +145,113 @@ msgid ""
 "Activity entry."
 msgstr ""
 
-#: classes/Ostatus_profile.php:408
+#. TRANS: Exception.
+#: classes/Ostatus_profile.php:409
 msgid "Unknown feed format."
 msgstr ""
 
-#: classes/Ostatus_profile.php:431
+#. TRANS: Exception.
+#: classes/Ostatus_profile.php:433
 msgid "RSS feed without a channel."
 msgstr ""
 
 #. TRANS: Client exception.
-#: classes/Ostatus_profile.php:476
+#: classes/Ostatus_profile.php:478
 msgid "Can't handle that kind of post."
 msgstr ""
 
-#. TRANS: Client exception. %s is a source URL.
-#: classes/Ostatus_profile.php:559
+#. TRANS: Client exception. %s is a source URI.
+#: classes/Ostatus_profile.php:561
 #, php-format
 msgid "No content for notice %s."
 msgstr ""
 
-#. TRANS: Shown when a notice is longer than supported and/or when attachments are present.
-#: classes/Ostatus_profile.php:592
+#. TRANS: Shown when a notice is longer than supported and/or when attachments are present. At runtime
+#. TRANS: this will usually be replaced with localised text from StatusNet core messages.
+#: classes/Ostatus_profile.php:596
 msgid "Show more"
 msgstr ""
 
 #. TRANS: Exception. %s is a profile URL.
-#: classes/Ostatus_profile.php:785
+#: classes/Ostatus_profile.php:789
 #, php-format
 msgid "Could not reach profile page %s."
 msgstr ""
 
-#. TRANS: Exception.
-#: classes/Ostatus_profile.php:843
+#. TRANS: Exception. %s is a URL.
+#: classes/Ostatus_profile.php:847
 #, php-format
 msgid "Could not find a feed URL for profile page %s."
 msgstr ""
 
-#: classes/Ostatus_profile.php:980
+#. TRANS: Feed sub exception.
+#: classes/Ostatus_profile.php:985
 msgid "Can't find enough profile information to make a feed."
 msgstr ""
 
-#: classes/Ostatus_profile.php:1039
+#. TRANS: Server exception. %s is a URL.
+#: classes/Ostatus_profile.php:1045
 #, php-format
 msgid "Invalid avatar URL %s."
 msgstr ""
 
-#: classes/Ostatus_profile.php:1049
+#. TRANS: Server exception. %s is a URI.
+#: classes/Ostatus_profile.php:1056
 #, php-format
 msgid "Tried to update avatar for unsaved remote profile %s."
 msgstr ""
 
-#: classes/Ostatus_profile.php:1058
+#. TRANS: Server exception. %s is a URL.
+#: classes/Ostatus_profile.php:1066
 #, php-format
 msgid "Unable to fetch avatar from %s."
 msgstr ""
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1284
+#: classes/Ostatus_profile.php:1292
 msgid "Local user can't be referenced as remote."
 msgstr ""
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1289
+#: classes/Ostatus_profile.php:1297
 msgid "Local group can't be referenced as remote."
 msgstr ""
 
-#. TRANS: Exception.
-#: classes/Ostatus_profile.php:1341 classes/Ostatus_profile.php:1352
+#. TRANS: Server exception.
+#: classes/Ostatus_profile.php:1349 classes/Ostatus_profile.php:1360
 msgid "Can't save local profile."
 msgstr ""
 
-#. TRANS: Exception.
-#: classes/Ostatus_profile.php:1360
+#. TRANS: Server exception.
+#: classes/Ostatus_profile.php:1368
 msgid "Can't save OStatus profile."
 msgstr ""
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1619 classes/Ostatus_profile.php:1647
+#: classes/Ostatus_profile.php:1627 classes/Ostatus_profile.php:1655
 msgid "Not a valid webfinger address."
 msgstr ""
 
 #. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1729
+#: classes/Ostatus_profile.php:1737
 #, php-format
 msgid "Couldn't save profile for \"%s\"."
 msgstr ""
 
 #. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1748
+#: classes/Ostatus_profile.php:1756
 #, php-format
 msgid "Couldn't save ostatus_profile for \"%s\"."
 msgstr ""
 
 #. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1756
+#: classes/Ostatus_profile.php:1764
 #, php-format
 msgid "Couldn't find a valid profile for \"%s\"."
 msgstr ""
 
-#: classes/Ostatus_profile.php:1798
+#. TRANS: Server exception.
+#: classes/Ostatus_profile.php:1807
 msgid "Could not store HTML content of long post as file."
 msgstr ""
 
diff --git a/plugins/OStatus/locale/fr/LC_MESSAGES/OStatus.po b/plugins/OStatus/locale/fr/LC_MESSAGES/OStatus.po
index b0ef34b6b..2d0a49c31 100644
--- a/plugins/OStatus/locale/fr/LC_MESSAGES/OStatus.po
+++ b/plugins/OStatus/locale/fr/LC_MESSAGES/OStatus.po
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OStatus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-27 23:43+0000\n"
-"PO-Revision-Date: 2010-10-27 23:47:14+0000\n"
+"POT-Creation-Date: 2010-11-02 22:51+0000\n"
+"PO-Revision-Date: 2010-11-02 22:54:51+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-10-23 19:00:35+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r75596); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-29 16:13:55+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r75875); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-ostatus\n"
@@ -131,7 +131,7 @@ msgstr ""
 "Tente d’arrêter l’inscription PuSH à un flux d’information sans "
 "concentrateur."
 
-#. TRANS: Server exception.
+#. TRANS: Server exception. %s is a URI.
 #: classes/Ostatus_profile.php:192
 #, php-format
 msgid "Invalid ostatus_profile state: both group and profile IDs set for %s."
@@ -139,7 +139,7 @@ msgstr ""
 "État invalide du profil OStatus : identifiants à la fois de groupe et de "
 "profil définis pour « %s »."
 
-#. TRANS: Server exception.
+#. TRANS: Server exception. %s is a URI.
 #: classes/Ostatus_profile.php:195
 #, php-format
 msgid "Invalid ostatus_profile state: both group and profile IDs empty for %s."
@@ -163,111 +163,119 @@ msgstr ""
 "Type invalide passé à la méthode « Ostatus_profile::notify ». Ce doit être "
 "une chaîne XML ou une entrée « Activity »."
 
-#: classes/Ostatus_profile.php:408
+#. TRANS: Exception.
+#: classes/Ostatus_profile.php:409
 msgid "Unknown feed format."
 msgstr "Format de flux d’information inconnu."
 
-#: classes/Ostatus_profile.php:431
+#. TRANS: Exception.
+#: classes/Ostatus_profile.php:433
 msgid "RSS feed without a channel."
 msgstr "Flux RSS sans canal."
 
 #. TRANS: Client exception.
-#: classes/Ostatus_profile.php:476
+#: classes/Ostatus_profile.php:478
 msgid "Can't handle that kind of post."
 msgstr "Impossible de gérer cette sorte de publication."
 
-#. TRANS: Client exception. %s is a source URL.
-#: classes/Ostatus_profile.php:559
+#. TRANS: Client exception. %s is a source URI.
+#: classes/Ostatus_profile.php:561
 #, php-format
 msgid "No content for notice %s."
 msgstr "Aucun contenu dans l’avis « %s »."
 
-#. TRANS: Shown when a notice is longer than supported and/or when attachments are present.
-#: classes/Ostatus_profile.php:592
+#. TRANS: Shown when a notice is longer than supported and/or when attachments are present. At runtime
+#. TRANS: this will usually be replaced with localised text from StatusNet core messages.
+#: classes/Ostatus_profile.php:596
 msgid "Show more"
 msgstr "Voir davantage"
 
 #. TRANS: Exception. %s is a profile URL.
-#: classes/Ostatus_profile.php:785
+#: classes/Ostatus_profile.php:789
 #, php-format
 msgid "Could not reach profile page %s."
 msgstr "Impossible d’atteindre la page de profil « %s »."
 
-#. TRANS: Exception.
-#: classes/Ostatus_profile.php:843
+#. TRANS: Exception. %s is a URL.
+#: classes/Ostatus_profile.php:847
 #, php-format
 msgid "Could not find a feed URL for profile page %s."
 msgstr ""
 "Impossible de trouver une adresse URL de flux d’information pour la page de "
 "profil « %s »."
 
-#: classes/Ostatus_profile.php:980
+#. TRANS: Feed sub exception.
+#: classes/Ostatus_profile.php:985
 msgid "Can't find enough profile information to make a feed."
 msgstr ""
 "Impossible de trouver assez d’informations de profil pour créer un flux "
 "d’information."
 
-#: classes/Ostatus_profile.php:1039
+#. TRANS: Server exception. %s is a URL.
+#: classes/Ostatus_profile.php:1045
 #, php-format
 msgid "Invalid avatar URL %s."
 msgstr "Adresse URL d’avatar « %s » invalide."
 
-#: classes/Ostatus_profile.php:1049
+#. TRANS: Server exception. %s is a URI.
+#: classes/Ostatus_profile.php:1056
 #, php-format
 msgid "Tried to update avatar for unsaved remote profile %s."
 msgstr ""
 "Tente de mettre à jour l’avatar associé au profil distant non sauvegardé « %s "
 "»."
 
-#: classes/Ostatus_profile.php:1058
+#. TRANS: Server exception. %s is a URL.
+#: classes/Ostatus_profile.php:1066
 #, php-format
 msgid "Unable to fetch avatar from %s."
 msgstr "Impossible de récupérer l’avatar depuis « %s »."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1284
+#: classes/Ostatus_profile.php:1292
 msgid "Local user can't be referenced as remote."
 msgstr "L’utilisateur local ne peut être référencé comme distant."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1289
+#: classes/Ostatus_profile.php:1297
 msgid "Local group can't be referenced as remote."
 msgstr "Le groupe local ne peut être référencé comme distant."
 
-#. TRANS: Exception.
-#: classes/Ostatus_profile.php:1341 classes/Ostatus_profile.php:1352
+#. TRANS: Server exception.
+#: classes/Ostatus_profile.php:1349 classes/Ostatus_profile.php:1360
 msgid "Can't save local profile."
 msgstr "Impossible de sauvegarder le profil local."
 
-#. TRANS: Exception.
-#: classes/Ostatus_profile.php:1360
+#. TRANS: Server exception.
+#: classes/Ostatus_profile.php:1368
 msgid "Can't save OStatus profile."
 msgstr "Impossible de sauvegarder le profil OStatus."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1619 classes/Ostatus_profile.php:1647
+#: classes/Ostatus_profile.php:1627 classes/Ostatus_profile.php:1655
 msgid "Not a valid webfinger address."
 msgstr "Ce n’est pas une adresse « webfinger » valide."
 
 #. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1729
+#: classes/Ostatus_profile.php:1737
 #, php-format
 msgid "Couldn't save profile for \"%s\"."
 msgstr "Impossible de sauvegarder le profil pour « %s »."
 
 #. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1748
+#: classes/Ostatus_profile.php:1756
 #, php-format
 msgid "Couldn't save ostatus_profile for \"%s\"."
 msgstr "Impossible d’enregistrer le profil OStatus pour « %s »."
 
 #. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1756
+#: classes/Ostatus_profile.php:1764
 #, php-format
 msgid "Couldn't find a valid profile for \"%s\"."
 msgstr "Impossible de trouver un profil valide pour « %s »."
 
-#: classes/Ostatus_profile.php:1798
+#. TRANS: Server exception.
+#: classes/Ostatus_profile.php:1807
 msgid "Could not store HTML content of long post as file."
 msgstr ""
 "Impossible de stocker le contenu HTML d’une longue publication en un fichier."
diff --git a/plugins/OStatus/locale/ia/LC_MESSAGES/OStatus.po b/plugins/OStatus/locale/ia/LC_MESSAGES/OStatus.po
index fdeba50c2..f2f322de0 100644
--- a/plugins/OStatus/locale/ia/LC_MESSAGES/OStatus.po
+++ b/plugins/OStatus/locale/ia/LC_MESSAGES/OStatus.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OStatus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-27 23:43+0000\n"
-"PO-Revision-Date: 2010-10-27 23:47:15+0000\n"
+"POT-Creation-Date: 2010-11-02 22:51+0000\n"
+"PO-Revision-Date: 2010-11-02 22:54:51+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-10-23 19:00:35+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r75596); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-29 16:13:55+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r75875); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-ostatus\n"
@@ -126,14 +126,14 @@ msgstr "Tentativa de comenciar subscription PuSH pro syndication sin centro."
 msgid "Attempting to end PuSH subscription for feed with no hub."
 msgstr "Tentativa de terminar subscription PuSH pro syndication sin centro."
 
-#. TRANS: Server exception.
+#. TRANS: Server exception. %s is a URI.
 #: classes/Ostatus_profile.php:192
 #, php-format
 msgid "Invalid ostatus_profile state: both group and profile IDs set for %s."
 msgstr ""
 "Stato ostatus_profile invalide: IDs e de gruppo e de profilo definite pro %s."
 
-#. TRANS: Server exception.
+#. TRANS: Server exception. %s is a URI.
 #: classes/Ostatus_profile.php:195
 #, php-format
 msgid "Invalid ostatus_profile state: both group and profile IDs empty for %s."
@@ -156,106 +156,114 @@ msgstr ""
 "Typo invalide passate a Ostatos_profile::notify. Illo debe esser catena XML "
 "o entrata Activity."
 
-#: classes/Ostatus_profile.php:408
+#. TRANS: Exception.
+#: classes/Ostatus_profile.php:409
 msgid "Unknown feed format."
 msgstr "Formato de syndication incognite."
 
-#: classes/Ostatus_profile.php:431
+#. TRANS: Exception.
+#: classes/Ostatus_profile.php:433
 msgid "RSS feed without a channel."
 msgstr "Syndication RSS sin canal."
 
 #. TRANS: Client exception.
-#: classes/Ostatus_profile.php:476
+#: classes/Ostatus_profile.php:478
 msgid "Can't handle that kind of post."
 msgstr "Non pote tractar iste typo de message."
 
-#. TRANS: Client exception. %s is a source URL.
-#: classes/Ostatus_profile.php:559
+#. TRANS: Client exception. %s is a source URI.
+#: classes/Ostatus_profile.php:561
 #, php-format
 msgid "No content for notice %s."
 msgstr "Nulle contento pro nota %s."
 
-#. TRANS: Shown when a notice is longer than supported and/or when attachments are present.
-#: classes/Ostatus_profile.php:592
+#. TRANS: Shown when a notice is longer than supported and/or when attachments are present. At runtime
+#. TRANS: this will usually be replaced with localised text from StatusNet core messages.
+#: classes/Ostatus_profile.php:596
 msgid "Show more"
 msgstr "Monstrar plus"
 
 #. TRANS: Exception. %s is a profile URL.
-#: classes/Ostatus_profile.php:785
+#: classes/Ostatus_profile.php:789
 #, php-format
 msgid "Could not reach profile page %s."
 msgstr "Non poteva attinger pagina de profilo %s."
 
-#. TRANS: Exception.
-#: classes/Ostatus_profile.php:843
+#. TRANS: Exception. %s is a URL.
+#: classes/Ostatus_profile.php:847
 #, php-format
 msgid "Could not find a feed URL for profile page %s."
 msgstr "Non poteva trovar un URL de syndication pro pagina de profilo %s."
 
-#: classes/Ostatus_profile.php:980
+#. TRANS: Feed sub exception.
+#: classes/Ostatus_profile.php:985
 msgid "Can't find enough profile information to make a feed."
 msgstr ""
 "Non pote trovar satis de information de profilo pro facer un syndication."
 
-#: classes/Ostatus_profile.php:1039
+#. TRANS: Server exception. %s is a URL.
+#: classes/Ostatus_profile.php:1045
 #, php-format
 msgid "Invalid avatar URL %s."
 msgstr "URL de avatar %s invalide."
 
-#: classes/Ostatus_profile.php:1049
+#. TRANS: Server exception. %s is a URI.
+#: classes/Ostatus_profile.php:1056
 #, php-format
 msgid "Tried to update avatar for unsaved remote profile %s."
 msgstr "Tentava actualisar avatar pro profilo remote non salveguardate %s."
 
-#: classes/Ostatus_profile.php:1058
+#. TRANS: Server exception. %s is a URL.
+#: classes/Ostatus_profile.php:1066
 #, php-format
 msgid "Unable to fetch avatar from %s."
 msgstr "Incapace de obtener avatar ab %s."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1284
+#: classes/Ostatus_profile.php:1292
 msgid "Local user can't be referenced as remote."
 msgstr "Usator local non pote esser referentiate como remote."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1289
+#: classes/Ostatus_profile.php:1297
 msgid "Local group can't be referenced as remote."
 msgstr "Gruppo local non pote esser referentiate como remote."
 
-#. TRANS: Exception.
-#: classes/Ostatus_profile.php:1341 classes/Ostatus_profile.php:1352
+#. TRANS: Server exception.
+#: classes/Ostatus_profile.php:1349 classes/Ostatus_profile.php:1360
 msgid "Can't save local profile."
 msgstr "Non pote salveguardar profilo local."
 
-#. TRANS: Exception.
-#: classes/Ostatus_profile.php:1360
+#. TRANS: Server exception.
+#: classes/Ostatus_profile.php:1368
 msgid "Can't save OStatus profile."
 msgstr "Non pote salveguardar profilo OStatus."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1619 classes/Ostatus_profile.php:1647
+#: classes/Ostatus_profile.php:1627 classes/Ostatus_profile.php:1655
 msgid "Not a valid webfinger address."
 msgstr "Adresse webfinger invalide."
 
 #. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1729
+#: classes/Ostatus_profile.php:1737
 #, php-format
 msgid "Couldn't save profile for \"%s\"."
 msgstr "Non poteva salveguardar profilo pro \"%s\"."
 
 #. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1748
+#: classes/Ostatus_profile.php:1756
 #, php-format
 msgid "Couldn't save ostatus_profile for \"%s\"."
 msgstr "Non poteva salveguardar osatus_profile pro %s."
 
 #. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1756
+#: classes/Ostatus_profile.php:1764
 #, php-format
 msgid "Couldn't find a valid profile for \"%s\"."
 msgstr "Non poteva trovar un profilo valide pro \"%s\"."
 
-#: classes/Ostatus_profile.php:1798
+#. TRANS: Server exception.
+#: classes/Ostatus_profile.php:1807
 msgid "Could not store HTML content of long post as file."
 msgstr "Non poteva immagazinar contento HTML de longe message como file."
 
diff --git a/plugins/OStatus/locale/mk/LC_MESSAGES/OStatus.po b/plugins/OStatus/locale/mk/LC_MESSAGES/OStatus.po
index 44baf29ee..fe2cb7e10 100644
--- a/plugins/OStatus/locale/mk/LC_MESSAGES/OStatus.po
+++ b/plugins/OStatus/locale/mk/LC_MESSAGES/OStatus.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OStatus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-27 23:43+0000\n"
-"PO-Revision-Date: 2010-10-27 23:47:15+0000\n"
+"POT-Creation-Date: 2010-11-02 22:51+0000\n"
+"PO-Revision-Date: 2010-11-02 22:54:51+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-10-23 19:00:35+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r75596); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-29 16:13:55+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r75875); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-ostatus\n"
@@ -127,7 +127,7 @@ msgid "Attempting to end PuSH subscription for feed with no hub."
 msgstr ""
 "Се обидувам да ставам крај на PuSH-претплатата за емитување без средиште."
 
-#. TRANS: Server exception.
+#. TRANS: Server exception. %s is a URI.
 #: classes/Ostatus_profile.php:192
 #, php-format
 msgid "Invalid ostatus_profile state: both group and profile IDs set for %s."
@@ -135,7 +135,7 @@ msgstr ""
 "Неважечка ostatus_profile-состојба: назнаките (ID) на групата и профилот се "
 "наместени за %s."
 
-#. TRANS: Server exception.
+#. TRANS: Server exception. %s is a URI.
 #: classes/Ostatus_profile.php:195
 #, php-format
 msgid "Invalid ostatus_profile state: both group and profile IDs empty for %s."
@@ -159,106 +159,114 @@ msgstr ""
 "На Ostatus_profile::notify е пренесен неважечки тип. Мора да биде XML-низа "
 "или ставка во Activity."
 
-#: classes/Ostatus_profile.php:408
+#. TRANS: Exception.
+#: classes/Ostatus_profile.php:409
 msgid "Unknown feed format."
 msgstr "Непознат формат на каналско емитување."
 
-#: classes/Ostatus_profile.php:431
+#. TRANS: Exception.
+#: classes/Ostatus_profile.php:433
 msgid "RSS feed without a channel."
 msgstr "RSS-емитување без канал."
 
 #. TRANS: Client exception.
-#: classes/Ostatus_profile.php:476
+#: classes/Ostatus_profile.php:478
 msgid "Can't handle that kind of post."
 msgstr "Не можам да работам со таква објава."
 
-#. TRANS: Client exception. %s is a source URL.
-#: classes/Ostatus_profile.php:559
+#. TRANS: Client exception. %s is a source URI.
+#: classes/Ostatus_profile.php:561
 #, php-format
 msgid "No content for notice %s."
 msgstr "Нема содржина за забелешката %s."
 
-#. TRANS: Shown when a notice is longer than supported and/or when attachments are present.
-#: classes/Ostatus_profile.php:592
+#. TRANS: Shown when a notice is longer than supported and/or when attachments are present. At runtime
+#. TRANS: this will usually be replaced with localised text from StatusNet core messages.
+#: classes/Ostatus_profile.php:596
 msgid "Show more"
 msgstr "Повеќе"
 
 #. TRANS: Exception. %s is a profile URL.
-#: classes/Ostatus_profile.php:785
+#: classes/Ostatus_profile.php:789
 #, php-format
 msgid "Could not reach profile page %s."
 msgstr "Не можев да ја добијам профилната страница %s."
 
-#. TRANS: Exception.
-#: classes/Ostatus_profile.php:843
+#. TRANS: Exception. %s is a URL.
+#: classes/Ostatus_profile.php:847
 #, php-format
 msgid "Could not find a feed URL for profile page %s."
 msgstr "Не можев да пронајдам каналска URL-адреса за профилната страница %s."
 
-#: classes/Ostatus_profile.php:980
+#. TRANS: Feed sub exception.
+#: classes/Ostatus_profile.php:985
 msgid "Can't find enough profile information to make a feed."
 msgstr "Не можев да најдам доволно профилни податоци за да направам канал."
 
-#: classes/Ostatus_profile.php:1039
+#. TRANS: Server exception. %s is a URL.
+#: classes/Ostatus_profile.php:1045
 #, php-format
 msgid "Invalid avatar URL %s."
 msgstr "Неважечка URL-адреса за аватарот: %s."
 
-#: classes/Ostatus_profile.php:1049
+#. TRANS: Server exception. %s is a URI.
+#: classes/Ostatus_profile.php:1056
 #, php-format
 msgid "Tried to update avatar for unsaved remote profile %s."
 msgstr ""
 "Се обидов да го подновам аватарот за незачуваниот далечински профил %s."
 
-#: classes/Ostatus_profile.php:1058
+#. TRANS: Server exception. %s is a URL.
+#: classes/Ostatus_profile.php:1066
 #, php-format
 msgid "Unable to fetch avatar from %s."
 msgstr "Не можам да го добијам аватарот од %s."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1284
+#: classes/Ostatus_profile.php:1292
 msgid "Local user can't be referenced as remote."
 msgstr "Локалниот корисник не може да се наведе како далечински."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1289
+#: classes/Ostatus_profile.php:1297
 msgid "Local group can't be referenced as remote."
 msgstr "Локалната група не може да се наведе како далечинска."
 
-#. TRANS: Exception.
-#: classes/Ostatus_profile.php:1341 classes/Ostatus_profile.php:1352
+#. TRANS: Server exception.
+#: classes/Ostatus_profile.php:1349 classes/Ostatus_profile.php:1360
 msgid "Can't save local profile."
 msgstr "Не можам да го зачувам локалниот профил."
 
-#. TRANS: Exception.
-#: classes/Ostatus_profile.php:1360
+#. TRANS: Server exception.
+#: classes/Ostatus_profile.php:1368
 msgid "Can't save OStatus profile."
 msgstr "Не можам да го зачувам профилот од OStatus."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1619 classes/Ostatus_profile.php:1647
+#: classes/Ostatus_profile.php:1627 classes/Ostatus_profile.php:1655
 msgid "Not a valid webfinger address."
 msgstr "Ова не е важечка Webfinger-адреса"
 
 #. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1729
+#: classes/Ostatus_profile.php:1737
 #, php-format
 msgid "Couldn't save profile for \"%s\"."
 msgstr "Не можам да го зачувам профилот за „%s“."
 
 #. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1748
+#: classes/Ostatus_profile.php:1756
 #, php-format
 msgid "Couldn't save ostatus_profile for \"%s\"."
 msgstr "Не можам да го зачувам ostatus_profile за „%s“."
 
 #. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1756
+#: classes/Ostatus_profile.php:1764
 #, php-format
 msgid "Couldn't find a valid profile for \"%s\"."
 msgstr "Не можев да пронајдам важечки профил за „%s“."
 
-#: classes/Ostatus_profile.php:1798
+#. TRANS: Server exception.
+#: classes/Ostatus_profile.php:1807
 msgid "Could not store HTML content of long post as file."
 msgstr ""
 "Не можам да ја складирам HTML-содржината на долгата објава како податотека."
diff --git a/plugins/OStatus/locale/nl/LC_MESSAGES/OStatus.po b/plugins/OStatus/locale/nl/LC_MESSAGES/OStatus.po
index 7ffad8df9..d37b8cb01 100644
--- a/plugins/OStatus/locale/nl/LC_MESSAGES/OStatus.po
+++ b/plugins/OStatus/locale/nl/LC_MESSAGES/OStatus.po
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OStatus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-27 23:43+0000\n"
-"PO-Revision-Date: 2010-10-27 23:47:16+0000\n"
+"POT-Creation-Date: 2010-11-02 22:51+0000\n"
+"PO-Revision-Date: 2010-11-02 22:54:51+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-10-23 19:00:35+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r75596); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-29 16:13:55+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r75875); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-ostatus\n"
@@ -133,7 +133,7 @@ msgid "Attempting to end PuSH subscription for feed with no hub."
 msgstr ""
 "Aan het proberen een PuSH-abonnement te verwijderen voor een feed zonder hub."
 
-#. TRANS: Server exception.
+#. TRANS: Server exception. %s is a URI.
 #: classes/Ostatus_profile.php:192
 #, php-format
 msgid "Invalid ostatus_profile state: both group and profile IDs set for %s."
@@ -141,7 +141,7 @@ msgstr ""
 "Ongeldige ostatus_profile status: het ID voor zowel de groep als het profiel "
 "voor %s is ingesteld."
 
-#. TRANS: Server exception.
+#. TRANS: Server exception. %s is a URI.
 #: classes/Ostatus_profile.php:195
 #, php-format
 msgid "Invalid ostatus_profile state: both group and profile IDs empty for %s."
@@ -165,112 +165,120 @@ msgstr ""
 "Ongeldig type doorgegeven aan Ostatus_profile::notify. Het moet een XML-"
 "string of Activity zijn."
 
-#: classes/Ostatus_profile.php:408
+#. TRANS: Exception.
+#: classes/Ostatus_profile.php:409
 msgid "Unknown feed format."
 msgstr "Onbekend feedformaat"
 
-#: classes/Ostatus_profile.php:431
+#. TRANS: Exception.
+#: classes/Ostatus_profile.php:433
 msgid "RSS feed without a channel."
 msgstr "RSS-feed zonder kanaal."
 
 #. TRANS: Client exception.
-#: classes/Ostatus_profile.php:476
+#: classes/Ostatus_profile.php:478
 msgid "Can't handle that kind of post."
 msgstr "Dat type post kan niet verwerkt worden."
 
-#. TRANS: Client exception. %s is a source URL.
-#: classes/Ostatus_profile.php:559
+#. TRANS: Client exception. %s is a source URI.
+#: classes/Ostatus_profile.php:561
 #, php-format
 msgid "No content for notice %s."
 msgstr "Geen inhoud voor mededeling %s."
 
-#. TRANS: Shown when a notice is longer than supported and/or when attachments are present.
-#: classes/Ostatus_profile.php:592
+#. TRANS: Shown when a notice is longer than supported and/or when attachments are present. At runtime
+#. TRANS: this will usually be replaced with localised text from StatusNet core messages.
+#: classes/Ostatus_profile.php:596
 msgid "Show more"
 msgstr "Meer weergeven"
 
 #. TRANS: Exception. %s is a profile URL.
-#: classes/Ostatus_profile.php:785
+#: classes/Ostatus_profile.php:789
 #, php-format
 msgid "Could not reach profile page %s."
 msgstr "Het was niet mogelijk de profielpagina %s te bereiken."
 
-#. TRANS: Exception.
-#: classes/Ostatus_profile.php:843
+#. TRANS: Exception. %s is a URL.
+#: classes/Ostatus_profile.php:847
 #, php-format
 msgid "Could not find a feed URL for profile page %s."
 msgstr "Het was niet mogelijk de feed-URL voor de profielpagina %s te vinden."
 
-#: classes/Ostatus_profile.php:980
+#. TRANS: Feed sub exception.
+#: classes/Ostatus_profile.php:985
 msgid "Can't find enough profile information to make a feed."
 msgstr ""
 "Het was niet mogelijk voldoende profielinformatie te vinden om een feed te "
 "maken."
 
-#: classes/Ostatus_profile.php:1039
+#. TRANS: Server exception. %s is a URL.
+#: classes/Ostatus_profile.php:1045
 #, php-format
 msgid "Invalid avatar URL %s."
 msgstr "Ongeldige avatar-URL %s."
 
-#: classes/Ostatus_profile.php:1049
+#. TRANS: Server exception. %s is a URI.
+#: classes/Ostatus_profile.php:1056
 #, php-format
 msgid "Tried to update avatar for unsaved remote profile %s."
 msgstr ""
 "Geprobeerd om een avatar bij te werken voor het niet opgeslagen profiel %s."
 
-#: classes/Ostatus_profile.php:1058
+#. TRANS: Server exception. %s is a URL.
+#: classes/Ostatus_profile.php:1066
 #, php-format
 msgid "Unable to fetch avatar from %s."
 msgstr "Het was niet mogelijk de avatar op te halen van %s."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1284
+#: classes/Ostatus_profile.php:1292
 msgid "Local user can't be referenced as remote."
 msgstr ""
 "Naar een lokale gebruiker kan niet verwezen worden alsof die zich bij een "
 "andere dienst bevindt."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1289
+#: classes/Ostatus_profile.php:1297
 msgid "Local group can't be referenced as remote."
 msgstr ""
 "Naar een lokale groep kan niet verwezen worden alsof die zich bij een andere "
 "dienst bevindt."
 
-#. TRANS: Exception.
-#: classes/Ostatus_profile.php:1341 classes/Ostatus_profile.php:1352
+#. TRANS: Server exception.
+#: classes/Ostatus_profile.php:1349 classes/Ostatus_profile.php:1360
 msgid "Can't save local profile."
 msgstr "Het was niet mogelijk het lokale profiel op te slaan."
 
-#. TRANS: Exception.
-#: classes/Ostatus_profile.php:1360
+#. TRANS: Server exception.
+#: classes/Ostatus_profile.php:1368
 msgid "Can't save OStatus profile."
 msgstr "Het was niet mogelijk het Ostatusprofiel op te slaan."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1619 classes/Ostatus_profile.php:1647
+#: classes/Ostatus_profile.php:1627 classes/Ostatus_profile.php:1655
 msgid "Not a valid webfinger address."
 msgstr "Geen geldig webfingeradres."
 
 #. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1729
+#: classes/Ostatus_profile.php:1737
 #, php-format
 msgid "Couldn't save profile for \"%s\"."
 msgstr "Het was niet mogelijk het profiel voor \"%s\" op te slaan."
 
 #. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1748
+#: classes/Ostatus_profile.php:1756
 #, php-format
 msgid "Couldn't save ostatus_profile for \"%s\"."
 msgstr "Het was niet mogelijk het ostatus_profile voor \"%s\" op te slaan."
 
 #. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1756
+#: classes/Ostatus_profile.php:1764
 #, php-format
 msgid "Couldn't find a valid profile for \"%s\"."
 msgstr "Er is geen geldig profiel voor \"%s\" gevonden."
 
-#: classes/Ostatus_profile.php:1798
+#. TRANS: Server exception.
+#: classes/Ostatus_profile.php:1807
 msgid "Could not store HTML content of long post as file."
 msgstr ""
 "Het was niet mogelijk de HTML-inhoud van het lange bericht als bestand op te "
diff --git a/plugins/OStatus/locale/uk/LC_MESSAGES/OStatus.po b/plugins/OStatus/locale/uk/LC_MESSAGES/OStatus.po
index 7d3ffb80f..88ba205b1 100644
--- a/plugins/OStatus/locale/uk/LC_MESSAGES/OStatus.po
+++ b/plugins/OStatus/locale/uk/LC_MESSAGES/OStatus.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OStatus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-27 23:43+0000\n"
-"PO-Revision-Date: 2010-10-27 23:47:17+0000\n"
+"POT-Creation-Date: 2010-11-02 22:51+0000\n"
+"PO-Revision-Date: 2010-11-02 22:54:51+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-10-23 19:00:35+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r75596); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2010-10-29 16:13:55+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r75875); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-ostatus\n"
@@ -130,7 +130,7 @@ msgstr ""
 "Спроба скасувати підписку за допомогою PuSH до веб-стрічки, котра не має "
 "вузла."
 
-#. TRANS: Server exception.
+#. TRANS: Server exception. %s is a URI.
 #: classes/Ostatus_profile.php:192
 #, php-format
 msgid "Invalid ostatus_profile state: both group and profile IDs set for %s."
@@ -138,7 +138,7 @@ msgstr ""
 "Невірний стан параметру ostatus_profile: як групові, так і персональні "
 "ідентифікатори встановлено для %s."
 
-#. TRANS: Server exception.
+#. TRANS: Server exception. %s is a URI.
 #: classes/Ostatus_profile.php:195
 #, php-format
 msgid "Invalid ostatus_profile state: both group and profile IDs empty for %s."
@@ -162,106 +162,114 @@ msgstr ""
 "До параметру Ostatus_profile::notify передано невірний тип. Це має бути або "
 "рядок у форматі XML, або запис активності."
 
-#: classes/Ostatus_profile.php:408
+#. TRANS: Exception.
+#: classes/Ostatus_profile.php:409
 msgid "Unknown feed format."
 msgstr "Невідомий формат веб-стрічки."
 
-#: classes/Ostatus_profile.php:431
+#. TRANS: Exception.
+#: classes/Ostatus_profile.php:433
 msgid "RSS feed without a channel."
 msgstr "RSS-стрічка не має каналу."
 
 #. TRANS: Client exception.
-#: classes/Ostatus_profile.php:476
+#: classes/Ostatus_profile.php:478
 msgid "Can't handle that kind of post."
 msgstr "Не вдається обробити такий тип допису."
 
-#. TRANS: Client exception. %s is a source URL.
-#: classes/Ostatus_profile.php:559
+#. TRANS: Client exception. %s is a source URI.
+#: classes/Ostatus_profile.php:561
 #, php-format
 msgid "No content for notice %s."
 msgstr "Допис %s не має змісту."
 
-#. TRANS: Shown when a notice is longer than supported and/or when attachments are present.
-#: classes/Ostatus_profile.php:592
+#. TRANS: Shown when a notice is longer than supported and/or when attachments are present. At runtime
+#. TRANS: this will usually be replaced with localised text from StatusNet core messages.
+#: classes/Ostatus_profile.php:596
 msgid "Show more"
 msgstr "Розгорнути"
 
 #. TRANS: Exception. %s is a profile URL.
-#: classes/Ostatus_profile.php:785
+#: classes/Ostatus_profile.php:789
 #, php-format
 msgid "Could not reach profile page %s."
 msgstr "Не вдалося досягти сторінки профілю %s."
 
-#. TRANS: Exception.
-#: classes/Ostatus_profile.php:843
+#. TRANS: Exception. %s is a URL.
+#: classes/Ostatus_profile.php:847
 #, php-format
 msgid "Could not find a feed URL for profile page %s."
 msgstr "Не вдалося знайти URL веб-стрічки для сторінки профілю %s."
 
-#: classes/Ostatus_profile.php:980
+#. TRANS: Feed sub exception.
+#: classes/Ostatus_profile.php:985
 msgid "Can't find enough profile information to make a feed."
 msgstr ""
 "Не можу знайти достатньо інформації про профіль, аби сформувати веб-стрічку."
 
-#: classes/Ostatus_profile.php:1039
+#. TRANS: Server exception. %s is a URL.
+#: classes/Ostatus_profile.php:1045
 #, php-format
 msgid "Invalid avatar URL %s."
 msgstr "Невірна URL-адреса аватари %s."
 
-#: classes/Ostatus_profile.php:1049
+#. TRANS: Server exception. %s is a URI.
+#: classes/Ostatus_profile.php:1056
 #, php-format
 msgid "Tried to update avatar for unsaved remote profile %s."
 msgstr "Намагаюся оновити аватару для не збереженого віддаленого профілю %s."
 
-#: classes/Ostatus_profile.php:1058
+#. TRANS: Server exception. %s is a URL.
+#: classes/Ostatus_profile.php:1066
 #, php-format
 msgid "Unable to fetch avatar from %s."
 msgstr "Неможливо завантажити аватару з %s."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1284
+#: classes/Ostatus_profile.php:1292
 msgid "Local user can't be referenced as remote."
 msgstr "Місцевий користувач не може бути зазначеним у якості віддаленого."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1289
+#: classes/Ostatus_profile.php:1297
 msgid "Local group can't be referenced as remote."
 msgstr "Локальну спільноту не можна зазначити у якості віддаленої."
 
-#. TRANS: Exception.
-#: classes/Ostatus_profile.php:1341 classes/Ostatus_profile.php:1352
+#. TRANS: Server exception.
+#: classes/Ostatus_profile.php:1349 classes/Ostatus_profile.php:1360
 msgid "Can't save local profile."
 msgstr "Не вдається зберегти місцевий профіль."
 
-#. TRANS: Exception.
-#: classes/Ostatus_profile.php:1360
+#. TRANS: Server exception.
+#: classes/Ostatus_profile.php:1368
 msgid "Can't save OStatus profile."
 msgstr "Не вдається зберегти профіль OStatus."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1619 classes/Ostatus_profile.php:1647
+#: classes/Ostatus_profile.php:1627 classes/Ostatus_profile.php:1655
 msgid "Not a valid webfinger address."
 msgstr "Це недійсна адреса для протоколу WebFinger."
 
 #. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1729
+#: classes/Ostatus_profile.php:1737
 #, php-format
 msgid "Couldn't save profile for \"%s\"."
 msgstr "Не можу зберегти профіль для «%s»."
 
 #. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1748
+#: classes/Ostatus_profile.php:1756
 #, php-format
 msgid "Couldn't save ostatus_profile for \"%s\"."
 msgstr "Не можу зберегти профіль OStatus для «%s»."
 
 #. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1756
+#: classes/Ostatus_profile.php:1764
 #, php-format
 msgid "Couldn't find a valid profile for \"%s\"."
 msgstr "не можу знайти відповідний й профіль для «%s»."
 
-#: classes/Ostatus_profile.php:1798
+#. TRANS: Server exception.
+#: classes/Ostatus_profile.php:1807
 msgid "Could not store HTML content of long post as file."
 msgstr "Не можу зберегти HTML місткого допису у якості файлу."
 
diff --git a/plugins/Realtime/locale/ia/LC_MESSAGES/Realtime.po b/plugins/Realtime/locale/ia/LC_MESSAGES/Realtime.po
new file mode 100644
index 000000000..94fdb4dcc
--- /dev/null
+++ b/plugins/Realtime/locale/ia/LC_MESSAGES/Realtime.po
@@ -0,0 +1,58 @@
+# Translation of StatusNet - Realtime to Interlingua (Interlingua)
+# Expored from translatewiki.net
+#
+# Author: McDutchie
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Realtime\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-11-02 22:51+0000\n"
+"PO-Revision-Date: 2010-11-02 22:54:57+0000\n"
+"Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-11-02 19:54:39+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r75875); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: ia\n"
+"X-Message-Group: #out-statusnet-plugin-realtime\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Text label for realtime view "play" button, usually replaced by an icon.
+#: RealtimePlugin.php:339
+msgctxt "BUTTON"
+msgid "Play"
+msgstr "Reproducer"
+
+#. TRANS: Tooltip for realtime view "play" button.
+#: RealtimePlugin.php:341
+msgctxt "TOOLTIP"
+msgid "Play"
+msgstr "Reproducer"
+
+#. TRANS: Text label for realtime view "pause" button
+#: RealtimePlugin.php:343
+msgctxt "BUTTON"
+msgid "Pause"
+msgstr "Pausar"
+
+#. TRANS: Tooltip for realtime view "pause" button
+#: RealtimePlugin.php:345
+msgctxt "TOOLTIP"
+msgid "Pause"
+msgstr "Pausar"
+
+#. TRANS: Text label for realtime view "popup" button, usually replaced by an icon.
+#: RealtimePlugin.php:347
+msgctxt "BUTTON"
+msgid "Pop up"
+msgstr "Fenestra"
+
+#. TRANS: Tooltip for realtime view "popup" button.
+#: RealtimePlugin.php:349
+msgctxt "TOOLTIP"
+msgid "Pop up in a window"
+msgstr "Aperir le reproductor in un nove fenestra"
diff --git a/plugins/Realtime/locale/mk/LC_MESSAGES/Realtime.po b/plugins/Realtime/locale/mk/LC_MESSAGES/Realtime.po
new file mode 100644
index 000000000..0b4024a76
--- /dev/null
+++ b/plugins/Realtime/locale/mk/LC_MESSAGES/Realtime.po
@@ -0,0 +1,58 @@
+# Translation of StatusNet - Realtime to Macedonian (Македонски)
+# Expored from translatewiki.net
+#
+# Author: Bjankuloski06
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Realtime\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-11-02 22:51+0000\n"
+"PO-Revision-Date: 2010-11-02 22:54:57+0000\n"
+"Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-11-02 19:54:39+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r75875); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: mk\n"
+"X-Message-Group: #out-statusnet-plugin-realtime\n"
+"Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
+
+#. TRANS: Text label for realtime view "play" button, usually replaced by an icon.
+#: RealtimePlugin.php:339
+msgctxt "BUTTON"
+msgid "Play"
+msgstr "Пушти"
+
+#. TRANS: Tooltip for realtime view "play" button.
+#: RealtimePlugin.php:341
+msgctxt "TOOLTIP"
+msgid "Play"
+msgstr "Пушти"
+
+#. TRANS: Text label for realtime view "pause" button
+#: RealtimePlugin.php:343
+msgctxt "BUTTON"
+msgid "Pause"
+msgstr "Паузирај"
+
+#. TRANS: Tooltip for realtime view "pause" button
+#: RealtimePlugin.php:345
+msgctxt "TOOLTIP"
+msgid "Pause"
+msgstr "Паузирај"
+
+#. TRANS: Text label for realtime view "popup" button, usually replaced by an icon.
+#: RealtimePlugin.php:347
+msgctxt "BUTTON"
+msgid "Pop up"
+msgstr "Прозорче"
+
+#. TRANS: Tooltip for realtime view "popup" button.
+#: RealtimePlugin.php:349
+msgctxt "TOOLTIP"
+msgid "Pop up in a window"
+msgstr "Прикажи во прозорче"
diff --git a/plugins/Realtime/locale/nl/LC_MESSAGES/Realtime.po b/plugins/Realtime/locale/nl/LC_MESSAGES/Realtime.po
new file mode 100644
index 000000000..ac5b2f45c
--- /dev/null
+++ b/plugins/Realtime/locale/nl/LC_MESSAGES/Realtime.po
@@ -0,0 +1,58 @@
+# Translation of StatusNet - Realtime to Dutch (Nederlands)
+# Expored from translatewiki.net
+#
+# Author: Siebrand
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Realtime\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-11-02 22:51+0000\n"
+"PO-Revision-Date: 2010-11-02 22:54:57+0000\n"
+"Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-11-02 19:54:39+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r75875); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: nl\n"
+"X-Message-Group: #out-statusnet-plugin-realtime\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Text label for realtime view "play" button, usually replaced by an icon.
+#: RealtimePlugin.php:339
+msgctxt "BUTTON"
+msgid "Play"
+msgstr "Afspelen"
+
+#. TRANS: Tooltip for realtime view "play" button.
+#: RealtimePlugin.php:341
+msgctxt "TOOLTIP"
+msgid "Play"
+msgstr "Afspelen"
+
+#. TRANS: Text label for realtime view "pause" button
+#: RealtimePlugin.php:343
+msgctxt "BUTTON"
+msgid "Pause"
+msgstr "Pauzeren"
+
+#. TRANS: Tooltip for realtime view "pause" button
+#: RealtimePlugin.php:345
+msgctxt "TOOLTIP"
+msgid "Pause"
+msgstr "Pauzeren"
+
+#. TRANS: Text label for realtime view "popup" button, usually replaced by an icon.
+#: RealtimePlugin.php:347
+msgctxt "BUTTON"
+msgid "Pop up"
+msgstr "Pop-up"
+
+#. TRANS: Tooltip for realtime view "popup" button.
+#: RealtimePlugin.php:349
+msgctxt "TOOLTIP"
+msgid "Pop up in a window"
+msgstr "In nieuw venstertje weergeven"
diff --git a/plugins/TwitterBridge/TwitterBridgePlugin.php b/plugins/TwitterBridge/TwitterBridgePlugin.php
index 097d4486f..f5c361250 100644
--- a/plugins/TwitterBridge/TwitterBridgePlugin.php
+++ b/plugins/TwitterBridge/TwitterBridgePlugin.php
@@ -200,8 +200,15 @@ class TwitterBridgePlugin extends Plugin
             return false;
         case 'TwitterOAuthClient':
         case 'TwitterQueueHandler':
+        case 'TwitterImport':
+        case 'JsonStreamReader':
+        case 'TwitterStreamReader':
             include_once $dir . '/' . strtolower($cls) . '.php';
             return false;
+        case 'TwitterSiteStream':
+        case 'TwitterUserStream':
+            include_once $dir . '/twitterstreamreader.php';
+            return false;
         case 'Notice_to_status':
         case 'Twitter_synch_status':
             include_once $dir . '/' . $cls . '.php';
@@ -267,7 +274,11 @@ class TwitterBridgePlugin extends Plugin
     function onEndInitializeQueueManager($manager)
     {
         if (self::hasKeys()) {
+            // Outgoing notices -> twitter
             $manager->connect('twitter', 'TwitterQueueHandler');
+
+            // Incoming statuses <- twitter
+            $manager->connect('tweetin', 'TweetInQueueHandler');
         }
         return true;
     }
diff --git a/plugins/TwitterBridge/daemons/twitterdaemon.php b/plugins/TwitterBridge/daemons/twitterdaemon.php
new file mode 100644
index 000000000..d313d2de9
--- /dev/null
+++ b/plugins/TwitterBridge/daemons/twitterdaemon.php
@@ -0,0 +1,314 @@
+#!/usr/bin/env php
+<?php
+/*
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2008-2010, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/../../..'));
+
+$shortoptions = 'fi::a';
+$longoptions = array('id::', 'foreground', 'all');
+
+$helptext = <<<END_OF_XMPP_HELP
+Daemon script for receiving new notices from Twitter users.
+
+    -i --id           Identity (default none)
+    -a --all          Handle Twitter for all local sites
+                      (requires Stomp queue handler, status_network setup)
+    -f --foreground   Stay in the foreground (default background)
+
+END_OF_XMPP_HELP;
+
+require_once INSTALLDIR.'/scripts/commandline.inc';
+
+require_once INSTALLDIR . '/lib/jabber.php';
+
+class TwitterDaemon extends SpawningDaemon
+{
+    protected $allsites = false;
+
+    function __construct($id=null, $daemonize=true, $threads=1, $allsites=false)
+    {
+        if ($threads != 1) {
+            // This should never happen. :)
+            throw new Exception("TwitterDaemon must run single-threaded");
+        }
+        parent::__construct($id, $daemonize, $threads);
+        $this->allsites = $allsites;
+    }
+
+    function runThread()
+    {
+        common_log(LOG_INFO, 'Waiting to listen to Twitter and queues');
+
+        $master = new TwitterMaster($this->get_id(), $this->processManager());
+        $master->init($this->allsites);
+        $master->service();
+
+        common_log(LOG_INFO, 'terminating normally');
+
+        return $master->respawn ? self::EXIT_RESTART : self::EXIT_SHUTDOWN;
+    }
+
+}
+
+class TwitterMaster extends IoMaster
+{
+    protected $processManager;
+
+    function __construct($id, $processManager)
+    {
+        parent::__construct($id);
+        $this->processManager = $processManager;
+    }
+
+    /**
+     * Initialize IoManagers for the currently configured site
+     * which are appropriate to this instance.
+     */
+    function initManagers()
+    {
+        $qm = QueueManager::get();
+        $qm->setActiveGroup('twitter');
+        $this->instantiate($qm);
+        $this->instantiate(new TwitterManager());
+        $this->instantiate($this->processManager);
+    }
+}
+
+
+class TwitterManager extends IoManager
+{
+    // Recommended resource limits from http://dev.twitter.com/pages/site_streams
+    const MAX_STREAMS = 1000;
+    const USERS_PER_STREAM = 100;
+    const STREAMS_PER_SECOND = 20;
+
+    protected $streams;
+    protected $users;
+
+    /**
+     * Pull the site's active Twitter-importing users and start spawning
+     * some data streams for them!
+     *
+     * @fixme check their last-id and check whether we'll need to do a manual pull.
+     * @fixme abstract out the fetching so we can work over multiple sites.
+     */
+    protected function initStreams()
+    {
+        common_log(LOG_INFO, 'init...');
+        // Pull Twitter user IDs for all users we want to pull data for
+        $flink = new Foreign_link();
+        $flink->service = TWITTER_SERVICE;
+        // @fixme probably should do the bitfield check in a whereAdd but it's ugly :D
+        $flink->find();
+
+        $userIds = array();
+        while ($flink->fetch()) {
+            if (($flink->noticesync & FOREIGN_NOTICE_RECV) ==
+                FOREIGN_NOTICE_RECV) {
+                $userIds[] = $flink->foreign_id;
+
+                if (count($userIds) >= self::USERS_PER_STREAM) {
+                    $this->spawnStream($userIds);
+                    $userIds = array();
+                }
+            }
+        }
+
+        if (count($userIds)) {
+            $this->spawnStream($userIds);
+        }
+    }
+
+    /**
+     * Prepare a Site Stream connection for the given chunk of users.
+     * The actual connection will be opened later.
+     *
+     * @param $userIds array of Twitter-side user IDs
+     */
+    protected function spawnStream($userIds)
+    {
+        $stream = $this->initSiteStream();
+        $stream->followUsers($userIds);
+
+        // Slip the stream reader into our list of active streams.
+        // We'll manage its actual connection on the next go-around.
+        $this->streams[] = $stream;
+
+        // Record the user->stream mappings; this makes it easier for us to know
+        // later if we need to kill something.
+        foreach ($userIds as $id) {
+            $this->users[$id] = $stream;
+        }
+    }
+
+    /**
+     * Initialize a generic site streams connection object.
+     * All our connections will look like this, then we'll add users to them.
+     *
+     * @return TwitterStreamReader
+     */
+    protected function initSiteStream()
+    {
+        $auth = $this->siteStreamAuth();
+        $stream = new TwitterSiteStream($auth);
+
+        // Add our event handler callbacks. Whee!
+        $this->setupEvents($stream);
+        return $stream;
+    }
+
+    /**
+     * Fetch the Twitter OAuth credentials to use to connect to the Site Streams API.
+     *
+     * This will use the locally-stored credentials for the applictation's owner account
+     * from the site configuration. These should be configured through the administration
+     * panels or manually in the config file.
+     *
+     * Will throw an exception if no credentials can be found -- but beware that invalid
+     * credentials won't cause breakage until later.
+     *
+     * @return TwitterOAuthClient
+     */
+    protected function siteStreamAuth()
+    {
+        $token = common_config('twitter', 'stream_token');
+        $secret = common_config('twitter', 'stream_secret');
+        if (empty($token) || empty($secret)) {
+            throw new ServerException('Twitter site streams have not been correctly configured. Configure the app owner account via the admin panel.');
+        }
+        return new TwitterOAuthClient($token, $secret);
+    }
+
+    /**
+     * Collect the sockets for all active connections for i/o monitoring.
+     *
+     * @return array of resources
+     */
+    public function getSockets()
+    {
+        $sockets = array();
+        foreach ($this->streams as $stream) {
+            foreach ($stream->getSockets() as $socket) {
+                $sockets[] = $socket;
+            }
+        }
+        return $sockets;
+    }
+
+    /**
+     * We're ready to process input from one of our data sources! Woooooo!
+     * @fixme is there an easier way to map from socket back to owning module? :(
+     *
+     * @param resource $socket
+     * @return boolean success
+     */
+    public function handleInput($socket)
+    {
+        foreach ($this->streams as $stream) {
+            foreach ($stream->getSockets() as $aSocket) {
+                if ($socket === $aSocket) {
+                    $stream->handleInput($socket);
+                }
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Start the i/o system up! Prepare our connections and start opening them.
+     *
+     * @fixme do some rate-limiting on the stream setup
+     * @fixme do some sensible backoff on failure etc
+     */
+    public function start()
+    {
+        $this->initStreams();
+        foreach ($this->streams as $stream) {
+            $stream->connect();
+        }
+        return true;
+    }
+
+    /**
+     * Close down our connections when the daemon wraps up for business.
+     */
+    public function finish()
+    {
+        foreach ($this->streams as $index => $stream) {
+            $stream->close();
+            unset($this->streams[$index]);
+        }
+        return true;
+    }
+
+    public static function get()
+    {
+        throw new Exception('not a singleton');
+    }
+
+    /**
+     * Set up event handlers on the streaming interface.
+     *
+     * @fixme add more event types as we add handling for them
+     */
+    protected function setupEvents(TwitterStreamReader $stream)
+    {
+        $handlers = array(
+            'status',
+        );
+        foreach ($handlers as $event) {
+            $stream->hookEvent($event, array($this, 'onTwitter' . ucfirst($event)));
+        }
+    }
+
+    /**
+     * Event callback notifying that a user has a new message in their home timeline.
+     * We store the incoming message into the queues for processing, keeping our own
+     * daemon running as shiny-fast as possible.
+     *
+     * @param object $status JSON data: Twitter status update
+     * @fixme in all-sites mode we may need to route queue items into another site's
+     *        destination queues, or multiple sites.
+     */
+    protected function onTwitterStatus($status, $context)
+    {
+        $data = array(
+            'status' => $status,
+            'for_user' => $context->for_user,
+        );
+        $qm = QueueManager::get();
+        $qm->enqueue($data, 'tweetin');
+    }
+}
+
+
+if (have_option('i', 'id')) {
+    $id = get_option_value('i', 'id');
+} else if (count($args) > 0) {
+    $id = $args[0];
+} else {
+    $id = null;
+}
+
+$foreground = have_option('f', 'foreground');
+$all = have_option('a') || have_option('--all');
+
+$daemon = new TwitterDaemon($id, !$foreground, 1, $all);
+
+$daemon->runOnce();
diff --git a/plugins/TwitterBridge/daemons/twitterstatusfetcher.php b/plugins/TwitterBridge/daemons/twitterstatusfetcher.php
index cef67b180..9298d9e3a 100755
--- a/plugins/TwitterBridge/daemons/twitterstatusfetcher.php
+++ b/plugins/TwitterBridge/daemons/twitterstatusfetcher.php
@@ -192,25 +192,12 @@ class TwitterStatusFetcher extends ParallelizingDaemon
 
         common_debug(LOG_INFO, $this->name() . ' - Retrieved ' . sizeof($timeline) . ' statuses from Twitter.');
 
+        $importer = new TwitterImport();
+
         // Reverse to preserve order
 
         foreach (array_reverse($timeline) as $status) {
-            // Hacktastic: filter out stuff coming from this StatusNet
-            $source = mb_strtolower(common_config('integration', 'source'));
-
-            if (preg_match("/$source/", mb_strtolower($status->source))) {
-                common_debug($this->name() . ' - Skipping import of status ' .
-                             $status->id . ' with source ' . $source);
-                continue;
-            }
-
-            // Don't save it if the user is protected
-            // FIXME: save it but treat it as private
-            if ($status->user->protected) {
-                continue;
-            }
-
-            $notice = $this->saveStatus($status);
+            $notice = $importer->importStatus($status);
 
             if (!empty($notice)) {
                 Inbox::insertNotice($flink->user_id, $notice->id);
@@ -226,578 +213,6 @@ class TwitterStatusFetcher extends ParallelizingDaemon
         $flink->last_noticesync = common_sql_now();
         $flink->update();
     }
-
-    function saveStatus($status)
-    {
-        $profile = $this->ensureProfile($status->user);
-
-        if (empty($profile)) {
-            common_log(LOG_ERR, $this->name() .
-                ' - Problem saving notice. No associated Profile.');
-            return null;
-        }
-
-        $statusUri = $this->makeStatusURI($status->user->screen_name, $status->id);
-
-        // check to see if we've already imported the status
-        $n2s = Notice_to_status::staticGet('status_id', $status->id);
-
-        if (!empty($n2s)) {
-            common_log(
-                LOG_INFO,
-                $this->name() .
-                " - Ignoring duplicate import: {$status->id}"
-            );
-            return Notice::staticGet('id', $n2s->notice_id);
-        }
-
-        // If it's a retweet, save it as a repeat!
-        if (!empty($status->retweeted_status)) {
-            common_log(LOG_INFO, "Status {$status->id} is a retweet of {$status->retweeted_status->id}.");
-            $original = $this->saveStatus($status->retweeted_status);
-            if (empty($original)) {
-                return null;
-            } else {
-                $author = $original->getProfile();
-                // TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
-                // TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-                $content = sprintf(_m('RT @%1$s %2$s'),
-                                   $author->nickname,
-                                   $original->content);
-
-                if (Notice::contentTooLong($content)) {
-                    $contentlimit = Notice::maxContent();
-                    $content = mb_substr($content, 0, $contentlimit - 4) . ' ...';
-                }
-
-                $repeat = Notice::saveNew($profile->id,
-                                          $content,
-                                          'twitter',
-                                          array('repeat_of' => $original->id,
-                                                'uri' => $statusUri,
-                                                'is_local' => Notice::GATEWAY));
-                common_log(LOG_INFO, "Saved {$repeat->id} as a repeat of {$original->id}");
-                Notice_to_status::saveNew($repeat->id, $status->id);
-                return $repeat;
-            }
-        }
-
-        $notice = new Notice();
-
-        $notice->profile_id = $profile->id;
-        $notice->uri        = $statusUri;
-        $notice->url        = $statusUri;
-        $notice->created    = strftime(
-            '%Y-%m-%d %H:%M:%S',
-            strtotime($status->created_at)
-        );
-
-        $notice->source     = 'twitter';
-
-        $notice->reply_to   = null;
-
-        if (!empty($status->in_reply_to_status_id)) {
-            common_log(LOG_INFO, "Status {$status->id} is a reply to status {$status->in_reply_to_status_id}");
-            $n2s = Notice_to_status::staticGet('status_id', $status->in_reply_to_status_id);
-            if (empty($n2s)) {
-                common_log(LOG_INFO, "Couldn't find local notice for status {$status->in_reply_to_status_id}");
-            } else {
-                $reply = Notice::staticGet('id', $n2s->notice_id);
-                if (empty($reply)) {
-                    common_log(LOG_INFO, "Couldn't find local notice for status {$status->in_reply_to_status_id}");
-                } else {
-                    common_log(LOG_INFO, "Found local notice {$reply->id} for status {$status->in_reply_to_status_id}");
-                    $notice->reply_to     = $reply->id;
-                    $notice->conversation = $reply->conversation;
-                }
-            }
-        }
-
-        if (empty($notice->conversation)) {
-            $conv = Conversation::create();
-            $notice->conversation = $conv->id;
-            common_log(LOG_INFO, "No known conversation for status {$status->id} so making a new one {$conv->id}.");
-        }
-
-        $notice->is_local   = Notice::GATEWAY;
-
-        $notice->content  = html_entity_decode($status->text, ENT_QUOTES, 'UTF-8');
-        $notice->rendered = $this->linkify($status);
-
-        if (Event::handle('StartNoticeSave', array(&$notice))) {
-
-            $id = $notice->insert();
-
-            if (!$id) {
-                common_log_db_error($notice, 'INSERT', __FILE__);
-                common_log(LOG_ERR, $this->name() .
-                    ' - Problem saving notice.');
-            }
-
-            Event::handle('EndNoticeSave', array($notice));
-        }
-
-        Notice_to_status::saveNew($notice->id, $status->id);
-
-        $this->saveStatusMentions($notice, $status);
-
-        $notice->blowOnInsert();
-
-        return $notice;
-    }
-
-    /**
-     * Make an URI for a status.
-     *
-     * @param object $status status object
-     *
-     * @return string URI
-     */
-    function makeStatusURI($username, $id)
-    {
-        return 'http://twitter.com/'
-          . $username
-          . '/status/'
-          . $id;
-    }
-
-    /**
-     * Look up a Profile by profileurl field.  Profile::staticGet() was
-     * not working consistently.
-     *
-     * @param string $nickname   local nickname of the Twitter user
-     * @param string $profileurl the profile url
-     *
-     * @return mixed value the first Profile with that url, or null
-     */
-    function getProfileByUrl($nickname, $profileurl)
-    {
-        $profile = new Profile();
-        $profile->nickname = $nickname;
-        $profile->profileurl = $profileurl;
-        $profile->limit(1);
-
-        if ($profile->find()) {
-            $profile->fetch();
-            return $profile;
-        }
-
-        return null;
-    }
-
-    /**
-     * Check to see if this Twitter status has already been imported
-     *
-     * @param Profile $profile   Twitter user's local profile
-     * @param string  $statusUri URI of the status on Twitter
-     *
-     * @return mixed value a matching Notice or null
-     */
-    function checkDupe($profile, $statusUri)
-    {
-        $notice = new Notice();
-        $notice->uri = $statusUri;
-        $notice->profile_id = $profile->id;
-        $notice->limit(1);
-
-        if ($notice->find()) {
-            $notice->fetch();
-            return $notice;
-        }
-
-        return null;
-    }
-
-    function ensureProfile($user)
-    {
-        // check to see if there's already a profile for this user
-        $profileurl = 'http://twitter.com/' . $user->screen_name;
-        $profile = $this->getProfileByUrl($user->screen_name, $profileurl);
-
-        if (!empty($profile)) {
-            common_debug($this->name() .
-                         " - Profile for $profile->nickname found.");
-
-            // Check to see if the user's Avatar has changed
-
-            $this->checkAvatar($user, $profile);
-            return $profile;
-
-        } else {
-            common_debug($this->name() . ' - Adding profile and remote profile ' .
-                         "for Twitter user: $profileurl.");
-
-            $profile = new Profile();
-            $profile->query("BEGIN");
-
-            $profile->nickname = $user->screen_name;
-            $profile->fullname = $user->name;
-            $profile->homepage = $user->url;
-            $profile->bio = $user->description;
-            $profile->location = $user->location;
-            $profile->profileurl = $profileurl;
-            $profile->created = common_sql_now();
-
-            try {
-                $id = $profile->insert();
-            } catch(Exception $e) {
-                common_log(LOG_WARNING, $this->name . ' Couldn\'t insert profile - ' . $e->getMessage());
-            }
-
-            if (empty($id)) {
-                common_log_db_error($profile, 'INSERT', __FILE__);
-                $profile->query("ROLLBACK");
-                return false;
-            }
-
-            // check for remote profile
-
-            $remote_pro = Remote_profile::staticGet('uri', $profileurl);
-
-            if (empty($remote_pro)) {
-                $remote_pro = new Remote_profile();
-
-                $remote_pro->id = $id;
-                $remote_pro->uri = $profileurl;
-                $remote_pro->created = common_sql_now();
-
-                try {
-                    $rid = $remote_pro->insert();
-                } catch (Exception $e) {
-                    common_log(LOG_WARNING, $this->name() . ' Couldn\'t save remote profile - ' . $e->getMessage());
-                }
-
-                if (empty($rid)) {
-                    common_log_db_error($profile, 'INSERT', __FILE__);
-                    $profile->query("ROLLBACK");
-                    return false;
-                }
-            }
-
-            $profile->query("COMMIT");
-
-            $this->saveAvatars($user, $id);
-
-            return $profile;
-        }
-    }
-
-    function checkAvatar($twitter_user, $profile)
-    {
-        global $config;
-
-        $path_parts = pathinfo($twitter_user->profile_image_url);
-
-        $newname = 'Twitter_' . $twitter_user->id . '_' .
-            $path_parts['basename'];
-
-        $oldname = $profile->getAvatar(48)->filename;
-
-        if ($newname != $oldname) {
-            common_debug($this->name() . ' - Avatar for Twitter user ' .
-                         "$profile->nickname has changed.");
-            common_debug($this->name() . " - old: $oldname new: $newname");
-
-            $this->updateAvatars($twitter_user, $profile);
-        }
-
-        if ($this->missingAvatarFile($profile)) {
-            common_debug($this->name() . ' - Twitter user ' .
-                         $profile->nickname .
-                         ' is missing one or more local avatars.');
-            common_debug($this->name() ." - old: $oldname new: $newname");
-
-            $this->updateAvatars($twitter_user, $profile);
-        }
-    }
-
-    function updateAvatars($twitter_user, $profile) {
-
-        global $config;
-
-        $path_parts = pathinfo($twitter_user->profile_image_url);
-
-        $img_root = substr($path_parts['basename'], 0, -11);
-        $ext = $path_parts['extension'];
-        $mediatype = $this->getMediatype($ext);
-
-        foreach (array('mini', 'normal', 'bigger') as $size) {
-            $url = $path_parts['dirname'] . '/' .
-                $img_root . '_' . $size . ".$ext";
-            $filename = 'Twitter_' . $twitter_user->id . '_' .
-                $img_root . "_$size.$ext";
-
-            $this->updateAvatar($profile->id, $size, $mediatype, $filename);
-            $this->fetchAvatar($url, $filename);
-        }
-    }
-
-    function missingAvatarFile($profile) {
-        foreach (array(24, 48, 73) as $size) {
-            $filename = $profile->getAvatar($size)->filename;
-            $avatarpath = Avatar::path($filename);
-            if (file_exists($avatarpath) == FALSE) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    function getMediatype($ext)
-    {
-        $mediatype = null;
-
-        switch (strtolower($ext)) {
-        case 'jpg':
-            $mediatype = 'image/jpg';
-            break;
-        case 'gif':
-            $mediatype = 'image/gif';
-            break;
-        default:
-            $mediatype = 'image/png';
-        }
-
-        return $mediatype;
-    }
-
-    function saveAvatars($user, $id)
-    {
-        global $config;
-
-        $path_parts = pathinfo($user->profile_image_url);
-        $ext = $path_parts['extension'];
-        $end = strlen('_normal' . $ext);
-        $img_root = substr($path_parts['basename'], 0, -($end+1));
-        $mediatype = $this->getMediatype($ext);
-
-        foreach (array('mini', 'normal', 'bigger') as $size) {
-            $url = $path_parts['dirname'] . '/' .
-                $img_root . '_' . $size . ".$ext";
-            $filename = 'Twitter_' . $user->id . '_' .
-                $img_root . "_$size.$ext";
-
-            if ($this->fetchAvatar($url, $filename)) {
-                $this->newAvatar($id, $size, $mediatype, $filename);
-            } else {
-                common_log(LOG_WARNING, $id() .
-                           " - Problem fetching Avatar: $url");
-            }
-        }
-    }
-
-    function updateAvatar($profile_id, $size, $mediatype, $filename) {
-
-        common_debug($this->name() . " - Updating avatar: $size");
-
-        $profile = Profile::staticGet($profile_id);
-
-        if (empty($profile)) {
-            common_debug($this->name() . " - Couldn't get profile: $profile_id!");
-            return;
-        }
-
-        $sizes = array('mini' => 24, 'normal' => 48, 'bigger' => 73);
-        $avatar = $profile->getAvatar($sizes[$size]);
-
-        // Delete the avatar, if present
-        if ($avatar) {
-            $avatar->delete();
-        }
-
-        $this->newAvatar($profile->id, $size, $mediatype, $filename);
-    }
-
-    function newAvatar($profile_id, $size, $mediatype, $filename)
-    {
-        global $config;
-
-        $avatar = new Avatar();
-        $avatar->profile_id = $profile_id;
-
-        switch($size) {
-        case 'mini':
-            $avatar->width  = 24;
-            $avatar->height = 24;
-            break;
-        case 'normal':
-            $avatar->width  = 48;
-            $avatar->height = 48;
-            break;
-        default:
-            // Note: Twitter's big avatars are a different size than
-            // StatusNet's (StatusNet's = 96)
-            $avatar->width  = 73;
-            $avatar->height = 73;
-        }
-
-        $avatar->original = 0; // we don't have the original
-        $avatar->mediatype = $mediatype;
-        $avatar->filename = $filename;
-        $avatar->url = Avatar::url($filename);
-
-        $avatar->created = common_sql_now();
-
-        try {
-            $id = $avatar->insert();
-        } catch (Exception $e) {
-            common_log(LOG_WARNING, $this->name() . ' Couldn\'t insert avatar - ' . $e->getMessage());
-        }
-
-        if (empty($id)) {
-            common_log_db_error($avatar, 'INSERT', __FILE__);
-            return null;
-        }
-
-        common_debug($this->name() .
-                     " - Saved new $size avatar for $profile_id.");
-
-        return $id;
-    }
-
-    /**
-     * Fetch a remote avatar image and save to local storage.
-     *
-     * @param string $url avatar source URL
-     * @param string $filename bare local filename for download
-     * @return bool true on success, false on failure
-     */
-    function fetchAvatar($url, $filename)
-    {
-        common_debug($this->name() . " - Fetching Twitter avatar: $url");
-
-        $request = HTTPClient::start();
-        $response = $request->get($url);
-        if ($response->isOk()) {
-            $avatarfile = Avatar::path($filename);
-            $ok = file_put_contents($avatarfile, $response->getBody());
-            if (!$ok) {
-                common_log(LOG_WARNING, $this->name() .
-                           " - Couldn't open file $filename");
-                return false;
-            }
-        } else {
-            return false;
-        }
-
-        return true;
-    }
-
-    const URL = 1;
-    const HASHTAG = 2;
-    const MENTION = 3;
-
-    function linkify($status)
-    {
-        $text = $status->text;
-
-        if (empty($status->entities)) {
-            common_log(LOG_WARNING, "No entities data for {$status->id}; trying to fake up links ourselves.");
-            $text = common_replace_urls_callback($text, 'common_linkify');
-            $text = preg_replace('/(^|\&quot\;|\'|\(|\[|\{|\s+)#([\pL\pN_\-\.]{1,64})/e', "'\\1#'.TwitterStatusFetcher::tagLink('\\2')", $text);
-            $text = preg_replace('/(^|\s+)@([a-z0-9A-Z_]{1,64})/e', "'\\1@'.TwitterStatusFetcher::atLink('\\2')", $text);
-            return $text;
-        }
-
-        // Move all the entities into order so we can
-        // replace them in reverse order and thus
-        // not mess up their indices
-
-        $toReplace = array();
-
-        if (!empty($status->entities->urls)) {
-            foreach ($status->entities->urls as $url) {
-                $toReplace[$url->indices[0]] = array(self::URL, $url);
-            }
-        }
-
-        if (!empty($status->entities->hashtags)) {
-            foreach ($status->entities->hashtags as $hashtag) {
-                $toReplace[$hashtag->indices[0]] = array(self::HASHTAG, $hashtag);
-            }
-        }
-
-        if (!empty($status->entities->user_mentions)) {
-            foreach ($status->entities->user_mentions as $mention) {
-                $toReplace[$mention->indices[0]] = array(self::MENTION, $mention);
-            }
-        }
-
-        // sort in reverse order by key
-
-        krsort($toReplace);
-
-        foreach ($toReplace as $part) {
-            list($type, $object) = $part;
-            switch($type) {
-            case self::URL:
-                $linkText = $this->makeUrlLink($object);
-                break;
-            case self::HASHTAG:
-                $linkText = $this->makeHashtagLink($object);
-                break;
-            case self::MENTION:
-                $linkText = $this->makeMentionLink($object);
-                break;
-            default:
-                continue;
-            }
-            $text = mb_substr($text, 0, $object->indices[0]) . $linkText . mb_substr($text, $object->indices[1]);
-        }
-        return $text;
-    }
-
-    function makeUrlLink($object)
-    {
-        return "<a href='{$object->url}' class='extlink'>{$object->url}</a>";
-    }
-
-    function makeHashtagLink($object)
-    {
-        return "#" . self::tagLink($object->text);
-    }
-
-    function makeMentionLink($object)
-    {
-        return "@".self::atLink($object->screen_name, $object->name);
-    }
-
-    static function tagLink($tag)
-    {
-        return "<a href='https://twitter.com/search?q=%23{$tag}' class='hashtag'>{$tag}</a>";
-    }
-
-    static function atLink($screenName, $fullName=null)
-    {
-        if (!empty($fullName)) {
-            return "<a href='http://twitter.com/{$screenName}' title='{$fullName}'>{$screenName}</a>";
-        } else {
-            return "<a href='http://twitter.com/{$screenName}'>{$screenName}</a>";
-        }
-    }
-
-    function saveStatusMentions($notice, $status)
-    {
-        $mentions = array();
-
-        if (empty($status->entities) || empty($status->entities->user_mentions)) {
-            return;
-        }
-
-        foreach ($status->entities->user_mentions as $mention) {
-            $flink = Foreign_link::getByForeignID($mention->id, TWITTER_SERVICE);
-            if (!empty($flink)) {
-                $user = User::staticGet('id', $flink->user_id);
-                if (!empty($user)) {
-                    $reply = new Reply();
-                    $reply->notice_id  = $notice->id;
-                    $reply->profile_id = $user->id;
-                    common_log(LOG_INFO, __METHOD__ . ": saving reply: notice {$notice->id} to profile {$user->id}");
-                    $id = $reply->insert();
-                }
-            }
-        }
-    }
 }
 
 $id    = null;
diff --git a/plugins/TwitterBridge/jsonstreamreader.php b/plugins/TwitterBridge/jsonstreamreader.php
new file mode 100644
index 000000000..f6572c9ee
--- /dev/null
+++ b/plugins/TwitterBridge/jsonstreamreader.php
@@ -0,0 +1,265 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Plugin
+ * @package   StatusNet
+ * @author    Brion Vibber <brion@status.net>
+ * @copyright 2010 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+class OAuthData
+{
+    public $consumer_key, $consumer_secret, $token, $token_secret;
+}
+
+/**
+ *
+ */
+abstract class JsonStreamReader
+{
+    const CRLF = "\r\n";
+
+    public $id;
+    protected $socket = null;
+    protected $state = 'init'; // 'init', 'connecting', 'waiting', 'headers', 'active'
+
+    public function __construct()
+    {
+        $this->id = get_class($this) . '.' . substr(md5(mt_rand()), 0, 8);
+    }
+
+    /**
+     * Starts asynchronous connect operation...
+     *
+     * @fixme Can we do the open-socket fully async to? (need write select infrastructure)
+     *
+     * @param string $url
+     */
+    public function connect($url)
+    {
+        common_log(LOG_DEBUG, "$this->id opening connection to $url");
+
+        $scheme = parse_url($url, PHP_URL_SCHEME);
+        if ($scheme == 'http') {
+            $rawScheme = 'tcp';
+        } else if ($scheme == 'https') {
+            $rawScheme = 'ssl';
+        } else {
+            throw new ServerException('Invalid URL scheme for HTTP stream reader');
+        }
+
+        $host = parse_url($url, PHP_URL_HOST);
+        $port = parse_url($url, PHP_URL_PORT);
+        if (!$port) {
+            if ($scheme == 'https') {
+                $port = 443;
+            } else {
+                $port = 80;
+            }
+        }
+
+        $path = parse_url($url, PHP_URL_PATH);
+        $query = parse_url($url, PHP_URL_QUERY);
+        if ($query) {
+            $path .= '?' . $query;
+        }
+
+        $errno = $errstr = null;
+        $timeout = 5;
+        //$flags = STREAM_CLIENT_CONNECT | STREAM_CLIENT_ASYNC_CONNECT;
+        $flags = STREAM_CLIENT_CONNECT;
+        // @fixme add SSL params
+        $this->socket = stream_socket_client("$rawScheme://$host:$port", $errno, $errstr, $timeout, $flags);
+
+        $this->send($this->httpOpen($host, $path));
+
+        stream_set_blocking($this->socket, false);
+        $this->state = 'waiting';
+    }
+
+    /**
+     * Send some fun data off to the server.
+     *
+     * @param string $buffer
+     */
+    function send($buffer)
+    {
+        fwrite($this->socket, $buffer);
+    }
+
+    /**
+     * Read next packet of data from the socket.
+     *
+     * @return string
+     */
+    function read()
+    {
+        $buffer = fread($this->socket, 65536);
+        return $buffer;
+    }
+
+    /**
+     * Build HTTP request headers.
+     *
+     * @param string $host
+     * @param string $path
+     * @return string
+     */
+    protected function httpOpen($host, $path)
+    {
+        $lines = array(
+            "GET $path HTTP/1.1",
+            "Host: $host",
+            "User-Agent: StatusNet/" . STATUSNET_VERSION . " (TwitterBridgePlugin)",
+            "Connection: close",
+            "",
+            ""
+        );
+        return implode(self::CRLF, $lines);
+    }
+
+    /**
+     * Close the current connection, if open.
+     */
+    public function close()
+    {
+        if ($this->isConnected()) {
+            common_log(LOG_DEBUG, "$this->id closing connection.");
+            fclose($this->socket);
+            $this->socket = null;
+        }
+    }
+
+    /**
+     * Are we currently connected?
+     *
+     * @return boolean
+     */
+    public function isConnected()
+    {
+        return $this->socket !== null;
+    }
+
+    /**
+     * Send any sockets we're listening on to the IO manager
+     * to wait for input.
+     *
+     * @return array of resources
+     */
+    public function getSockets()
+    {
+        if ($this->isConnected()) {
+            return array($this->socket);
+        }
+        return array();
+    }
+
+    /**
+     * Take a chunk of input over the horn and go go go! :D
+     *
+     * @param string $buffer
+     */
+    public function handleInput($socket)
+    {
+        if ($this->socket !== $socket) {
+            throw new Exception('Got input from unexpected socket!');
+        }
+
+        try {
+            $buffer = $this->read();
+            $lines = explode(self::CRLF, $buffer);
+            foreach ($lines as $line) {
+                $this->handleLine($line);
+            }
+        } catch (Exception $e) {
+            common_log(LOG_ERR, "$this->id aborting connection due to error: " . $e->getMessage());
+            fclose($this->socket);
+            throw $e;
+        }
+    }
+
+    protected function handleLine($line)
+    {
+        switch ($this->state)
+        {
+            case 'waiting':
+                $this->handleLineWaiting($line);
+                break;
+            case 'headers':
+                $this->handleLineHeaders($line);
+                break;
+            case 'active':
+                $this->handleLineActive($line);
+                break;
+            default:
+                throw new Exception('Invalid state in handleLine: ' . $this->state);
+        }
+    }
+
+    /**
+     *
+     * @param <type> $line
+     */
+    protected function handleLineWaiting($line)
+    {
+        $bits = explode(' ', $line, 3);
+        if (count($bits) != 3) {
+            throw new Exception("Invalid HTTP response line: $line");
+        }
+
+        list($http, $status, $text) = $bits;
+        if (substr($http, 0, 5) != 'HTTP/') {
+            throw new Exception("Invalid HTTP response line chunk '$http': $line");
+        }
+        if ($status != '200') {
+            throw new Exception("Bad HTTP response code $status: $line");
+        }
+        common_log(LOG_DEBUG, "$this->id $line");
+        $this->state = 'headers';
+    }
+
+    protected function handleLineHeaders($line)
+    {
+        if ($line == '') {
+            $this->state = 'active';
+            common_log(LOG_DEBUG, "$this->id connection is active!");
+        } else {
+            common_log(LOG_DEBUG, "$this->id read HTTP header: $line");
+            $this->responseHeaders[] = $line;
+        }
+    }
+
+    protected function handleLineActive($line)
+    {
+        if ($line == "") {
+            // Server sends empty lines as keepalive.
+            return;
+        }
+        $data = json_decode($line);
+        if ($data) {
+            $this->handleJson($data);
+        } else {
+            common_log(LOG_ERR, "$this->id received bogus JSON data: " . var_export($line, true));
+        }
+    }
+
+    abstract protected function handleJson(stdClass $data);
+}
diff --git a/plugins/TwitterBridge/scripts/fakestream.php b/plugins/TwitterBridge/scripts/fakestream.php
new file mode 100644
index 000000000..369688816
--- /dev/null
+++ b/plugins/TwitterBridge/scripts/fakestream.php
@@ -0,0 +1,147 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Plugin
+ * @package   StatusNet
+ * @author    Brion Vibber <brion@status.net>
+ * @copyright 2010 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/../../..'));
+
+$shortoptions = 'n:';
+$longoptions = array('nick=','import','all');
+
+$helptext = <<<ENDOFHELP
+USAGE: fakestream.php -n <username>
+
+  -n --nick=<username> Local user whose Twitter timeline to watch
+     --import          Experimental: run incoming messages through import
+     --all             Experimental: run multiuser; requires nick be the app owner
+
+Attempts a User Stream connection to Twitter as the given user, dumping
+data as it comes.
+
+ENDOFHELP;
+
+require_once INSTALLDIR.'/scripts/commandline.inc';
+
+if (have_option('n')) {
+    $nickname = get_option_value('n');
+} else if (have_option('nick')) {
+    $nickname = get_option_value('nickname');
+} else if (have_option('all')) {
+    $nickname = null;
+} else {
+    show_help($helptext);
+    exit(0);
+}
+
+/**
+ *
+ * @param User $user 
+ * @return TwitterOAuthClient
+ */
+function twitterAuthForUser(User $user)
+{
+    $flink = Foreign_link::getByUserID($user->id,
+                                       TWITTER_SERVICE);
+    if (!$flink) {
+        throw new ServerException("No Twitter config for this user.");
+    }
+
+    $token = TwitterOAuthClient::unpackToken($flink->credentials);
+    if (!$token) {
+        throw new ServerException("No Twitter OAuth credentials for this user.");
+    }
+
+    return new TwitterOAuthClient($token->key, $token->secret);
+}
+
+/**
+ * Emulate the line-by-line output...
+ *
+ * @param Foreign_link $flink
+ * @param mixed $data
+ */
+function dumpMessage($flink, $data)
+{
+    $msg = prepMessage($flink, $data);
+    print json_encode($msg) . "\r\n";
+}
+
+function prepMessage($flink, $data)
+{
+    $msg->for_user = $flink->foreign_id;
+    $msg->message = $data;
+    return $msg;
+}
+
+if (have_option('all')) {
+    $users = array();
+
+    $flink = new Foreign_link();
+    $flink->service = TWITTER_SERVICE;
+    $flink->find();
+
+    while ($flink->fetch()) {
+        if (($flink->noticesync & FOREIGN_NOTICE_RECV) ==
+            FOREIGN_NOTICE_RECV) {
+            $users[] = $flink->user_id;
+        }
+    }
+} else {
+    $user = User::staticGet('nickname', $nickname);
+    $users = array($user->id);
+}
+
+$output = array();
+foreach ($users as $id) {
+    $user = User::staticGet('id', $id);
+    if (!$user) {
+        throw new Exception("No user for id $id");
+    }
+    $auth = twitterAuthForUser($user);
+    $flink = Foreign_link::getByUserID($user->id,
+                                       TWITTER_SERVICE);
+
+    $friends->friends = $auth->friendsIds();
+    dumpMessage($flink, $friends);
+
+    $timeline = $auth->statusesHomeTimeline();
+    foreach ($timeline as $status) {
+        $output[] = prepMessage($flink, $status);
+    }
+}
+
+usort($output, function($a, $b) {
+    if ($a->message->id < $b->message->id) {
+        return -1;
+    } else if ($a->message->id == $b->message->id) {
+        return 0;
+    } else {
+        return 1;
+    }
+});
+
+foreach ($output as $msg) {
+    print json_encode($msg) . "\r\n";
+}
diff --git a/plugins/TwitterBridge/scripts/streamtest.php b/plugins/TwitterBridge/scripts/streamtest.php
new file mode 100644
index 000000000..aad15fdea
--- /dev/null
+++ b/plugins/TwitterBridge/scripts/streamtest.php
@@ -0,0 +1,244 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Plugin
+ * @package   StatusNet
+ * @author    Brion Vibber <brion@status.net>
+ * @copyright 2010 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/../../..'));
+
+$shortoptions = 'n:';
+$longoptions = array('nick=','import','all','apiroot=');
+
+$helptext = <<<ENDOFHELP
+USAGE: streamtest.php -n <username>
+
+  -n --nick=<username> Local user whose Twitter timeline to watch
+     --import          Experimental: run incoming messages through import
+     --all             Experimental: run multiuser; requires nick be the app owner
+     --apiroot=<url>   Provide alternate streaming API root URL
+
+Attempts a User Stream connection to Twitter as the given user, dumping
+data as it comes.
+
+ENDOFHELP;
+
+require_once INSTALLDIR.'/scripts/commandline.inc';
+require_once dirname(dirname(__FILE__)) . '/jsonstreamreader.php';
+require_once dirname(dirname(__FILE__)) . '/twitterstreamreader.php';
+
+if (have_option('n')) {
+    $nickname = get_option_value('n');
+} else if (have_option('nick')) {
+    $nickname = get_option_value('nickname');
+} else {
+    show_help($helptext);
+    exit(0);
+}
+
+/**
+ *
+ * @param User $user 
+ * @return TwitterOAuthClient
+ */
+function twitterAuthForUser(User $user)
+{
+    $flink = Foreign_link::getByUserID($user->id,
+                                       TWITTER_SERVICE);
+    if (!$flink) {
+        throw new ServerException("No Twitter config for this user.");
+    }
+
+    $token = TwitterOAuthClient::unpackToken($flink->credentials);
+    if (!$token) {
+        throw new ServerException("No Twitter OAuth credentials for this user.");
+    }
+
+    return new TwitterOAuthClient($token->key, $token->secret);
+}
+
+function homeStreamForUser(User $user)
+{
+    $auth = twitterAuthForUser($user);
+    return new TwitterUserStream($auth);
+}
+
+function siteStreamForOwner(User $user)
+{
+    // The user we auth as must be the owner of the application.
+    $auth = twitterAuthForUser($user);
+
+    if (have_option('apiroot')) {
+        $stream = new TwitterSiteStream($auth, get_option_value('apiroot'));
+    } else {
+        $stream = new TwitterSiteStream($auth);
+    }
+
+    // Pull Twitter user IDs for all users we want to pull data for
+    $userIds = array();
+
+    $flink = new Foreign_link();
+    $flink->service = TWITTER_SERVICE;
+    $flink->find();
+
+    while ($flink->fetch()) {
+        if (($flink->noticesync & FOREIGN_NOTICE_RECV) ==
+            FOREIGN_NOTICE_RECV) {
+            $userIds[] = $flink->foreign_id;
+        }
+    }
+
+    $stream->followUsers($userIds);
+    return $stream;
+}
+
+
+$user = User::staticGet('nickname', $nickname);
+global $myuser;
+$myuser = $user;
+
+if (have_option('all')) {
+    $stream = siteStreamForOwner($user);
+} else {
+    $stream = homeStreamForUser($user);
+}
+
+
+$stream->hookEvent('raw', function($data, $context) {
+    common_log(LOG_INFO, json_encode($data) . ' for ' . json_encode($context));
+});
+$stream->hookEvent('friends', function($data, $context) {
+    printf("Friend list: %s\n", implode(', ', $data->friends));
+});
+$stream->hookEvent('favorite', function($data, $context) {
+    printf("%s favorited %s's notice: %s\n",
+            $data->source->screen_name,
+            $data->target->screen_name,
+            $data->target_object->text);
+});
+$stream->hookEvent('unfavorite', function($data, $context) {
+    printf("%s unfavorited %s's notice: %s\n",
+            $data->source->screen_name,
+            $data->target->screen_name,
+            $data->target_object->text);
+});
+$stream->hookEvent('follow', function($data, $context) {
+    printf("%s friended %s\n",
+            $data->source->screen_name,
+            $data->target->screen_name);
+});
+$stream->hookEvent('unfollow', function($data, $context) {
+    printf("%s unfriended %s\n",
+            $data->source->screen_name,
+            $data->target->screen_name);
+});
+$stream->hookEvent('delete', function($data, $context) {
+    printf("Deleted status notification: %s\n",
+            $data->status->id);
+});
+$stream->hookEvent('scrub_geo', function($data, $context) {
+    printf("Req to scrub geo data for user id %s up to status ID %s\n",
+            $data->user_id,
+            $data->up_to_status_id);
+});
+$stream->hookEvent('status', function($data, $context) {
+    printf("Received status update from %s: %s\n",
+            $data->user->screen_name,
+            $data->text);
+
+    if (have_option('import')) {
+        $importer = new TwitterImport();
+        printf("\timporting...");
+        $notice = $importer->importStatus($data);
+        if ($notice) {
+            global $myuser;
+            Inbox::insertNotice($myuser->id, $notice->id);
+            printf(" %s\n", $notice->id);
+        } else {
+            printf(" FAIL\n");
+        }
+    }
+});
+$stream->hookEvent('direct_message', function($data) {
+    printf("Direct message from %s to %s: %s\n",
+            $data->sender->screen_name,
+            $data->recipient->screen_name,
+            $data->text);
+});
+
+class TwitterManager extends IoManager
+{
+    function __construct(TwitterStreamReader $stream)
+    {
+        $this->stream = $stream;
+    }
+
+    function getSockets()
+    {
+        return $this->stream->getSockets();
+    }
+
+    function handleInput($data)
+    {
+        $this->stream->handleInput($data);
+        return true;
+    }
+
+    function start()
+    {
+        $this->stream->connect();
+        return true;
+    }
+
+    function finish()
+    {
+        $this->stream->close();
+        return true;
+    }
+
+    public static function get()
+    {
+        throw new Exception('not a singleton');
+    }
+}
+
+class TwitterStreamMaster extends IoMaster
+{
+    function __construct($id, $ioManager)
+    {
+        parent::__construct($id);
+        $this->ioManager = $ioManager;
+    }
+
+    /**
+     * Initialize IoManagers which are appropriate to this instance.
+     */
+    function initManagers()
+    {
+        $this->instantiate($this->ioManager);
+    }
+}
+
+$master = new TwitterStreamMaster('TwitterStream', new TwitterManager($stream));
+$master->init();
+$master->service();
diff --git a/plugins/TwitterBridge/tweetctlqueuehandler.php b/plugins/TwitterBridge/tweetctlqueuehandler.php
new file mode 100644
index 000000000..4c8bef463
--- /dev/null
+++ b/plugins/TwitterBridge/tweetctlqueuehandler.php
@@ -0,0 +1,59 @@
+<?php
+/*
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2010, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
+
+require_once INSTALLDIR . '/plugins/TwitterBridge/twitter.php';
+
+/**
+ * Queue handler to deal with incoming Twitter status updates, as retrieved by
+ * TwitterDaemon (twitterdaemon.php).
+ *
+ * The queue handler passes the status through TwitterImporter for import into the
+ * local database (if necessary), then adds the imported notice to the local inbox
+ * of the attached Twitter user.
+ *
+ * Warning: the way we do inbox distribution manually means that realtime, XMPP, etc
+ * don't work on Twitter-borne messages. When TwitterImporter is changed to handle
+ * that correctly, we'll only need to do this once...?
+ */
+class TweetCtlQueueHandler extends QueueHandler
+{
+    function transport()
+    {
+        return 'tweetctl';
+    }
+
+    function handle($data)
+    {
+        // A user has activated or deactivated their Twitter bridge
+        // import status.
+        $action = $data['action'];
+        $userId = $data['for_user'];
+
+        $tm = TwitterManager::get();
+        if ($action == 'start') {
+            $tm->startTwitterUser($userId);
+        } else if ($action == 'stop') {
+            $tm->stopTwitterUser($userId);
+        }
+
+        return true;
+    }
+}
diff --git a/plugins/TwitterBridge/tweetinqueuehandler.php b/plugins/TwitterBridge/tweetinqueuehandler.php
new file mode 100644
index 000000000..ff6b2cc86
--- /dev/null
+++ b/plugins/TwitterBridge/tweetinqueuehandler.php
@@ -0,0 +1,63 @@
+<?php
+/*
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2010, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
+
+require_once INSTALLDIR . '/plugins/TwitterBridge/twitter.php';
+
+/**
+ * Queue handler to deal with incoming Twitter status updates, as retrieved by
+ * TwitterDaemon (twitterdaemon.php).
+ *
+ * The queue handler passes the status through TwitterImporter for import into the
+ * local database (if necessary), then adds the imported notice to the local inbox
+ * of the attached Twitter user.
+ *
+ * Warning: the way we do inbox distribution manually means that realtime, XMPP, etc
+ * don't work on Twitter-borne messages. When TwitterImporter is changed to handle
+ * that correctly, we'll only need to do this once...?
+ */
+class TweetInQueueHandler extends QueueHandler
+{
+    function transport()
+    {
+        return 'tweetin';
+    }
+
+    function handle($data)
+    {
+        // JSON object with Twitter data
+        $status = $data['status'];
+
+        // Twitter user ID this incoming data belongs to.
+        $receiver = $data['for_user'];
+
+        $importer = new TwitterImport();
+        $notice = $importer->importStatus($status);
+        if ($notice) {
+            $flink = Foreign_link::getByForeignID(TWITTER_SERVICE, $receiver);
+            if ($flink) {
+                // @fixme this should go through more regular channels?
+                Inbox::insertNotice($flink->user_id, $notice->id);
+            }
+        }
+
+        return true;
+    }
+}
diff --git a/plugins/TwitterBridge/twitterimport.php b/plugins/TwitterBridge/twitterimport.php
new file mode 100644
index 000000000..07a9cf95f
--- /dev/null
+++ b/plugins/TwitterBridge/twitterimport.php
@@ -0,0 +1,651 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Plugin
+ * @package   StatusNet
+ * @author    Zach Copley <zach@status.net>
+ * @author    Julien C <chaumond@gmail.com>
+ * @author    Brion Vibber <brion@status.net>
+ * @copyright 2009-2010 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+require_once INSTALLDIR . '/plugins/TwitterBridge/twitter.php';
+
+/**
+ * Encapsulation of the Twitter status -> notice incoming bridge import.
+ * Is used by both the polling twitterstatusfetcher.php daemon, and the
+ * in-progress streaming import.
+ *
+ * @category Plugin
+ * @package  StatusNet
+ * @author   Zach Copley <zach@status.net>
+ * @author   Julien C <chaumond@gmail.com>
+ * @author   Brion Vibber <brion@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ * @link     http://twitter.com/
+ */
+class TwitterImport
+{
+    public function importStatus($status)
+    {
+        // Hacktastic: filter out stuff coming from this StatusNet
+        $source = mb_strtolower(common_config('integration', 'source'));
+
+        if (preg_match("/$source/", mb_strtolower($status->source))) {
+            common_debug($this->name() . ' - Skipping import of status ' .
+                         $status->id . ' with source ' . $source);
+            return null;
+        }
+
+        // Don't save it if the user is protected
+        // FIXME: save it but treat it as private
+        if ($status->user->protected) {
+            return null;
+        }
+
+        $notice = $this->saveStatus($status);
+
+        return $notice;
+    }
+
+    function name()
+    {
+        return get_class($this);
+    }
+
+    function saveStatus($status)
+    {
+        $profile = $this->ensureProfile($status->user);
+
+        if (empty($profile)) {
+            common_log(LOG_ERR, $this->name() .
+                ' - Problem saving notice. No associated Profile.');
+            return null;
+        }
+
+        $statusUri = $this->makeStatusURI($status->user->screen_name, $status->id);
+
+        // check to see if we've already imported the status
+        $n2s = Notice_to_status::staticGet('status_id', $status->id);
+
+        if (!empty($n2s)) {
+            common_log(
+                LOG_INFO,
+                $this->name() .
+                " - Ignoring duplicate import: {$status->id}"
+            );
+            return Notice::staticGet('id', $n2s->notice_id);
+        }
+
+        // If it's a retweet, save it as a repeat!
+        if (!empty($status->retweeted_status)) {
+            common_log(LOG_INFO, "Status {$status->id} is a retweet of {$status->retweeted_status->id}.");
+            $original = $this->saveStatus($status->retweeted_status);
+            if (empty($original)) {
+                return null;
+            } else {
+                $author = $original->getProfile();
+                // TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
+                // TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
+                $content = sprintf(_m('RT @%1$s %2$s'),
+                                   $author->nickname,
+                                   $original->content);
+
+                if (Notice::contentTooLong($content)) {
+                    $contentlimit = Notice::maxContent();
+                    $content = mb_substr($content, 0, $contentlimit - 4) . ' ...';
+                }
+
+                $repeat = Notice::saveNew($profile->id,
+                                          $content,
+                                          'twitter',
+                                          array('repeat_of' => $original->id,
+                                                'uri' => $statusUri,
+                                                'is_local' => Notice::GATEWAY));
+                common_log(LOG_INFO, "Saved {$repeat->id} as a repeat of {$original->id}");
+                Notice_to_status::saveNew($repeat->id, $status->id);
+                return $repeat;
+            }
+        }
+
+        $notice = new Notice();
+
+        $notice->profile_id = $profile->id;
+        $notice->uri        = $statusUri;
+        $notice->url        = $statusUri;
+        $notice->created    = strftime(
+            '%Y-%m-%d %H:%M:%S',
+            strtotime($status->created_at)
+        );
+
+        $notice->source     = 'twitter';
+
+        $notice->reply_to   = null;
+
+        if (!empty($status->in_reply_to_status_id)) {
+            common_log(LOG_INFO, "Status {$status->id} is a reply to status {$status->in_reply_to_status_id}");
+            $n2s = Notice_to_status::staticGet('status_id', $status->in_reply_to_status_id);
+            if (empty($n2s)) {
+                common_log(LOG_INFO, "Couldn't find local notice for status {$status->in_reply_to_status_id}");
+            } else {
+                $reply = Notice::staticGet('id', $n2s->notice_id);
+                if (empty($reply)) {
+                    common_log(LOG_INFO, "Couldn't find local notice for status {$status->in_reply_to_status_id}");
+                } else {
+                    common_log(LOG_INFO, "Found local notice {$reply->id} for status {$status->in_reply_to_status_id}");
+                    $notice->reply_to     = $reply->id;
+                    $notice->conversation = $reply->conversation;
+                }
+            }
+        }
+
+        if (empty($notice->conversation)) {
+            $conv = Conversation::create();
+            $notice->conversation = $conv->id;
+            common_log(LOG_INFO, "No known conversation for status {$status->id} so making a new one {$conv->id}.");
+        }
+
+        $notice->is_local   = Notice::GATEWAY;
+
+        $notice->content  = html_entity_decode($status->text, ENT_QUOTES, 'UTF-8');
+        $notice->rendered = $this->linkify($status);
+
+        if (Event::handle('StartNoticeSave', array(&$notice))) {
+
+            $id = $notice->insert();
+
+            if (!$id) {
+                common_log_db_error($notice, 'INSERT', __FILE__);
+                common_log(LOG_ERR, $this->name() .
+                    ' - Problem saving notice.');
+            }
+
+            Event::handle('EndNoticeSave', array($notice));
+        }
+
+        Notice_to_status::saveNew($notice->id, $status->id);
+
+        $this->saveStatusMentions($notice, $status);
+
+        $notice->blowOnInsert();
+
+        return $notice;
+    }
+
+    /**
+     * Make an URI for a status.
+     *
+     * @param object $status status object
+     *
+     * @return string URI
+     */
+    function makeStatusURI($username, $id)
+    {
+        return 'http://twitter.com/'
+          . $username
+          . '/status/'
+          . $id;
+    }
+
+
+    /**
+     * Look up a Profile by profileurl field.  Profile::staticGet() was
+     * not working consistently.
+     *
+     * @param string $nickname   local nickname of the Twitter user
+     * @param string $profileurl the profile url
+     *
+     * @return mixed value the first Profile with that url, or null
+     */
+    function getProfileByUrl($nickname, $profileurl)
+    {
+        $profile = new Profile();
+        $profile->nickname = $nickname;
+        $profile->profileurl = $profileurl;
+        $profile->limit(1);
+
+        if ($profile->find()) {
+            $profile->fetch();
+            return $profile;
+        }
+
+        return null;
+    }
+
+    /**
+     * Check to see if this Twitter status has already been imported
+     *
+     * @param Profile $profile   Twitter user's local profile
+     * @param string  $statusUri URI of the status on Twitter
+     *
+     * @return mixed value a matching Notice or null
+     */
+    function checkDupe($profile, $statusUri)
+    {
+        $notice = new Notice();
+        $notice->uri = $statusUri;
+        $notice->profile_id = $profile->id;
+        $notice->limit(1);
+
+        if ($notice->find()) {
+            $notice->fetch();
+            return $notice;
+        }
+
+        return null;
+    }
+
+    function ensureProfile($user)
+    {
+        // check to see if there's already a profile for this user
+        $profileurl = 'http://twitter.com/' . $user->screen_name;
+        $profile = $this->getProfileByUrl($user->screen_name, $profileurl);
+
+        if (!empty($profile)) {
+            common_debug($this->name() .
+                         " - Profile for $profile->nickname found.");
+
+            // Check to see if the user's Avatar has changed
+
+            $this->checkAvatar($user, $profile);
+            return $profile;
+
+        } else {
+            common_debug($this->name() . ' - Adding profile and remote profile ' .
+                         "for Twitter user: $profileurl.");
+
+            $profile = new Profile();
+            $profile->query("BEGIN");
+
+            $profile->nickname = $user->screen_name;
+            $profile->fullname = $user->name;
+            $profile->homepage = $user->url;
+            $profile->bio = $user->description;
+            $profile->location = $user->location;
+            $profile->profileurl = $profileurl;
+            $profile->created = common_sql_now();
+
+            try {
+                $id = $profile->insert();
+            } catch(Exception $e) {
+                common_log(LOG_WARNING, $this->name() . ' Couldn\'t insert profile - ' . $e->getMessage());
+            }
+
+            if (empty($id)) {
+                common_log_db_error($profile, 'INSERT', __FILE__);
+                $profile->query("ROLLBACK");
+                return false;
+            }
+
+            // check for remote profile
+
+            $remote_pro = Remote_profile::staticGet('uri', $profileurl);
+
+            if (empty($remote_pro)) {
+                $remote_pro = new Remote_profile();
+
+                $remote_pro->id = $id;
+                $remote_pro->uri = $profileurl;
+                $remote_pro->created = common_sql_now();
+
+                try {
+                    $rid = $remote_pro->insert();
+                } catch (Exception $e) {
+                    common_log(LOG_WARNING, $this->name() . ' Couldn\'t save remote profile - ' . $e->getMessage());
+                }
+
+                if (empty($rid)) {
+                    common_log_db_error($profile, 'INSERT', __FILE__);
+                    $profile->query("ROLLBACK");
+                    return false;
+                }
+            }
+
+            $profile->query("COMMIT");
+
+            $this->saveAvatars($user, $id);
+
+            return $profile;
+        }
+    }
+
+    function checkAvatar($twitter_user, $profile)
+    {
+        global $config;
+
+        $path_parts = pathinfo($twitter_user->profile_image_url);
+
+        $newname = 'Twitter_' . $twitter_user->id . '_' .
+            $path_parts['basename'];
+
+        $oldname = $profile->getAvatar(48)->filename;
+
+        if ($newname != $oldname) {
+            common_debug($this->name() . ' - Avatar for Twitter user ' .
+                         "$profile->nickname has changed.");
+            common_debug($this->name() . " - old: $oldname new: $newname");
+
+            $this->updateAvatars($twitter_user, $profile);
+        }
+
+        if ($this->missingAvatarFile($profile)) {
+            common_debug($this->name() . ' - Twitter user ' .
+                         $profile->nickname .
+                         ' is missing one or more local avatars.');
+            common_debug($this->name() ." - old: $oldname new: $newname");
+
+            $this->updateAvatars($twitter_user, $profile);
+        }
+    }
+
+    function updateAvatars($twitter_user, $profile) {
+
+        global $config;
+
+        $path_parts = pathinfo($twitter_user->profile_image_url);
+
+        $img_root = substr($path_parts['basename'], 0, -11);
+        $ext = $path_parts['extension'];
+        $mediatype = $this->getMediatype($ext);
+
+        foreach (array('mini', 'normal', 'bigger') as $size) {
+            $url = $path_parts['dirname'] . '/' .
+                $img_root . '_' . $size . ".$ext";
+            $filename = 'Twitter_' . $twitter_user->id . '_' .
+                $img_root . "_$size.$ext";
+
+            $this->updateAvatar($profile->id, $size, $mediatype, $filename);
+            $this->fetchAvatar($url, $filename);
+        }
+    }
+
+    function missingAvatarFile($profile) {
+        foreach (array(24, 48, 73) as $size) {
+            $filename = $profile->getAvatar($size)->filename;
+            $avatarpath = Avatar::path($filename);
+            if (file_exists($avatarpath) == FALSE) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    function getMediatype($ext)
+    {
+        $mediatype = null;
+
+        switch (strtolower($ext)) {
+        case 'jpg':
+            $mediatype = 'image/jpg';
+            break;
+        case 'gif':
+            $mediatype = 'image/gif';
+            break;
+        default:
+            $mediatype = 'image/png';
+        }
+
+        return $mediatype;
+    }
+
+    function saveAvatars($user, $id)
+    {
+        global $config;
+
+        $path_parts = pathinfo($user->profile_image_url);
+        $ext = $path_parts['extension'];
+        $end = strlen('_normal' . $ext);
+        $img_root = substr($path_parts['basename'], 0, -($end+1));
+        $mediatype = $this->getMediatype($ext);
+
+        foreach (array('mini', 'normal', 'bigger') as $size) {
+            $url = $path_parts['dirname'] . '/' .
+                $img_root . '_' . $size . ".$ext";
+            $filename = 'Twitter_' . $user->id . '_' .
+                $img_root . "_$size.$ext";
+
+            if ($this->fetchAvatar($url, $filename)) {
+                $this->newAvatar($id, $size, $mediatype, $filename);
+            } else {
+                common_log(LOG_WARNING, $id() .
+                           " - Problem fetching Avatar: $url");
+            }
+        }
+    }
+
+    function updateAvatar($profile_id, $size, $mediatype, $filename) {
+
+        common_debug($this->name() . " - Updating avatar: $size");
+
+        $profile = Profile::staticGet($profile_id);
+
+        if (empty($profile)) {
+            common_debug($this->name() . " - Couldn't get profile: $profile_id!");
+            return;
+        }
+
+        $sizes = array('mini' => 24, 'normal' => 48, 'bigger' => 73);
+        $avatar = $profile->getAvatar($sizes[$size]);
+
+        // Delete the avatar, if present
+        if ($avatar) {
+            $avatar->delete();
+        }
+
+        $this->newAvatar($profile->id, $size, $mediatype, $filename);
+    }
+
+    function newAvatar($profile_id, $size, $mediatype, $filename)
+    {
+        global $config;
+
+        $avatar = new Avatar();
+        $avatar->profile_id = $profile_id;
+
+        switch($size) {
+        case 'mini':
+            $avatar->width  = 24;
+            $avatar->height = 24;
+            break;
+        case 'normal':
+            $avatar->width  = 48;
+            $avatar->height = 48;
+            break;
+        default:
+            // Note: Twitter's big avatars are a different size than
+            // StatusNet's (StatusNet's = 96)
+            $avatar->width  = 73;
+            $avatar->height = 73;
+        }
+
+        $avatar->original = 0; // we don't have the original
+        $avatar->mediatype = $mediatype;
+        $avatar->filename = $filename;
+        $avatar->url = Avatar::url($filename);
+
+        $avatar->created = common_sql_now();
+
+        try {
+            $id = $avatar->insert();
+        } catch (Exception $e) {
+            common_log(LOG_WARNING, $this->name() . ' Couldn\'t insert avatar - ' . $e->getMessage());
+        }
+
+        if (empty($id)) {
+            common_log_db_error($avatar, 'INSERT', __FILE__);
+            return null;
+        }
+
+        common_debug($this->name() .
+                     " - Saved new $size avatar for $profile_id.");
+
+        return $id;
+    }
+
+    /**
+     * Fetch a remote avatar image and save to local storage.
+     *
+     * @param string $url avatar source URL
+     * @param string $filename bare local filename for download
+     * @return bool true on success, false on failure
+     */
+    function fetchAvatar($url, $filename)
+    {
+        common_debug($this->name() . " - Fetching Twitter avatar: $url");
+
+        $request = HTTPClient::start();
+        $response = $request->get($url);
+        if ($response->isOk()) {
+            $avatarfile = Avatar::path($filename);
+            $ok = file_put_contents($avatarfile, $response->getBody());
+            if (!$ok) {
+                common_log(LOG_WARNING, $this->name() .
+                           " - Couldn't open file $filename");
+                return false;
+            }
+        } else {
+            return false;
+        }
+
+        return true;
+    }
+
+    const URL = 1;
+    const HASHTAG = 2;
+    const MENTION = 3;
+
+    function linkify($status)
+    {
+        $text = $status->text;
+
+        if (empty($status->entities)) {
+            common_log(LOG_WARNING, "No entities data for {$status->id}; trying to fake up links ourselves.");
+            $text = common_replace_urls_callback($text, 'common_linkify');
+            $text = preg_replace('/(^|\&quot\;|\'|\(|\[|\{|\s+)#([\pL\pN_\-\.]{1,64})/e', "'\\1#'.TwitterStatusFetcher::tagLink('\\2')", $text);
+            $text = preg_replace('/(^|\s+)@([a-z0-9A-Z_]{1,64})/e', "'\\1@'.TwitterStatusFetcher::atLink('\\2')", $text);
+            return $text;
+        }
+
+        // Move all the entities into order so we can
+        // replace them in reverse order and thus
+        // not mess up their indices
+
+        $toReplace = array();
+
+        if (!empty($status->entities->urls)) {
+            foreach ($status->entities->urls as $url) {
+                $toReplace[$url->indices[0]] = array(self::URL, $url);
+            }
+        }
+
+        if (!empty($status->entities->hashtags)) {
+            foreach ($status->entities->hashtags as $hashtag) {
+                $toReplace[$hashtag->indices[0]] = array(self::HASHTAG, $hashtag);
+            }
+        }
+
+        if (!empty($status->entities->user_mentions)) {
+            foreach ($status->entities->user_mentions as $mention) {
+                $toReplace[$mention->indices[0]] = array(self::MENTION, $mention);
+            }
+        }
+
+        // sort in reverse order by key
+
+        krsort($toReplace);
+
+        foreach ($toReplace as $part) {
+            list($type, $object) = $part;
+            switch($type) {
+            case self::URL:
+                $linkText = $this->makeUrlLink($object);
+                break;
+            case self::HASHTAG:
+                $linkText = $this->makeHashtagLink($object);
+                break;
+            case self::MENTION:
+                $linkText = $this->makeMentionLink($object);
+                break;
+            default:
+                continue;
+            }
+            $text = mb_substr($text, 0, $object->indices[0]) . $linkText . mb_substr($text, $object->indices[1]);
+        }
+        return $text;
+    }
+
+    function makeUrlLink($object)
+    {
+        return "<a href='{$object->url}' class='extlink'>{$object->url}</a>";
+    }
+
+    function makeHashtagLink($object)
+    {
+        return "#" . self::tagLink($object->text);
+    }
+
+    function makeMentionLink($object)
+    {
+        return "@".self::atLink($object->screen_name, $object->name);
+    }
+
+    static function tagLink($tag)
+    {
+        return "<a href='https://twitter.com/search?q=%23{$tag}' class='hashtag'>{$tag}</a>";
+    }
+
+    static function atLink($screenName, $fullName=null)
+    {
+        if (!empty($fullName)) {
+            return "<a href='http://twitter.com/{$screenName}' title='{$fullName}'>{$screenName}</a>";
+        } else {
+            return "<a href='http://twitter.com/{$screenName}'>{$screenName}</a>";
+        }
+    }
+
+    function saveStatusMentions($notice, $status)
+    {
+        $mentions = array();
+
+        if (empty($status->entities) || empty($status->entities->user_mentions)) {
+            return;
+        }
+
+        foreach ($status->entities->user_mentions as $mention) {
+            $flink = Foreign_link::getByForeignID($mention->id, TWITTER_SERVICE);
+            if (!empty($flink)) {
+                $user = User::staticGet('id', $flink->user_id);
+                if (!empty($user)) {
+                    $reply = new Reply();
+                    $reply->notice_id  = $notice->id;
+                    $reply->profile_id = $user->id;
+                    common_log(LOG_INFO, __METHOD__ . ": saving reply: notice {$notice->id} to profile {$user->id}");
+                    $id = $reply->insert();
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/plugins/TwitterBridge/twittersettings.php b/plugins/TwitterBridge/twittersettings.php
index 33c5eb65b..c169172b0 100644
--- a/plugins/TwitterBridge/twittersettings.php
+++ b/plugins/TwitterBridge/twittersettings.php
@@ -285,6 +285,7 @@ class TwittersettingsAction extends ConnectSettingsAction
         }
 
         $original = clone($flink);
+        $wasReceiving = (bool)($original->noticesync & FOREIGN_NOTICE_RECV);
         $flink->set_flags($noticesend, $noticerecv, $replysync, $friendsync);
         $result = $flink->update($original);
 
@@ -294,6 +295,19 @@ class TwittersettingsAction extends ConnectSettingsAction
             return;
         }
 
+        if ($wasReceiving xor $noticerecv) {
+            $this->notifyDaemon($flink->foreign_id, $noticerecv);
+        }
+
         $this->showForm(_m('Twitter preferences saved.'), true);
     }
+
+    /**
+     * Tell the import daemon that we've updated a user's receive status.
+     */
+    function notifyDaemon($twitterUserId, $receiving)
+    {
+        // todo... should use control signals rather than queues
+    }
+
 }
diff --git a/plugins/TwitterBridge/twitterstreamreader.php b/plugins/TwitterBridge/twitterstreamreader.php
new file mode 100644
index 000000000..5b0613bc4
--- /dev/null
+++ b/plugins/TwitterBridge/twitterstreamreader.php
@@ -0,0 +1,285 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Plugin
+ * @package   StatusNet
+ * @author    Brion Vibber <brion@status.net>
+ * @copyright 2010 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+/**
+ * Base class for reading Twitter's User Streams and Site Streams
+ * real-time streaming APIs.
+ *
+ * Caller can hook event callbacks for various types of messages;
+ * the data from the stream and some context info will be passed
+ * on to the callbacks.
+ */
+abstract class TwitterStreamReader extends JsonStreamReader
+{
+    protected $callbacks = array();
+
+    function __construct(TwitterOAuthClient $auth, $baseUrl)
+    {
+        $this->baseUrl = $baseUrl;
+        $this->oauth = $auth;
+    }
+
+    public function connect($method, $params=array())
+    {
+        $url = $this->oAuthUrl($this->baseUrl . '/' . $method, $params);
+        return parent::connect($url);
+    }
+
+    /**
+     * Sign our target URL with OAuth auth stuff.
+     *
+     * @param string $url
+     * @param array $params
+     * @return string 
+     */
+    protected function oAuthUrl($url, $params=array())
+    {
+        // In an ideal world this would be better encapsulated. :)
+        $request = OAuthRequest::from_consumer_and_token($this->oauth->consumer,
+            $this->oauth->token, 'GET', $url, $params);
+        $request->sign_request($this->oauth->sha1_method,
+            $this->oauth->consumer, $this->oauth->token);
+
+        return $request->to_url();
+    }
+
+    /**
+     * Add an event callback to receive notifications when things come in
+     * over the wire.
+     *
+     * Callbacks should be in the form: function(object $data, array $context)
+     * where $context may list additional data on some streams, such as the
+     * user to whom the message should be routed.
+     *
+     * Available events:
+     *
+     * Messaging:
+     *
+     * 'status': $data contains a status update in standard Twitter JSON format.
+     *      $data->user: sending user in standard Twitter JSON format.
+     *      $data->text... etc
+     *
+     * 'direct_message': $data contains a direct message in standard Twitter JSON format.
+     *      $data->sender: sending user in standard Twitter JSON format.
+     *      $data->recipient: receiving user in standard Twitter JSON format.
+     *      $data->text... etc
+     *
+     *
+     * Out of band events:
+     *
+     * 'follow': User has either started following someone, or is being followed.
+     *      $data->source: following user in standard Twitter JSON format.
+     *      $data->target: followed user in standard Twitter JSON format.
+     *
+     * 'favorite': Someone has favorited a status update.
+     *      $data->source: user doing the favoriting, in standard Twitter JSON format.
+     *      $data->target: user whose status was favorited, in standard Twitter JSON format.
+     *      $data->target_object: the favorited status update in standard Twitter JSON format.
+     *
+     * 'unfavorite': Someone has unfavorited a status update.
+     *      $data->source: user doing the unfavoriting, in standard Twitter JSON format.
+     *      $data->target: user whose status was unfavorited, in standard Twitter JSON format.
+     *      $data->target_object: the unfavorited status update in standard Twitter JSON format.
+     *
+     *
+     * Meta information:
+     *
+     * 'friends':
+     *      $data->friends: array of user IDs of the current user's friends.
+     *
+     * 'delete': Advisory that a Twitter status has been deleted; nice clients
+     *           should follow suit.
+     *      $data->id: ID of status being deleted
+     *      $data->user_id: ID of its owning user
+     *
+     * 'scrub_geo': Advisory that a user is clearing geo data from their status
+     *              stream; nice clients should follow suit.
+     *      $data->user_id: ID of user
+     *      $data->up_to_status_id: any notice older than this should be scrubbed.
+     *
+     * 'limit': Advisory that tracking has hit a resource limit.
+     *      $data->track
+     *
+     * 'raw': receives the full JSON data for all message types.
+     *
+     * @param string $event
+     * @param callable $callback
+     */
+    public function hookEvent($event, $callback)
+    {
+        $this->callbacks[$event][] = $callback;
+    }
+
+    /**
+     * Call event handler callbacks for the given event.
+     * 
+     * @param string $event
+     * @param mixed $arg1 ... one or more params to pass on
+     */
+    protected function fireEvent($event, $arg1)
+    {
+        if (array_key_exists($event, $this->callbacks)) {
+            $args = array_slice(func_get_args(), 1);
+            foreach ($this->callbacks[$event] as $callback) {
+                call_user_func_array($callback, $args);
+            }
+        }
+    }
+
+    protected function handleJson(stdClass $data)
+    {
+        $this->routeMessage($data);
+    }
+
+    abstract protected function routeMessage(stdClass $data);
+
+    /**
+     * Send the decoded JSON object out to any event listeners.
+     *
+     * @param array $data
+     * @param array $context optional additional context data to pass on
+     */
+    protected function handleMessage(stdClass $data, array $context=array())
+    {
+        $this->fireEvent('raw', $data, $context);
+
+        if (isset($data->text)) {
+            $this->fireEvent('status', $data, $context);
+            return;
+        }
+        if (isset($data->event)) {
+            $this->fireEvent($data->event, $data, $context);
+            return;
+        }
+        if (isset($data->friends)) {
+            $this->fireEvent('friends', $data, $context);
+        }
+
+        $knownMeta = array('delete', 'scrub_geo', 'limit', 'direct_message');
+        foreach ($knownMeta as $key) {
+            if (isset($data->$key)) {
+                $this->fireEvent($key, $data->$key, $context);
+                return;
+            }
+        }
+    }
+}
+
+/**
+ * Multiuser stream listener for Twitter Site Streams API
+ * http://dev.twitter.com/pages/site_streams
+ *
+ * The site streams API allows listening to updates for multiple users.
+ * Pass in the user IDs to listen to in via followUser() -- note they
+ * must each have a valid OAuth token for the application ID we're
+ * connecting as.
+ *
+ * You'll need to be connecting with the auth keys for the user who
+ * owns the application registration.
+ *
+ * The user each message is destined for will be passed to event handlers
+ * in $context['for_user_id'].
+ */
+class TwitterSiteStream extends TwitterStreamReader
+{
+    protected $userIds;
+
+    public function __construct(TwitterOAuthClient $auth, $baseUrl='http://betastream.twitter.com')
+    {
+        parent::__construct($auth, $baseUrl);
+    }
+
+    public function connect($method='2b/site.json')
+    {
+        $params = array();
+        if ($this->userIds) {
+            $params['follow'] = implode(',', $this->userIds);
+        }
+        return parent::connect($method, $params);
+    }
+
+    /**
+     * Set the users whose home streams should be pulled.
+     * They all must have valid oauth tokens for this application.
+     *
+     * Must be called before connect().
+     *
+     * @param array $userIds
+     */
+    function followUsers($userIds)
+    {
+        $this->userIds = $userIds;
+    }
+
+    /**
+     * Each message in the site stream tells us which user ID it should be
+     * routed to; we'll need that to let the caller know what to do.
+     *
+     * @param array $data
+     */
+    function routeMessage(stdClass $data)
+    {
+        $context = array(
+            'source' => 'sitestream',
+            'for_user' => $data->for_user
+        );
+        parent::handleMessage($data->message, $context);
+    }
+}
+
+/**
+ * Stream listener for Twitter User Streams API
+ * http://dev.twitter.com/pages/user_streams
+ *
+ * This will pull the home stream and additional events just for the user
+ * we've authenticated as.
+ */
+class TwitterUserStream extends TwitterStreamReader
+{
+    public function __construct(TwitterOAuthClient $auth, $baseUrl='https://userstream.twitter.com')
+    {
+        parent::__construct($auth, $baseUrl);
+    }
+
+    public function connect($method='2/user.json')
+    {
+        return parent::connect($method);
+    }
+
+    /**
+     * Each message in the user stream is just ready to go.
+     *
+     * @param array $data
+     */
+    function routeMessage(stdClass $data)
+    {
+        $context = array(
+            'source' => 'userstream'
+        );
+        parent::handleMessage($data, $context);
+    }
+}
diff --git a/plugins/UserFlag/UserFlagPlugin.php b/plugins/UserFlag/UserFlagPlugin.php
index e6ad3e37d..fc7698841 100644
--- a/plugins/UserFlag/UserFlagPlugin.php
+++ b/plugins/UserFlag/UserFlagPlugin.php
@@ -128,25 +128,9 @@ class UserFlagPlugin extends Plugin
      */
     function onEndProfilePageActionsElements(&$action, $profile)
     {
-        $user = common_current_user();
-
-        if (!empty($user) && ($user->id != $profile->id)) {
-
-            $action->elementStart('li', 'entity_flag');
-
-            if (User_flag_profile::exists($profile->id, $user->id)) {
-                // @todo FIXME: Add a title explaining what 'flagged' means?
-                // TRANS: Message added to a profile if it has been flagged for review.
-                $action->element('p', 'flagged', _('Flagged'));
-            } else {
-                $form = new FlagProfileForm($action, $profile,
-                                            array('action' => 'showstream',
-                                                  'nickname' => $profile->nickname));
-                $form->show();
-            }
-
-            $action->elementEnd('li');
-        }
+        $this->showFlagButton($action, $profile,
+                              array('action' => 'showstream',
+                                    'nickname' => $profile->nickname));
 
         return true;
     }
@@ -160,22 +144,40 @@ class UserFlagPlugin extends Plugin
      */
     function onEndProfileListItemActionElements($item)
     {
-        $user = common_current_user();
+        list($action, $args) = $item->action->returnToArgs();
+        $args['action'] = $action;
+        $this->showFlagButton($item->action, $item->profile, $args);
+
+        return true;
+    }
 
-        if (!empty($user)) {
+    /**
+     * Actually output a flag button. If the target profile has already been
+     * flagged by the current user, a null-action faux button is shown.
+     *
+     * @param Action $action
+     * @param Profile $profile
+     * @param array $returnToArgs
+     */
+    protected function showFlagButton($action, $profile, $returnToArgs)
+    {
+        $user = common_current_user();
 
-            list($action, $args) = $item->action->returnToArgs();
+        if (!empty($user) && ($user->id != $profile->id)) {
 
-            $args['action'] = $action;
+            $action->elementStart('li', 'entity_flag');
 
-            $form = new FlagProfileForm($item->action, $item->profile, $args);
+            if (User_flag_profile::exists($profile->id, $user->id)) {
+                // @todo FIXME: Add a title explaining what 'flagged' means?
+                // TRANS: Message added to a profile if it has been flagged for review.
+                $action->element('p', 'flagged', _m('Flagged'));
+            } else {
+                $form = new FlagProfileForm($action, $profile, $returnToArgs);
+                $form->show();
+            }
 
-            $item->action->elementStart('li', 'entity_flag');
-            $form->show();
-            $item->action->elementEnd('li');
+            $action->elementEnd('li');
         }
-
-        return true;
     }
 
     /**
diff --git a/plugins/UserFlag/User_flag_profile.php b/plugins/UserFlag/User_flag_profile.php
index 69fe0f356..f4e9844df 100644
--- a/plugins/UserFlag/User_flag_profile.php
+++ b/plugins/UserFlag/User_flag_profile.php
@@ -79,21 +79,36 @@ class User_flag_profile extends Memcached_DataObject
     /**
      * return key definitions for DB_DataObject
      *
-     * @return array key definitions
+     * @return array of key names
      */
     function keys()
     {
-        return array('profile_id' => 'K', 'user_id' => 'K');
+        return array_keys($this->keyTypes());
     }
 
     /**
      * return key definitions for DB_DataObject
      *
-     * @return array key definitions
+     * @return array map of key definitions
      */
     function keyTypes()
     {
-        return $this->keys();
+        return array('profile_id' => 'K', 'user_id' => 'K');
+    }
+
+    /**
+     * Magic formula for non-autoincrementing integer primary keys
+     *
+     * If a table has a single integer column as its primary key, DB_DataObject
+     * assumes that the column is auto-incrementing and makes a sequence table
+     * to do this incrementation. Since we don't need this for our class, we
+     * overload this method and return the magic formula that DB_DataObject needs.
+     *
+     * @return array magic three-false array that stops auto-incrementing.
+     */
+    function sequenceKey()
+    {
+        return array(false, false, false);
     }
 
     /**
diff --git a/plugins/UserFlag/flagprofile.php b/plugins/UserFlag/flagprofile.php
index 283eea40c..7096d3748 100644
--- a/plugins/UserFlag/flagprofile.php
+++ b/plugins/UserFlag/flagprofile.php
@@ -60,13 +60,6 @@ class FlagprofileAction extends ProfileFormAction
         assert(!empty($user)); // checked above
         assert(!empty($this->profile)); // checked above
 
-        if (User_flag_profile::exists($this->profile->id,
-                                      $user->id)) {
-            // TRANS: Client error when setting flag that has already been set for a profile.
-            $this->clientError(_m('Flag already exists.'));
-            return false;
-        }
-
         return true;
     }
 
@@ -104,7 +97,13 @@ class FlagprofileAction extends ProfileFormAction
 
         // throws an exception on error
 
-        User_flag_profile::create($user->id, $this->profile->id);
+        if (User_flag_profile::exists($this->profile->id,
+                                      $user->id)) {
+            // We'll return to the profile page (or return the updated AJAX form)
+            // showing the current state, so no harm done.
+        } else {
+            User_flag_profile::create($user->id, $this->profile->id);
+        }
 
         if ($this->boolean('ajax')) {
             $this->ajaxResults();
diff --git a/plugins/UserLimit/locale/fi/LC_MESSAGES/UserLimit.po b/plugins/UserLimit/locale/fi/LC_MESSAGES/UserLimit.po
new file mode 100644
index 000000000..5c768546a
--- /dev/null
+++ b/plugins/UserLimit/locale/fi/LC_MESSAGES/UserLimit.po
@@ -0,0 +1,26 @@
+# Translation of StatusNet - UserLimit to Finnish (Suomi)
+# Expored from translatewiki.net
+#
+# Author: Centerlink
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - UserLimit\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-11-02 22:51+0000\n"
+"PO-Revision-Date: 2010-11-02 22:55:20+0000\n"
+"Language-Team: Finnish <http://translatewiki.net/wiki/Portal:fi>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2010-10-29 16:14:14+0000\n"
+"X-Generator: MediaWiki 1.17alpha (r75875); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: fi\n"
+"X-Message-Group: #out-statusnet-plugin-userlimit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: UserLimitPlugin.php:89
+msgid "Limit the number of users who can register."
+msgstr "Rajoita niiden käyttäjien lukumäärää, jotka voivat rekisteröityä."
diff --git a/scripts/restoreuser.php b/scripts/restoreuser.php
index 82eb9bbaa..8327c796c 100644
--- a/scripts/restoreuser.php
+++ b/scripts/restoreuser.php
@@ -57,7 +57,8 @@ function getActivityStreamDocument()
         throw new Exception("File '$filename' not readable.");
     }
 
-    printfv(_("Getting backup from file '$filename'.")."\n");
+    // TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+    printfv(_("Getting backup from file '%s'.")."\n",$filename);
 
     $xml = file_get_contents($filename);
 
@@ -79,19 +80,22 @@ function importActivityStream($user, $doc)
 
     if (!empty($subjectEl)) {
         $subject = new ActivityObject($subjectEl);
-        printfv(_("Backup file for user %s (%s)")."\n", $subject->id, Ostatus_profile::getActivityObjectNickname($subject));
+        // TRANS: Commandline script output. %1$s is the subject ID, %2$s is the subject nickname.
+        printfv(_("Backup file for user %1$s (%2$s)")."\n", $subject->id, Ostatus_profile::getActivityObjectNickname($subject));
     } else {
         throw new Exception("Feed doesn't have an <activity:subject> element.");
     }
 
     if (is_null($user)) {
+        // TRANS: Commandline script output.
         printfv(_("No user specified; using backup user.")."\n");
         $user = userFromSubject($subject);
     }
 
     $entries = $feed->getElementsByTagNameNS(Activity::ATOM, 'entry');
 
-    printfv(_("%d entries in backup.")."\n", $entries->length);
+    // TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
+    printfv(_m("%d entry in backup.","%d entries in backup.",$entries->length)."\n", $entries->length);
 
     for ($i = $entries->length - 1; $i >= 0; $i--) {
         try {