Merge from 1.0.x

INSTALL

@@ -106,9 +106,9 @@ especially if you've previously installed PHP/MySQL packages.
 1. Unpack the tarball you downloaded on your Web server. Usually a
    command like this will work:
 
-       tar zxf statusnet-1.0.0rc1.tar.gz
+       tar zxf statusnet-1.0.1.tar.gz
 
-   ...which will make a statusnet-1.0.0rc1 subdirectory in your current
+   ...which will make a statusnet-1.0.1 subdirectory in your current
    directory. (If you don't have shell access on your Web server, you
    may have to unpack the tarball on your local computer and FTP the
    files to the server.)
@@ -116,7 +116,7 @@ especially if you've previously installed PHP/MySQL packages.
 2. Move the tarball to a directory of your choosing in your Web root
    directory. Usually something like this will work:
 
-       mv statusnet-1.0.0rc1 /var/www/statusnet
+       mv statusnet-1.0.1 /var/www/statusnet
 
    This will make your StatusNet instance available in the statusnet path of
    your server, like "http://example.net/statusnet". "microblog" or

README

@@ -2,8 +2,8 @@
 README
 ------
 
-StatusNet 1.0.0rc1
+StatusNet 1.0.1
-20 September 2011
+3 October 2011
 
 This is the README file for StatusNet, the Open Source social
 networking platform. It includes general information about the
@@ -107,11 +107,13 @@ for additional terms.
 New this version
 ================
 
-This is a major feature release since 0.9.9, released 2 August
+This is a minor bug fix release since 1.0.0, released 30 September
-2011. It is the first release of the new branch of StatusNet, and the
+2011. It fixes the following bugs:
-first release in the 1.x timeline.
 
-Notable changes this version:
+- Change default OEmbed provider from oohembed to noembed.
+- Fix problem with path matching on new installs.
+
+Notable additions in the 1.0.x series:
 
 - Support for private updates, including private-to-groups, private
   within a site, and private to followers only.
@@ -144,7 +146,7 @@ Notable changes this version:
 - Deeper integration with Activity Streams (http://activitystrea.ms) format.
 - Automated upgrade script.
 
-A full changelog is available at http://status.net/wiki/StatusNet_1.0.0.
+A full changelog is available at http://status.net/wiki/StatusNet_1.0.1.
 
 Troubleshooting
 ===============
@@ -197,6 +199,7 @@ Feedback
   place to discuss the software.
 * StatusNet has a bug tracker for any defects you may find, or ideas for
   making things better. http://status.net/open-source/issues
+* The StatusNet forum is at http://forum.status.net/.
 
 Credits
 =======

UPGRADE

@@ -24,7 +24,7 @@ instructions; read to the end first before trying them.
 5. Once all writing processes to your site are turned off, make a
    final backup of the Web directory and database.
 6. Move your StatusNet directory to a backup spot, like "statusnet.bak".
-7. Unpack your StatusNet 1.0.0 tarball and move it to "statusnet" or
+7. Unpack your StatusNet 1.0.1 tarball and move it to "statusnet" or
    wherever your code used to be.
 8. Copy the config.php file and the contents of the avatar/, background/,
    file/, and local/ subdirectories from your old directory to your new
@@ -37,7 +37,7 @@ instructions; read to the end first before trying them.
     reversed. YOU CAN EASILY DESTROY YOUR SITE WITH THIS STEP. Don't
     do it without a known-good backup!
 
-    In your new StatusNet 1.0.0 directory and AFTER YOU MAKE A
+    In your new StatusNet 1.0.1 directory and AFTER YOU MAKE A
     BACKUP run the upgrade.php script like this:
 
         php ./scripts/upgrade.php

actions/all.php

@@ -223,7 +223,7 @@ class AllAction extends ProfileAction
         // XXX: make this a little more convenient
 
         if (!common_config('performance', 'high')) {
-            $pop = new PopularNoticeSection($this);
+            $pop = new PopularNoticeSection($this, Profile::current());
             $pop->show();
             $pop = new InboxTagCloudSection($this, $this->user);
             $pop->show();

actions/apisearchatom.php

@@ -92,8 +92,6 @@ class ApiSearchAtomAction extends ApiPrivateAuthAction
      */
     function prepare($args)
     {
-        common_debug("in apisearchatom prepare()");
-
         parent::prepare($args);
 
         $this->query = $this->trimmed('q');

actions/apisearchjson.php

@@ -63,8 +63,6 @@ class ApiSearchJSONAction extends ApiPrivateAuthAction
      */
     function prepare($args)
     {
-        common_debug("apisearchjson prepare()");
-
         parent::prepare($args);
 
         $this->query = $this->trimmed('q');

actions/doc.php

@@ -162,4 +162,72 @@ class DocAction extends Action
             Event::handle('EndLoadDoc', array($this->title, &$this->output));
         }
     }
+
+    function showLocalNav()
+    {
+        $menu = new DocNav($this);
+        $menu->show();
+    }
+}
+
+class DocNav extends Menu
+{
+    function show()
+    {
+        $stub = new HomeStubNav($this->action);
+        $this->submenu(_m('MENU','Home'), $stub);
+
+        $docs = new DocListNav($this->action);
+        $this->submenu(_m('MENU','Docs'), $docs);
+    }
+}
+
+class DocListNav extends Menu
+{
+    function getItems()
+    {
+        $items = array();
+
+        if (Event::handle('StartDocsMenu', array(&$items))) {
+
+            $items = array(array('doc',
+                                 array('title' => 'help'),
+                                 _m('MENU', 'Help'),
+                                 _('Getting started'),
+                                 'nav_doc_help'),
+                           array('doc',
+                                 array('title' => 'about'),
+                                 _m('MENU', 'About'),
+                                 _('About this site'),
+                                 'nav_doc_about'),
+                           array('doc',
+                                 array('title' => 'faq'),
+                                 _m('MENU', 'FAQ'),
+                                 _('Frequently asked questions'),
+                                 'nav_doc_faq'),
+                           array('doc',
+                                 array('title' => 'contact'),
+                                 _m('MENU', 'Contact'),
+                                 _('Contact info'),
+                                 'nav_doc_contact'),
+                           array('doc',
+                                 array('title' => 'tags'),
+                                 _m('MENU', 'Tags'),
+                                 _('Using tags'),
+                                 'nav_doc_tags'),
+                           array('doc',
+                                 array('title' => 'groups'),
+                                 _m('MENU', 'Groups'),
+                                 _('Using groups'),
+                                 'nav_doc_groups'),
+                           array('doc',
+                                 array('title' => 'api'),
+                                 _m('MENU', 'API'),
+                                 _('RESTful API'),
+                                 'nav_doc_api'));
+
+            Event::handle('EndDocsMenu', array(&$items));
+        }
+        return $items;
+    }
 }

actions/editgroup.php

@@ -159,7 +159,7 @@ class EditgroupAction extends GroupAction
     function showScripts()
     {
         parent::showScripts();
-        $this->autofocus('nickname');
+        $this->autofocus('newnickname');
     }
 
     function trySave()
@@ -173,7 +173,7 @@ class EditgroupAction extends GroupAction
 
         if (Event::handle('StartGroupSaveForm', array($this))) {
 
-            $nickname    = Nickname::normalize($this->trimmed('nickname'));
+            $nickname    = Nickname::normalize($this->trimmed('newnickname'));
             $fullname    = $this->trimmed('fullname');
             $homepage    = $this->trimmed('homepage');
             $description = $this->trimmed('description');

actions/editpeopletag.php

@@ -71,7 +71,11 @@ class EditpeopletagAction extends Action
         }
 
         $id = $this->arg('id');
+        if (common_config('singleuser', 'enabled')) {
+            $tagger_arg = User::singleUserNickname();
+        } else {
             $tagger_arg = $this->arg('tagger');
+        }
         $tag_arg = $this->arg('tag');
 
         $tagger = common_canonical_nickname($tagger_arg);

actions/favorited.php

@@ -172,11 +172,8 @@ class FavoritedAction extends Action
      */
     function showContent()
     {
-        $pop = new Popularity();
+        $stream = new PopularNoticeStream(Profile::current());
-        $pop->offset = ($this->page - 1) * NOTICES_PER_PAGE;
+        $notice = $stream->getNotices(($this->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE+1);
-        $pop->limit  = NOTICES_PER_PAGE;
-        $pop->expiry = 600;
-        $notice = $pop->getNotices();
 
         $nl = new NoticeList($notice, $this);
 

actions/newgroup.php

@@ -122,7 +122,7 @@ class NewgroupAction extends Action
     {
         if (Event::handle('StartGroupSaveForm', array($this))) {
             try {
-                $nickname = Nickname::normalize($this->trimmed('nickname'));
+                $nickname = Nickname::normalize($this->trimmed('newnickname'));
             } catch (NicknameException $e) {
                 $this->showForm($e->getMessage());
             }

actions/peopletagged.php

@@ -58,7 +58,12 @@ class PeopletaggedAction extends Action
         parent::prepare($args);
         $this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
 
+        if (common_config('singleuser', 'enabled')) {
+            $tagger_arg = User::singleUserNickname();
+        } else {
             $tagger_arg = $this->arg('tagger');
+        }
+
         $tag_arg = $this->arg('tag');
         $tagger = common_canonical_nickname($tagger_arg);
         $tag = common_canonical_tag($tag_arg);

actions/peopletagsbyuser.php

@@ -76,7 +76,12 @@ class PeopletagsbyuserAction extends Action
             $this->args['public'] = $this->args['private'] = false;
         }
 
+        if (common_config('singleuser', 'enabled')) {
+            $nickname_arg = User::singleUserNickname();
+        } else {
             $nickname_arg = $this->arg('nickname');
+        }
+
         $nickname = common_canonical_nickname($nickname_arg);
 
         // Permanent redirect on non-canonical nickname

actions/peopletagsforuser.php

@@ -58,7 +58,12 @@ class PeopletagsforuserAction extends Action
     {
         parent::prepare($args);
 
+        if (common_config('singleuser', 'enabled')) {
+            $nickname_arg = User::singleUserNickname();
+        } else {
             $nickname_arg = $this->arg('nickname');
+        }
+
         $nickname = common_canonical_nickname($nickname_arg);
 
         // Permanent redirect on non-canonical nickname

actions/peopletagsubscribers.php

@@ -58,7 +58,12 @@ class PeopletagsubscribersAction extends Action
         parent::prepare($args);
         $this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
 
+        if (common_config('singleuser', 'enabled')) {
+            $tagger_arg = User::singleUserNickname();
+        } else {
             $tagger_arg = $this->arg('tagger');
+        }
+
         $tag_arg = $this->arg('tag');
         $tagger = common_canonical_nickname($tagger_arg);
         $tag = common_canonical_tag($tag_arg);

actions/peopletagsubscriptions.php

@@ -60,7 +60,12 @@ class PeopletagsubscriptionsAction extends Action
     {
         parent::prepare($args);
 
+        if (common_config('singleuser', 'enabled')) {
+            $nickname_arg = User::singleUserNickname();
+        } else {
             $nickname_arg = $this->arg('nickname');
+        }
+
         $nickname = common_canonical_nickname($nickname_arg);
 
         // Permanent redirect on non-canonical nickname

actions/profilesettings.php

@@ -185,7 +185,7 @@ class ProfilesettingsAction extends SettingsAction
             $this->checkbox('autosubscribe',
                             // TRANS: Checkbox label in form for profile settings.
                             _('Automatically subscribe to whoever '.
-                              'subscribes to me (best for non-humans).'),
+                              'subscribes to me (best for non-humans)'),
                             ($this->arg('autosubscribe')) ?
                             $this->boolean('autosubscribe') : $user->autosubscribe);
             $this->elementEnd('li');

actions/public.php

@@ -159,6 +159,11 @@ class PublicAction extends Action
         $this->element('link', array('rel' => 'EditURI',
                                      'type' => 'application/rsd+xml',
                                      'href' => $rsd));
+
+        if ($this->page != 1) {
+            $this->element('link', array('rel' => 'canonical',
+                                         'href' => common_local_url('public')));
+        }
     }
 
     /**
@@ -255,7 +260,9 @@ class PublicAction extends Action
             $ibs->show();
         }
 
-        $pop = new PopularNoticeSection($this);
+        $p = Profile::current();
+
+        $pop = new PopularNoticeSection($this, $p);
         $pop->show();
         if (!common_config('performance', 'high')) {
             $cloud = new PublicTagCloudSection($this);

actions/recoverpassword.php

@@ -288,10 +288,11 @@ class RecoverpasswordAction extends Action
                            'have been sent to the email address registered to your ' .
                            'account.');
             $this->success = true;
-            $this->showPage();
         } catch (Exception $e) {
             $this->success = false;
+            $this->msg = $e->getMessage();
         }
+        $this->showPage();
     }
 
     function resetPassword()

actions/showgroup.php

@@ -211,28 +211,34 @@ class ShowgroupAction extends GroupAction
     function showAnonymousMessage()
     {
         if (!(common_config('site','closed') || common_config('site','inviteonly'))) {
-            // @todo FIXME: use group full name here if available instead of (uglier) primary alias.
             // TRANS: Notice on group pages for anonymous users for StatusNet sites that accept new registrations.
-            // TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+            // TRANS: %s is the group name, %%%%site.name%%%% is the site name,
             // TRANS: %%%%action.register%%%% is the URL for registration, %%%%doc.help%%%% is a URL to help.
             // TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
             $m = sprintf(_('**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service ' .
                 'based on the Free Software [StatusNet](http://status.net/) tool. Its members share ' .
                 'short messages about their life and interests. '.
                 '[Join now](%%%%action.register%%%%) to become part of this group and many more! ([Read more](%%%%doc.help%%%%))'),
-                     $this->group->nickname);
+                     $this->group->getBestName());
         } else {
-            // @todo FIXME: use group full name here if available instead of (uglier) primary alias.
             // TRANS: Notice on group pages for anonymous users for StatusNet sites that accept no new registrations.
-            // TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+            // TRANS: %s is the group name, %%%%site.name%%%% is the site name,
             // TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
             $m = sprintf(_('**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service ' .
                 'based on the Free Software [StatusNet](http://status.net/) tool. Its members share ' .
                 'short messages about their life and interests.'),
-                     $this->group->nickname);
+                     $this->group->getBestName());
         }
         $this->elementStart('div', array('id' => 'anon_notice'));
         $this->raw(common_markup_to_html($m));
         $this->elementEnd('div');
     }
+
+    function extraHead()
+    {
+        if ($this->page != 1) {
+            $this->element('link', array('rel' => 'canonical',
+                                         'href' => $this->group->homeUrl()));
+        }
+    }
 }

actions/showprofiletag.php

@@ -44,7 +44,11 @@ class ShowprofiletagAction extends Action
     {
         parent::prepare($args);
 
+        if (common_config('singleuser', 'enabled')) {
+            $tagger_arg = User::singleUserNickname();
+        } else {
             $tagger_arg = $this->arg('tagger');
+        }
         $tag_arg = $this->arg('tag');
         $tagger = common_canonical_nickname($tagger_arg);
         $tag = common_canonical_tag($tag_arg);

actions/showstream.php

@@ -212,6 +212,11 @@ class ShowstreamAction extends ProfileAction
         $this->element('link', array('rel' => 'EditURI',
                                      'type' => 'application/rsd+xml',
                                      'href' => $rsd));
+
+        if ($this->page != 1) {
+            $this->element('link', array('rel' => 'canonical',
+                                         'href' => $this->profile->profileurl));
+        }
     }
 
     function showEmptyListMessage()

actions/subscriptions.php

@@ -132,9 +132,7 @@ class SubscriptionsAction extends GalleryAction
                 // TRANS: and do not change the URL part.
                 $message = _('You\'re not listening to anyone\'s notices right now, try subscribing to people you know. '.
                              'Try [people search](%%action.peoplesearch%%), look for members in groups you\'re interested '.
-                             'in and in our [featured users](%%action.featured%%). '.
+                             'in and in our [featured users](%%action.featured%%).');
-                             'If you\'re a [Twitter user](%%action.twittersettings%%), you can automatically subscribe to '.
-                             'people you already follow there.');
             } else {
                 // TRANS: Subscription list text when looking at the subscriptions for a of a user other
                 // TRANS: than the logged in user that has no subscriptions. %s is the user nickname.

actions/top.php

@@ -0,0 +1,86 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * Redirect to the appropriate top-of-site
+ * 
+ * PHP version 5
+ *
+ * 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  Top
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2010 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    // This check helps protect against security problems;
+    // your code file can't be executed directly from the web.
+    exit(1);
+}
+
+/**
+ * An action to redirect to the top of the site
+ *
+ * @category  Action
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2010 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+class TopAction extends Action
+{
+    /**
+     * For initializing members of the class.
+     *
+     * @param array $argarray misc. arguments
+     *
+     * @return boolean true
+     */
+
+    function prepare($argarray)
+    {
+        parent::prepare($argarray);
+        return true;
+    }
+
+    /**
+     * Handler method
+     *
+     * @param array $argarray is ignored since it's now passed in in prepare()
+     *
+     * @return void
+     */
+
+    function handle($argarray=null)
+    {
+        if (common_config('singleuser', 'enabled')) {
+            $url = common_local_url('showstream', array('nickname' => User::singleUserNickname()));
+        } else {
+            $url = common_local_url('public');
+        }
+
+        // XXX: Permanent? I think so.
+
+        common_redirect($url, 301);
+
+        return;
+    }
+}

actions/usergroups.php

@@ -104,7 +104,7 @@ class UsergroupsAction extends ProfileAction
             return false;
         }
 
-        $this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
+        $this->page = $this->trimmed('page', 1);
 
         return true;
     }

actions/userrss.php

@@ -29,8 +29,6 @@ class UserrssAction extends Rss10Action
 
     function prepare($args)
     {
-        common_debug("UserrssAction");
-
         parent::prepare($args);
         $nickname   = $this->trimmed('nickname');
         $this->user = User::staticGet('nickname', $nickname);

classes/Fave.php

@@ -74,6 +74,7 @@ class Fave extends Managed_DataObject
                 return false;
             }
             self::blow('fave:list-ids:notice_id:%d', $fave->notice_id);
+            self::blow('popular');
 
             Event::handle('EndFavorNotice', array($profile, $notice));
         }
@@ -92,6 +93,7 @@ class Fave extends Managed_DataObject
 
             $result = parent::delete();
             self::blow('fave:list-ids:notice_id:%d', $this->notice_id);
+            self::blow('popular');
 
             if ($result) {
                 Event::handle('EndDisfavorNotice', array($profile, $notice));

classes/File.php

@@ -85,6 +85,13 @@ class File extends Managed_DataObject
      * @return File
      */
     function saveNew(array $redir_data, $given_url) {
+
+        // I don't know why we have to keep doing this but I'm adding this last check to avoid
+        // uniqueness bugs.
+
+        $x = File::staticGet('url', $given_url);
+        
+        if (empty($x)) {
             $x = new File;
             $x->url = $given_url;
             if (!empty($redir_data['protected'])) $x->protected = $redir_data['protected'];
@@ -93,6 +100,7 @@ class File extends Managed_DataObject
             if (!empty($redir_data['size'])) $x->size = intval($redir_data['size']);
             if (isset($redir_data['time']) && $redir_data['time'] > 0) $x->date = intval($redir_data['time']);
             $file_id = $x->insert();
+        }
 
         $x->saveOembed($redir_data, $given_url);
         return $x;
@@ -192,7 +200,7 @@ class File extends Managed_DataObject
         }
 
         if (empty($x)) {
-            $x = File::staticGet($file_id);
+            $x = File::staticGet('id', $file_id);
             if (empty($x)) {
                 // @todo FIXME: This could possibly be a clearer message :)
                 // TRANS: Server exception thrown when... Robin thinks something is impossible!
@@ -209,13 +217,20 @@ class File extends Managed_DataObject
     function isRespectsQuota($user,$fileSize) {
 
         if ($fileSize > common_config('attachments', 'file_quota')) {
+            // TRANS: Message used to be inserted as %2$s in  the text "No file may
+            // TRANS: be larger than %1$d byte and the file you sent was %2$s.".
+            // TRANS: %1$d is the number of bytes of an uploaded file.
+            $fileSizeText = sprintf(_m('%1$d byte','%1$d bytes',$fileSize),$fileSize);
+
+            $fileQuota = common_config('attachments', 'file_quota');
             // TRANS: Message given if an upload is larger than the configured maximum.
-            // TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
+            // TRANS: %1$d (used for plural) is the byte limit for uploads,
-            // TRANS: %1$s is used for plural.
+            // TRANS: %2$s is the proper form of "n bytes". This is the only ways to have
-            return sprintf(_m('No file may be larger than %1$d byte and the file you sent was %2$d bytes. Try to upload a smaller version.',
+            // TRANS: gettext support multiple plurals in the same message, unfortunately...
-                              'No file may be larger than %1$d bytes and the file you sent was %2$d bytes. Try to upload a smaller version.',
+            return sprintf(_m('No file may be larger than %1$d byte and the file you sent was %2$s. Try to upload a smaller version.',
-                              common_config('attachments', 'file_quota')),
+                              'No file may be larger than %1$d bytes and the file you sent was %2$s. Try to upload a smaller version.',
-                           common_config('attachments', 'file_quota'), $fileSize);
+                              $fileQuota),
+                           $fileQuota, $fileSizeText);
         }
 
         $query = "select sum(size) as total from file join file_to_post on file_to_post.file_id = file.id join notice on file_to_post.post_id = notice.id where profile_id = {$user->id} and file.url like '%/notice/%/file'";

classes/File_thumbnail.php

@@ -56,10 +56,7 @@ class File_thumbnail extends Managed_DataObject
             'primary key' => array('file_id'),
             'foreign keys' => array(
                 'file_thumbnail_file_id_fkey' => array('file', array('file_id' => 'id')),
-            ),
+            )
-            'unique keys' => array(
-                'file_thumbnail_url_key' => array('url'),
-            ),
         );
     }
 

classes/Group_inbox.php

@@ -37,6 +37,7 @@ class Group_inbox extends Managed_DataObject
             'indexes' => array(
                 'group_inbox_created_idx' => array('created'),
                 'group_inbox_notice_id_idx' => array('notice_id'),
+                'group_inbox_group_id_created_notice_id_idx' => array('group_id', 'created', 'notice_id'),
             ),
         );
     }

classes/Group_member.php

@@ -45,6 +45,8 @@ class Group_member extends Managed_DataObject
                 // @fixme probably we want a (profile_id, created) index here?
                 'group_member_profile_id_idx' => array('profile_id'),
                 'group_member_created_idx' => array('created'),
+                'group_member_profile_id_created_idx' => array('profile_id', 'created'),
+                'group_member_group_id_created_idx' => array('group_id', 'created'),
             ),
         );
     }

classes/Managed_DataObject.php

@@ -168,4 +168,38 @@ abstract class Managed_DataObject extends Memcached_DataObject
         }
         return $links;
     }
+
+    /**
+     * Return a list of all primary/unique keys / vals that will be used for
+     * caching. This will understand compound unique keys, which
+     * Memcached_DataObject doesn't have enough info to handle properly.
+     *
+     * @return array of strings
+     */
+    function _allCacheKeys()
+    {
+        $table = call_user_func(array(get_class($this), 'schemaDef'));
+        $ckeys = array();
+
+        if (!empty($table['unique keys'])) {
+            $keyNames = $table['unique keys'];
+            foreach ($keyNames as $idx => $fields) {
+                $val = array();
+                foreach ($fields as $name) {
+                    $val[$name] = self::valueString($this->$name);
+                }
+                $ckeys[] = self::multicacheKey($this->tableName(), $val);
+            }
+        }
+
+        if (!empty($table['primary key'])) {
+            $fields = $table['primary key'];
+            $val = array();
+            foreach ($fields as $name) {
+                $val[$name] = self::valueString($this->$name);
+            }
+            $ckeys[] = self::multicacheKey($this->tableName(), $val);
+        }
+        return $ckeys;
+    }
 }

classes/Notice.php

@@ -122,11 +122,11 @@ class Notice extends Managed_DataObject
                 'notice_repeat_of_fkey' => array('notice', array('repeat_of' => 'id')), # @fixme: what about repeats of deleted notices?
             ),
             'indexes' => array(
+                'notice_created_id_is_local_idx' => array('created', 'id', 'is_local'),
                 'notice_profile_id_idx' => array('profile_id', 'created', 'id'),
-                'notice_conversation_idx' => array('conversation'),
+                'notice_repeat_of_created_id_idx' => array('repeat_of', 'created', 'id'),
-                'notice_created_idx' => array('created'),
+                'notice_conversation_created_id_idx' => array('conversation', 'created', 'id'),
-                'notice_replyto_idx' => array('reply_to'),
+                'notice_replyto_idx' => array('reply_to')
-                'notice_repeatof_idx' => array('repeat_of'),
             )
         );
 

classes/Notice_tag.php

@@ -52,6 +52,7 @@ class Notice_tag extends Managed_DataObject
             'indexes' => array(
                 'notice_tag_created_idx' => array('created'),
                 'notice_tag_notice_id_idx' => array('notice_id'),
+                'notice_tag_tag_created_notice_id_idx' => array('tag', 'created', 'notice_id')
             ),
         );
     }

classes/Profile.php

@@ -111,31 +111,51 @@ class Profile extends Managed_DataObject
             $height = $width;
         }
 
-        if (!isset($this->_avatars)) {
+        $avatar = $this->_getAvatar($width);
-            $this->_avatars = array();
-        }
 
-		if (array_key_exists($width, $this->_avatars)) {
+        if (empty($avatar)) {
-			return $this->_avatars[$width];
-		}
-		
-        $avatar = null;
 
             if (Event::handle('StartProfileGetAvatar', array($this, $width, &$avatar))) {
-            $avatar = Avatar::pkeyGet(array('profile_id' => $this->id,
+                $avatar = Avatar::pkeyGet(
+                    array(
+                        'profile_id' => $this->id,
                         'width'      => $width,
-                                            'height' => $height));
+                        'height'     => $height
+                    )
+                );
                 Event::handle('EndProfileGetAvatar', array($this, $width, &$avatar));
             }
 
-		$this->_avatars[$width] = $avatar;
+            $this->_fillAvatar($width, $avatar);
+        }
 
         return $avatar;
     }
 
+    // XXX: @Fix me gargargar
+    function _getAvatar($width)
+    {
+        if (empty($this->_avatars)) {
+            $this->_avatars = array();
+        }
+
+        // GAR! I cannot figure out where _avatars gets pre-filled with the avatar from
+        // the previously used profile! Please shoot me now! --Zach
+        if (array_key_exists($width, $this->_avatars)) {
+            // Don't return cached avatar unless it's really for this profile
+            if ($this->_avatars[$width]->profile_id == $this->id) {
+                return $this->_avatars[$width];
+            }
+        }
+
+        return null;
+    }
+
     function _fillAvatar($width, $avatar)
     {
+      //common_debug("Storing avatar of width: {$avatar->width} and profile_id {$avatar->profile_id} in profile {$this->id}.");
         $this->_avatars[$width] = $avatar;
+
     }
 
     function getOriginalAvatar()
@@ -330,6 +350,10 @@ class Profile extends Managed_DataObject
             self::cacheSet($keypart, implode(',', $ids));
         }
 
+        if (!is_null($offset) && !is_null($limit)) {
+            $ids = array_slice($ids, $offset, $limit);
+        }
+
         return User_group::multiGet('id', $ids);
     }
 
@@ -1454,4 +1478,8 @@ class Profile extends Managed_DataObject
     {
         return $this;
     }
+
+    static function pivotGet($key, $values, $otherCols=array()) {
+        return Memcached_DataObject::pivotGet('Profile', $key, $values, $otherCols);
+    }
 }

classes/Profile_role.php

@@ -55,6 +55,7 @@ class Profile_role extends Managed_DataObject
             'foreign keys' => array(
                 'profile_role_profile_id_fkey' => array('profile', array('profile_id' => 'id')),
             ),
+            'indexes' => array('profile_role_role_created_profile_id_idx' => array('role', 'created', 'profile_id')),
         );
     }
 

classes/Reply.php

@@ -40,6 +40,7 @@ class Reply extends Managed_DataObject
                 'reply_notice_id_idx' => array('notice_id'),
                 'reply_profile_id_idx' => array('profile_id'),
                 'reply_replied_id_idx' => array('replied_id'),
+                'reply_profile_id_modified_notice_id_idx' => array('profile_id', 'modified', 'notice_id')
             ),
         );
     }    

classes/User.php

@@ -1086,7 +1086,7 @@ class User extends Managed_DataObject
 
         if (!$user) {
             // TRANS: Information on password recovery form if no known username or e-mail address was specified.
-            throw new ClientError(_('No user with that email address or username.'));
+            throw new ClientException(_('No user with that email address or username.'));
             return;
         }
 

classes/User_im_prefs.php

@@ -80,26 +80,4 @@ class User_im_prefs extends Managed_DataObject
         );
     }
 
-    /**
-     * We have two compound keys with unique constraints:
-     * (transport, user_id) which is our primary key, and
-     * (transport, screenname) which is an additional constraint.
-     * 
-     * Currently there's not a way to represent that second key
-     * in the general keys list, so we're adding it here to the
-     * list of keys to use for caching, ensuring that it gets
-     * cleared as well when we change.
-     * 
-     * @return array of cache keys
-     */
-    function _allCacheKeys()
-    {
-        $ukeys = 'transport,screenname';
-        $uvals = $this->transport . ',' . $this->screenname;
-
-        $ckeys = parent::_allCacheKeys();
-        $ckeys[] = $this->cacheKey($this->tableName(), $ukeys, $uvals);
-        return $ckeys;
-    }
-
 }

config.php.sample

@@ -1,309 +0,0 @@
-<?php
-/* -*- mode: php -*- */
-
-if (!defined('STATUSNET')) { exit(1); }
-
-// If you have downloaded libraries in random little places, you
-// can add the paths here
-
-// $extra_path = array("/opt/php-openid-2.0.1", "/usr/local/share/php");
-// set_include_path(implode(PATH_SEPARATOR, $extra_path) . PATH_SEPARATOR . get_include_path());
-
-// We get called by common.php, $config is a tree with lots of config
-// options
-// These are for configuring your URLs
-
-$config['site']['name'] = 'Just another StatusNet microblog';
-$config['site']['server'] = 'localhost';
-$config['site']['path'] = 'statusnet';
-// $config['site']['fancy'] = false;
-// $config['site']['theme'] = 'default';
-// Sets the site's default design values
-// $config['design']['backgroundcolor'] = '#F0F2F5';
-// $config['design']['contentcolor'] = '#FFFFFF';
-// $config['design']['sidebarcolor'] = '#CEE1E9';
-// $config['design']['textcolor'] = '#000000';
-// $config['design']['linkcolor'] = '#002E6E';
-// $config['design']['backgroundimage'] = null;
-// $config['design']['disposition'] = 1;
-// To enable the built-in mobile style sheet, defaults to false.
-// $config['site']['mobile'] = true;
-// For contact email, defaults to $_SERVER["SERVER_ADMIN"]
-// $config['site']['email'] = 'admin@example.net';
-// Brought by...
-// $config['site']['broughtby'] = 'Individual or Company';
-// $config['site']['broughtbyurl'] = 'http://example.net/';
-// If you don't want to let users register (say, for a one-person install)
-// Crude but effective -- register everybody, then lock down
-// $config['site']['closed'] = true;
-// Only allow registration for people invited by another user
-// $config['site']['inviteonly'] = true;
-// Make the site invisible to  non-logged-in users
-// $config['site']['private'] = true;
-
-// Allow Cross-Origin Resource Sharing (CORS) for service discovery
-// (host-meta, XRD, etc.) Useful for AJAXy client applications. Should
-// probably NOT be on for private / intranet sites but OK for public sites.
-// Default is off.
-// $config['discovery']['cors'] = true;
-
-// If your web server supports X-Sendfile (Apache with mod_xsendfile,
-// lighttpd, nginx), you can enable X-Sendfile support for better
-// performance. Presently, only attachment serving when the site is
-// in private mode will use X-Sendfile.
-// $config['site']['use_x_sendfile'] = false;
-// You may also need to enable X-Sendfile support for your web server and
-// allow it to access files outside of the web root. For Apache with
-// mod_xsendfile, you can add these to your .htaccess or server config:
-//
-//       XSendFile on
-//       XSendFileAllowAbove on
-//
-// See http://tn123.ath.cx/mod_xsendfile/ for mod_xsendfile.
-
-// If you want logging sent to a file instead of syslog
-// $config['site']['logfile'] = '/tmp/statusnet.log';
-
-// Change the syslog facility that StatusNet logs to (default is LOG_USER)
-// $config['syslog']['facility'] = LOG_LOCAL7;
-
-// Enables extra log information, for example full details of PEAR DB errors
-// $config['site']['logdebug'] = true;
-
-// To set your own logo, overriding the one in the theme
-// $config['site']['logo'] = '/mylogo.png';
-
-// This is a PEAR DB DSN, see http://pear.php.net/manual/en/package.database.db.intro-dsn.php
-// Set it to match your actual database
-
-$config['db']['database'] = 'mysql://statusnet:microblog@localhost/statusnet';
-// $config['db']['ini_your_db_name'] = $config['db']['schema_location'].'/statusnet.ini';
-// *** WARNING *** WARNING *** WARNING *** WARNING ***
-// Setting debug to a non-zero value will expose your DATABASE PASSWORD to Web users.
-// !!!!!! DO NOT SET THIS ON PRODUCTION SERVERS !!!!!! DB_DataObject's bug, btw, not
-// ours.
-// *** WARNING *** WARNING *** WARNING *** WARNING ***
-// $config['db']['debug'] = 0;
-// $config['db']['db_driver'] = 'MDB2';
-
-// Database type. For mysql, these defaults are fine. For postgresql, set
-// 'quote_identifiers' to true and 'type' to 'pgsql':
-// $config['db']['quote_identifiers'] = false;
-// $config['db']['type'] = 'mysql';
-
-// session_set_cookie_params(0, '/'. $config['site']['path'] .'/');
-
-// Standard fancy-url clashes prevented by not allowing nicknames on a blacklist
-// Add your own here. Note: empty array by default
-// $config['nickname']['blacklist'][] = 'scobleizer';
-
-// sphinx search
-$config['sphinx']['enabled'] = false;
-$config['sphinx']['server'] = 'localhost';
-$config['sphinx']['port'] = 3312;
-
-// Users to populate the 'Featured' tab
-// $config['nickname']['featured'][] = 'scobleizer';
-
-// xmpp
-// $config['xmpp']['enabled'] = false;
-// $config['xmpp']['server'] = 'server.example.net';
-// $config['xmpp']['host'] = NULL;	// Only set if different from server
-// $config['xmpp']['port'] = 5222;
-// $config['xmpp']['user'] = 'update';
-// $config['xmpp']['encryption'] = false;
-// $config['xmpp']['resource'] = 'uniquename';
-// $config['xmpp']['password'] = 'blahblahblah';
-// $config['xmpp']['public'][] = 'someindexer@example.net';
-// $config['xmpp']['debug'] = false;
-
-// Turn off invites
-// $config['invite']['enabled'] = false;
-
-// Default locale info
-// $config['site']['timezone'] = 'Pacific/Auckland';
-// $config['site']['language'] = 'en_NZ';
-
-// When validating user supplied email addresses, validate if the domain
-// is running an SMTP server.
-// $config['mail']['check_domain'] = true;
-
-// Email info, used for all outbound email
-// $config['mail']['notifyfrom'] = 'microblog@example.net';
-// Domain for generating no-reply and incoming email addresses, if enabled.
-// Defaults to site server name.
-// $config['mail']['domain'] = 'microblog.example.net';
-// See http://pear.php.net/manual/en/package.mail.mail.factory.php for options
-// $config['mail']['backend'] = 'smtp';
-// $config['mail']['params'] = array(
-// 							'host' => 'localhost',
-// 							'port' => 25,
-// 							);
-
-// exponential decay factor for tags, default 10 days
-// raise this if traffic is slow, lower it if it's fast
-// $config['tag']['dropoff'] = 86400.0 * 10;
-
-// exponential decay factor for popular (most favorited notices)
-// default 10 days -- similar to tag dropoff
-// $config['popular']['dropoff'] = 86400.0 * 10;
-
-// optionally show non-local messages in public timeline
-// $config['public']['localonly'] = false;
-
-// hide certain users from public pages, by ID
-// $config['public']['blacklist'][] = 123;
-// $config['public']['blacklist'][] = 2307;
-
-// Mark certain notice sources as automatic and thus not
-// appropriate for public feed
-// $config['public]['autosource'][] = 'twitterfeed';
-// $config['public]['autosource'][] = 'rssdent';
-// $config['public]['autosource'][] = 'Ping.Fm';
-// $config['public]['autosource'][] = 'HelloTxt';
-// $config['public]['autosource'][] = 'Updating.Me';
-
-// Do notice broadcasts offline
-// If you use this, you must run the six offline daemons in the
-// background. See the README for details.
-// $config['queue']['enabled'] = true;
-
-// Queue subsystem
-// subsystems: internal (default) or stomp
-// using stomp requires an external message queue server
-// $config['queue']['subsystem'] = 'stomp';
-// $config['queue']['stomp_server'] = 'tcp://localhost:61613';
-// use different queue_basename for each statusnet instance managed by the server
-// $config['queue']['queue_basename'] = '/queue/statusnet/';
-
-// The following customise the behaviour of the various daemons:
-// $config['daemon']['piddir'] = '/var/run';
-// $config['daemon']['user'] = false;
-// $config['daemon']['group'] = false;
-
-// For installations with high traffic, statusnet can use MemCached to cache
-// frequently requested information. Only enable the following if you have
-// MemCached up and running:
-// $config['memcached']['enabled'] = false;
-// $config['memcached']['server'] = 'localhost';
-// $config['memcached']['port'] = 11211;
-
-// People tags
-// Maximum number of tags a user can create:
-// $config['peopletag']['maxtags'] = 100;
-// Maximum number of people can have the same tag by the same user
-// $config['peopletag']['maxpeople'] = 500;
-// Types of users one can tag.
-// Everyone.
-// $config['peopletag']['allow_tagging']['all'] = true;
-// Local only.
-// $config['peopletag']['allow_tagging']['local'] = true;
-// Subscriptions / Subscribers only (including remote)
-// $config['peopletag']['allow_tagging']['subs'] = true;
-// Remote.
-// $config['peopletag']['allow_tagging']['remote'] = true;
-// Examples:
-// The following set of options allows tagging local users and
-// remote subscribers / subscription.
-// $config['peopletag']['allow_tagging']['all'] = false;
-// $config['peopletag']['allow_tagging']['local'] = true;
-// $config['peopletag']['allow_tagging']['subs'] = true;
-// Or:
-// $config['peopletag']['allow_tagging'] = array('local' => true, 'subs' =>true);
-
-// Disable post-by-email
-// $config['emailpost']['enabled'] = false;
-
-// Disable SMS
-// $config['sms']['enabled'] = false;
-
-// Twitter integration source attribute. Note: default is StatusNet
-// $config['integration']['source'] = 'StatusNet';
-
-// Enable bidirectional Twitter bridge
-//
-// NOTE: if you enable this you must also set $config['avatar']['path']
-//
-// $config['twitterimport']['enabled'] = true;
-
-// Twitter OAuth settings. Documentation is at http://apiwiki.twitter.com/OAuth-FAQ
-// $config['twitter']['consumer_key']    = 'YOURKEY';
-// $config['twitter']['consumer_secret'] = 'YOURSECRET';
-
-// Edit throttling. Off by default. If turned on, you can only post 20 notices
-// every 10 minutes. Admins may want to play with the settings to minimize inconvenience for
-// real users without getting uncontrollable floods from spammers or runaway bots.
-
-// $config['throttle']['enabled'] = true;
-// $config['throttle']['count'] = 100;
-// $config['throttle']['timespan'] = 3600;
-
-// Config section for the built-in Facebook application
-// $config['facebook']['apikey'] = 'APIKEY';
-// $config['facebook']['secret'] = 'SECRET';
-
-// Add Google Analytics
-// require_once('plugins/GoogleAnalyticsPlugin.php');
-// $ga = new GoogleAnalyticsPlugin('your secret code');
-
-// Use Templating (template: /tpl/index.php)
-// require_once('plugins/TemplatePlugin.php');
-// $tpl = new TemplatePlugin();
-
-// Don't allow saying the same thing more than once per hour
-// $config['site']['dupelimit'] = 3600;
-// Don't enforce the dupe limit
-// $config['site']['dupelimit'] = -1;
-
-// Base string for minting Tag URIs in Atom feeds. Defaults to
-// "yourserver,2009". This needs to be configured properly for your Atom
-// feeds to validate.  See: http://www.faqs.org/rfcs/rfc4151.html and
-// http://taguri.org/ Examples:
-// $config['integration']['taguri'] = 'example.net,2008';
-// $config['integration']['taguri'] = 'admin@example.net,2009-03-09'
-
-// Don't use SSL
-// $config['site']['ssl'] = 'never';
-// Use SSL only for sensitive pages (like login, password change)
-// $config['site']['ssl'] = 'sometimes';
-// Use SSL for all pages
-// $config['site']['ssl'] = 'always';
-
-// Use a different hostname for SSL-encrypted pages
-// $config['site']['sslserver'] = 'secure.example.org';
-
-// Indent HTML and XML
-// Enable (default) for easier to read markup for developers,
-// disable to save some bandwidth.
-// $config['site']['indent'] = true;
-
-// If you have a lot of status networks on the same server, you can
-// store the site data in a database and switch as follows
-// Status_network::setupDB('localhost', 'statusnet', 'statuspass', 'statusnet');
-// if (!Status_network::setupSite($_server, $_path)) {
-//        print "Error\n";
-//        exit(1);
-// }
-
-// How often to send snapshots; in # of web hits. Ideally,
-// try to do this once per month (that is, make this equal to number
-// of hits per month)
-// $config['snapshot']['frequency'] = 10000;
-// If you don't want to report statistics to the central server, uncomment.
-// $config['snapshot']['run'] = 'never';
-// If you want to report statistics in a cron job instead.
-// $config['snapshot']['run'] = 'cron';
-
-// Support for file uploads (attachments),
-// select supported mimetypes and quotas (in bytes)
-// $config['attachments']['supported'] = array('image/png', 'application/ogg');
-// $config['attachments']['supported'] = true; //allow all file types to be uploaded
-
-// $config['attachments']['file_quota'] = 5000000;
-// $config['attachments']['user_quota'] = 50000000;
-// $config['attachments']['monthly_quota'] = 15000000;
-// $config['attachments']['uploads'] = true;
-// $config['attachments']['path'] = "/file/"; //ignored if site is private
-// $config['attachments']['dir'] = INSTALLDIR . '/file/';
-
-// $config['oohembed']['endpoint'] = 'http://oohembed.com/oohembed/';

doc-src/about

@@ -2,13 +2,15 @@
 <!-- Document licensed under Creative Commons Attribution 3.0 Unported. See -->
 <!-- http://creativecommons.org/licenses/by/3.0/ for details. -->
 
-%%site.name%% is a
+%%site.name%% is a stream-oriented social network service based on the
-[micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service
+Free Software [StatusNet](http://status.net/) tool.
-based on the Free Software [StatusNet](http://status.net/) tool.
 
-If you [register](%%action.register%%) for an account,
+If you [register](%%action.register%%) for an account, you can post
-you can post small (%%site.textlimit%% chars or less) text notices
+small (%%site.textlimit%% chars or less) text notices about yourself,
-about yourself, where you are, what you're doing, or practically
+where you are, what you're doing, what you're working on or what
-anything you want. You can also subscribe to the notices of your
+you're thinking about. You can also subscribe to the notices of your
-friends, or other people you're interested in, and follow them on the
+friends, or other people you're interested in, and follow them
-Web or in an [RSS](http://en.wikipedia.org/wiki/RSS) feed.
+privately or on the Web.
+
+You can also post event invitations, bookmarks, polls, questions, or
+other kinds of data.

doc-src/badge

@@ -1,69 +0,0 @@
-<!-- Copyright 2008-2010 StatusNet Inc. and contributors. -->
-<!-- Document licensed under Creative Commons Attribution 3.0 Unported. See -->
-<!-- http://creativecommons.org/licenses/by/3.0/ for details. -->
-
-Install the %%site.name%% badge on your blog or web site to show the latest updates 
-from you and your friends!
-
-<MTMarkdownOptions output='raw'>
-<script type="text/javascript" src="http://identi.ca/js/identica-badge.js">
-{
-   "user":"kentbrew",
-   "server":"identi.ca",
-   "headerText":" and friends"
-}
-</script>
-</MTMarkdownOptions>
-
-Things to try
---------------
-
-* Click an avatar and the badge will refresh with that user's timeline
-* Click a nickname to open a user's profile in your browser
-* Click a notice's timestamp to view the notice in your browser
-* @-replies and #tags are live links
-
-## Installation instructions 
-
-Copy and paste the following JavaScript into an HTML page where
-you want the badge to show up.  Substitute your own ID in the user
-parameter.
-
-<pre>
-	&lt;script type=&quot;text/javascript&quot; src=&quot;http://identi.ca/js/identica-badge.js&quot;&gt;
-	{
-	   &quot;user&quot;:&quot;kentbrew&quot;,
-	   &quot;server&quot;:&quot;identi.ca&quot;,
-	   &quot;headerText&quot;:&quot; and friends&quot;
-	}
-	&lt;/script&gt;
-
-</pre>
-
-
-
-Valid parameters for the badge:
--------------------------------
-
-* user : defaults to 7000 (@kentbrew)
-* headerText  : defaults to empty
-* height : defaults to 350px
-* width : defaults to 300px
-* background : defaults to #193441. If you set evenBackground, oddBackground,
-  and headerBackground, you won't see it at all.
-* border : defaults to 1px solid black
-* userColor : defaults to whatever link color is set to on your page
-* headerBackground : defaults to transparent 
-* headerColor :  defaults to white
-* evenBackground : defaults to #fff
-* oddBackground : defaults to #eee
-* thumbnailBorder : 1px solid black
-* thumbnailSize : defaults to 24px
-* padding : defaults to 3px
-* server : defaults to identi.ca
-
-Licence
--------
-
-Identi.ca badge by [Kent Brewster](http://kentbrewster.com/identica-badge/). 
-Licenced under [CC-BY-SA-3](http://kentbrewster.com/rights-and-permissions/).

doc-src/bookmarklet

@@ -1,9 +0,0 @@
-<!-- Copyright 2008-2010 StatusNet Inc. and contributors. -->
-<!-- Document licensed under Creative Commons Attribution 3.0 Unported. See -->
-<!-- http://creativecommons.org/licenses/by/3.0/ for details. -->
-
-A bookmarklet is a small piece of javascript code used as a bookmark. This one will let you post to %%site.name%% simply by selecting some text on a page and pressing the bookmarklet.
-
-Drag-and-drop the following link to your bookmarks bar or right-click it and add it to your browser favorites to keep it handy.
-
-<a href="javascript:(function(){var%20d=document,w=window,e=w.getSelection,k=d.getSelection,x=d.selection,s=(e?e():(k)?k():(x?x.createRange().text:0)),f='http://%%site.server%%/%%site.path%%/index.php?action=bookmarklet',l=d.location,e=encodeURIComponent,g=f+'&status_textarea=%E2%80%9C'+((e(s))?e(s):e(document.title))+'%E2%80%9D%20%E2%80%94%20'+e(l.href);function%20a(){if(!w.open(g,'t','toolbar=0,resizable=0,scrollbars=1,status=1,width=450,height=200')){l.href=g;}}a();})()">Post to %%site.name%%</a>

doc-src/contact

@@ -5,14 +5,6 @@
 There are a number of options for getting in contact with responsible
 people for %%site.name%%.
 
-Post a notice
--------------
-
-If you have a question about how to do something, just post a notice
-with your question. People here like to answer messages. Watch the
-[public timeline](%%action.public%%) for answers; they'll usually start
-with "@" plus your user name.
-
 Bugs
 ----
 
@@ -25,4 +17,10 @@ Email
 
 You can reach the responsible party for this server at [%%site.email%%](mailto:%%site.email%%).
 
+Post a notice
+-------------
+
+If you have a question about how to do something, just post a notice
+with your question. Watch your inbox [public timeline](%%action.top%%)
+for answers.
 

doc-src/faq

@@ -8,39 +8,43 @@ some answers.
 What is %%site.name%%?
 ----------------------
 
-%%site.name%% is a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service.
+%%site.name%% is a stream oriented social network service.
+
 You can use it to write short notices about yourself, where you are,
 and what you're doing, and those notices will be sent to all your friends
 and fans.
 
-How is %%site.name%% different from Twitter, Jaiku, Pownce, Plurk, others?
+You can also post event invitations, bookmarks, polls, and questions or
---------------------------------------------------------------------------
+other kinds of social broadcasts.
 
-%%site.name%% is an [Open Network Service](http://opendefinition.org/ossd). Our main
+How is %%site.name%% different from Twitter?
-goal is to provide a fair and transparent service that preserves users' autonomy. In
+--------------------------------------------
-particular, all the software used for %%site.name%% is [Free Software](http://en.wikipedia.org/wiki/Free_Software), and all the data is available
-under the [%%license.title%%](%%license.url%%) license, making it Open Data.
 
-The software also implements the [OpenMicroBlogging](http://openmicroblogging.org/) protocol, meaning that you can have friends on other microblogging services
+Like [Twitter](http://twitter.com/), %%site.name%% is a light service
-that can receive your notices.
+with a stream-oriented interface. It uses @-replies, hashtags,
+provides search, and has private messages. It provides an API, and can
+be integrated with SMS systems. You can create lists.
 
-The goal here is *autonomy* -- you deserve the right to manage your own on-line
+Unlike Twitter, %%site.name%% allows more data than just plain text
-presence. If you don't like how %%site.name%% works, you can take your data and the source code and set up your own server (or move your account to another one).
+and links to travel across the network. You can install the StatusNet
+software that runs %%site.name%% on your own servers, since it's Free
+and Open Source software. You can make groups, and share privately
+with those groups.
 
-Where is feature X?
+You can make your site available only to people you choose. You can
--------------------
+customize it with your own themes and plugins, or download plugins
+from the StatusNet site.
 
-The software we run, [StatusNet](http://status.net/), is still in its early stages,
+How is %%site.name%% different from Yammer, SocialCast, or Salesforce Chatter?
-and many features people expect from microblogging sites are not yet implemented. Some important ones that are expected "soon":
+------------------------------------------------------------------------------
 
-* More [AJAX](http://en.wikipedia.org/wiki/AJAX)-y interface
+Like some enterprise social software services, StatusNet lets you
-* Maps
+share privately with other people in your company. You can use
-* Cross-post to Pownce, Jaiku, etc.
+microapps to post richer kinds of data, use public and private groups
-* Pull messages from Twitter, Pownce, Jaiku, etc.
+to share with team members, use extended profiles to show more about
-* [Facebook](http://www.facebook.com/) integration
+yourself and your company, and review groups and users in a directory.
-* Image, video, audio notices
-
-There is [a list of bugs and features](http://status.net/bugs/) that you may find
-interesting. New ideas or complaints are very welcome.
 
+Unlike those other services, StatusNet is free and open source
+software. You can install it on your own servers. You can customize
+the theme and add plugins.
 

doc-src/groups

@@ -4,7 +4,8 @@
 
 Users on %%site.name%% can create *groups* that other users can join.
 Groups can be a great way to share information and entertainment with
-a group of people who have a common interest or background.
+a group of people who have a common interest or background; who work
+together on a team; or who have a particular knowledge or skill.
 
 You can find out about groups on the server on the
 [Groups](%%action.groups%%) page. You can join a group by clicking on
@@ -13,16 +14,16 @@ the "Join" button either in the group list or on the group's home page.
 Starting a new group
 --------------------
 
-If you want, you can start a new group for friends and people with
+You can start a new group for friends and colleagues. Note that all
-common interests. Note that all groups are free for anyone to join.
+groups are free for anyone to join.
 
 To start a new group, use the [new group](%%action.newgroup%%) tool
 and fill out the form. Describe your group as best you can if you want
 people to be able to find it.
 
 When choosing the nickname for your group, try to keep it short. The
-nickname is included in every message to and from the group, so the
+nickname is sometimes included in messages to and from the group, so
-less chars the better. Try using acronyms for organizations, or
+the less chars the better. Try using acronyms for organizations, or
 airport codes for places (like 'pdx' instead of 'portland').
 
 Sending messages to a group
@@ -33,14 +34,22 @@ anywhere in the message. If you have more than one group named, the
 notice will go to each group. Only members can send notices to a
 group, and groups do not respond to direct messages (DMs).
 
+You can also select the group from the "To:" drop down when posting.
+
+You can make a group message private by clicking the "private" button
+before posting.
+
 Receiving messages
 ------------------
 
 New group messages will appear in your inbox, and will also come to
 your phone or IM client if you've set them up to receive notices.
 
-Remote groups
+Private groups
--------------
+--------------
 
-While it's technically possible, this version of StatusNet does not
+The administrator can make a group private. For a private group, all
-support remote group membership.
+notices will marked as private for group members only. Also,
+administrators will have to approve all new members to the group.
+
+Private groups are visible in the group directory.

doc-src/help

@@ -2,38 +2,18 @@
 <!-- Document licensed under Creative Commons Attribution 3.0 Unported. See -->
 <!-- http://creativecommons.org/licenses/by/3.0/ for details. -->
 
-%%site.name%% is a **microblogging service**. Users post short (%%site.textlimit%%
+%%site.name%% is a **social service**. Users can post short
-character) notices which are broadcast to their friends and fans using
+(%%site.textlimit%% character) status messages which are broadcast to
-the Web, RSS, or instant messages.
+their friends and colleagues on the service and (optionally) onto the Web.
+
+You can also broadcast other types of data, like bookmarks, event
+invitations, polls, and questions.
 
 If you'd like to try it out, first [register](%%action.register%%) a new account.
-Then, on the [public timeline](%%action.public%%), enter your message into
+Then, on the [public timeline](%%action.top%%), enter your message into
 the textbox at the top of the page, and click "Send". It will go out on the
-public timeline and to anyone who is subscribed to your notices (probably nobody,
+public timeline and to anyone who is subscribed to your notices.
-at first).
 
 To subscribe to other people's notifications, go to their profile page
 and click the "subscribe" button. They'll get a notice that you're now
-subscribed to their notifications, and, who knows?, they might subscribe
+subscribed to their notifications.
-back.
-
-More help
----------
-
-Here are some documents that you might find helpful in understanding
-%%site.name%% and how to use it.
-
-* [About](%%doc.about%%) - an overview of the service
-* [FAQ](%%doc.faq%%) - frequently-asked questions about %%site.name%%
-* [Contact](%%doc.contact%%) - who to contact with questions about the service
-* [IM](%%doc.im%%) - using the instant-message (IM) features of %%site.name%%
-* [SMS](%%doc.sms%%) - tying your cellphone to %%site.name%%
-* [Tags](%%doc.tags%%) - different ways to use tagging
-* [Groups](%%doc.groups%%) - joining together in groups
-* [Lists](%%doc.lists%%) - organize your contacts
-* [OpenMicroBlogging](%%doc.openmublog%%) - subscribing to remote users
-* [Privacy](%%doc.privacy%%) - %%site.name%%'s privacy policy
-* [Source](%%doc.source%%) - How to get the StatusNet source code
-* [Badge](%%doc.badge%%) - How to put a StatusNet badge on your blog or homepage
-* [Bookmarklet](%%doc.bookmarklet%%) - Bookmarklet for posting Web pages
-* [API](%%doc.api%%) - API for use by external clients

doc-src/lists

@@ -1,69 +0,0 @@
-<!-- Copyright 2008-2010 StatusNet Inc. and contributors. -->
-<!-- Document licensed under Creative Commons Attribution 3.0 Unported. See -->
-<!-- http://creativecommons.org/licenses/by/3.0/ for details. -->
-
-%%site.name%% supports
-[tags](http://en.wikipedia.org/wiki/Tag_(metadata)) to help you
-organize your activities here. You can use tags for people and for
-notices.
-
-Tagging a notice
-----------------
-
-You can tag a notice using a *hashtag*; a # character followed by
-letters and numbers as well as '.', '-', and '_'. Note that accented
-latin characters are not supported, and non-roman scripts are right out.
-
-The HTML for the notice will link to a stream of all the other notices
-with that tag. This can be a great way to keep track of a conversation.
-
-The most popular current tags on the site can be found in the [public
-tag cloud](%%action.publictagcloud%%). Their size shows their
-popularity and recency.
-
-Tagging yourself
-----------------
-
-You can also add tags for yourself on your [profile
-settings](%%action.profilesettings%%) page or by using the edit tags
-button on your profile page. Use single words to
-describe yourself, your experiences and your interest. The tags will
-become links on your profile page to a list of all the users on the
-site who use that same tag. It can be a nice way to find people who
-are related to you geographically or who have a common interest.
-
-Tagging others
---------------
-
-You can also tag other users by using the edit tags button next to
-their profile. Such tags are called *people tags*. Once you have
-created a people tag, you can add or remove users from it using the
-tag's edit form. This makes it easy to organize your subscriptions
-into groups and sort through them separately. Also, it will let
-you create custom lists of people that others can subscribe to.
-
-You can also send a notice "to the attention of" your subscribers
-whom you've marked with a particular tag (note: *not* people who've
-marked themselves with that tag). "@#family hello" will send a
-notice to all your subscribers you've marked with the tag 'family'.
-
-Private and public people tags
-------------------------------
-
-A private people tag is only visible to the creator, it cannot be
-subscribed to, but the timeline can be viewed. To create a new
-private prepend a '.' to the tag in the tags editing box. To set
-an existing public tag as private or vice-versa, go to the tag's
-edit page.
-
-Remote people tags
-------------------
-
-You can even [tag remote users](%%action.profilesettings%%). Just
-enter the remote profile's URI and click on the "Fetch" button to
-fetch the profile, you can then add tags and save them.
-
-Subscribing to the timeline of a people tag on another server also
-works. Just copy the URL of the people tag's timeline page to the
-[OStatus subscription](%%action.ostatussub%%) form.
-

doc-src/openmublog

@@ -1,29 +0,0 @@
-<!-- Copyright 2008-2010 StatusNet Inc. and contributors. -->
-<!-- Document licensed under Creative Commons Attribution 3.0 Unported. See -->
-<!-- http://creativecommons.org/licenses/by/3.0/ for details. -->
-
-[OpenMicroBlogging](http://openmicroblogging.org/) is a protocol that
-lets users of one [microblogging](http://en.wikipedia.org/wiki/microblogging) service
-subscribe to notices by users of another service. The protocol, based on
-[OAuth](http://oauth.net/), is open and free, and doesn't depend on any
-central authority to maintain the federated microblogs.
-
-The [StatusNet](http://status.net/) software that runs %%site.name%% supports
-OpenMicroBlogging 0.1. Anyone can make a new installation of StatusNet on their
-own servers, and users of that new installation can subscribe to notices from
-%%site.name%%.
-
-Remote subscription
--------------------
-
-If you have an account on a remote site that supports OpenMicroBlogging, and you
-want to subscribe to the notices of a user on this site, click on the "Subscribe"
-link under their avatar on their profile page. This should take you to the
-[remote subscription](%%action.remotesubscribe%%) page. Make sure that you've got the
-right nickname registered, and enter your profile URL on the other microblogging
-service.
-
-You'll be taken to your microblogging service, where you'll be asked to confirm the
-subscription. When you confirm, your service will receive new notifications from
-the user on %%site.name%%, and your service will forward them to you (using IM, SMS,
-the Web, or whatever else).

doc-src/tags

@@ -51,19 +51,3 @@ subscribed to, but the timeline can be viewed. To create a new
 private prepend a '.' to the tag in the tags editing box. To set
 an existing public tag as private or vice-versa, go to the tag's
 edit page.
-
-The most used public tags are displayed in the
-[public people tag cloud](%%action.publicpeopletagcloud%%). Their
-size shows their frequency of use.
-
-Remote people tags
-------------------
-
-You can even [tag remote users](%%action.profilesettings%%). Just
-enter the remote profile's URI and click on the "Fetch" button to
-fetch the profile, you can then add tags and save them.
-
-Subscribing to the timeline of a people tag on another server also
-works. Just copy the URL of the people tag's timeline page to the
-[OStatus subscription](%%action.ostatussub%%) form.
-

doc-src/tos

@@ -14,7 +14,7 @@ particular, make sure that none of the prohibited items listed below
 appear in your notice stream or get linked to from your notice stream (things
 like spam, viruses, or hate content).
 
-You can review our [Public Stream](%%action.public%%) to get a sense
+You can review our [Public Stream](%%action.top%%) to get a sense
 of the types of notices that are welcome on our service (or not!). If
 you find a %%site.name%% account that you believe violates our terms
 of service, please check our [Contact](%%doc.contact%%) documentation.

index.php

@@ -49,21 +49,29 @@ $action = null;
 
 function getPath($req)
 {
+    $p = null;
+
     if ((common_config('site', 'fancy') || !array_key_exists('PATH_INFO', $_SERVER))
         && array_key_exists('p', $req)
     ) {
-        return $req['p'];
+        $p = $req['p'];
     } else if (array_key_exists('PATH_INFO', $_SERVER)) {
         $path = $_SERVER['PATH_INFO'];
         $script = $_SERVER['SCRIPT_NAME'];
         if (substr($path, 0, mb_strlen($script)) == $script) {
-            return substr($path, mb_strlen($script));
+            $p = substr($path, mb_strlen($script) + 1);
         } else {
-            return $path;
+            $p = $path;
         }
     } else {
-        return null;
+        $p = null;
     }
+
+    // Trim all initial '/'
+
+    $p = ltrim($p, '/');
+
+    return $p;
 }
 
 /**

lib/action.php

@@ -229,7 +229,7 @@ class Action extends HTMLOutputter // lawsuit
                 Event::handle('EndShowLaconicaStyles', array($this));
             }
 
-            $this->cssLink(common_path('js/css/smoothness/jquery-ui.css'));
+            $this->cssLink(common_path('js/css/smoothness/jquery-ui.css', StatusNet::isHTTPS()));
 
             if (Event::handle('StartShowUAStyles', array($this))) {
                 $this->comment('[if IE]><link rel="stylesheet" type="text/css" '.
@@ -302,7 +302,7 @@ class Action extends HTMLOutputter // lawsuit
                     $this->script('jquery.form.min.js');
                     $this->script('jquery-ui.min.js');
                     $this->script('jquery.cookie.min.js');
-                    $this->inlineScript('if (typeof window.JSON !== "object") { $.getScript("'.common_path('js/json2.min.js').'"); }');
+                    $this->inlineScript('if (typeof window.JSON !== "object") { $.getScript("'.common_path('js/json2.min.js', StatusNet::isHTTPS()).'"); }');
                     $this->script('jquery.joverlay.min.js');
                     $this->script('jquery.infieldlabel.min.js');
                 } else {
@@ -310,7 +310,7 @@ class Action extends HTMLOutputter // lawsuit
                     $this->script('jquery.form.js');
                     $this->script('jquery-ui.min.js');
                     $this->script('jquery.cookie.js');
-                    $this->inlineScript('if (typeof window.JSON !== "object") { $.getScript("'.common_path('js/json2.js').'"); }');
+                    $this->inlineScript('if (typeof window.JSON !== "object") { $.getScript("'.common_path('js/json2.js', StatusNet::isHTTPS()).'"); }');
                     $this->script('jquery.joverlay.js');
                     $this->script('jquery.infieldlabel.js');
                 }
@@ -328,10 +328,8 @@ class Action extends HTMLOutputter // lawsuit
                 }
                 // This route isn't available in single-user mode.
                 // Not sure why, but it causes errors here.
-                if (!common_config('singleuser', 'enabled')) {
                 $this->inlineScript('var _peopletagAC = "' .
                                     common_local_url('peopletagautocomplete') . '";');
-                }
                 $this->showScriptMessages();
                 // Anti-framing code to avoid clickjacking attacks in older browsers.
                 // This will show a blank page if the page is being framed, which is

lib/activity.php

@@ -389,9 +389,28 @@ class Activity
 
                     $activity['geopoint'] = array(
                         'type'        => 'Point',
-                        'coordinates' => array($loc->lat, $loc->lon)
+                        'coordinates' => array($loc->lat, $loc->lon),
+                        'deprecated'  => true,
                     );
 
+                    $activity['location'] = array(
+                        'objectType' => 'place',
+                        'position' => sprintf("%+02.5F%+03.5F/", $loc->lat, $loc->lon),
+                        'lat' => $loc->lat,
+                        'lon' => $loc->lon
+                    );
+
+                    $name = $loc->getName();
+
+                    if ($name) {
+                        $activity['location']['displayName'] = $name;
+                    }
+                    
+                    $url = $loc->getURL();
+
+                    if ($url) {
+                        $activity['location']['url'] = $url;
+                    }
                 }
 
                 $activity['to']      = $this->context->getToArray();
@@ -487,14 +506,19 @@ class Activity
 
         /* Purely extensions hereafter */
 
+        if ($activity['verb'] == 'post') {
             $tags = array();
-
-        // Use an Activity Object for term? Which object? Note?
             foreach ($this->categories as $cat) {
-            $tags[] = $cat->term;
+                if (mb_strlen($cat->term) > 0) {
+                    // Couldn't figure out which object type to use, so...
+                    $tags[] = array('objectType' => 'http://activityschema.org/object/hashtag',
+                                    'displayName' => $cat->term);
+                }
+            }
+            if (count($tags) > 0) {
+                $activity['object']['tags'] = $tags;
+            }
         }
-
-        $activity['tags'] = $tags;
 
         // XXX: a bit of a hack... Since JSON isn't namespaced we probably
         // shouldn't be using 'statusnet:notice_info', but this will work

lib/activityobject.php

@@ -692,9 +692,6 @@ class ActivityObject
 
             // id
             $object['id'] = $this->id;
-            //
-            // XXX: Should we use URL here? or a crazy tag URI?
-            $object['id'] = $this->id;
 
             if ($this->type == ActivityObject::PERSON
                 || $this->type == ActivityObject::GROUP) {
@@ -737,14 +734,17 @@ class ActivityObject
             // We can probably use the whole schema URL here but probably the
             // relative simple name is easier to parse
             // @fixme this breaks extension URIs
-            $object['type'] = substr($this->type, strrpos($this->type, '/') + 1);
+            $object['objectType'] = substr($this->type, strrpos($this->type, '/') + 1);
-
-            // published (probably don't need. Might be useful for repeats.)
 
             // summary
             $object['summary'] = $this->summary;
 
-            // udpated (probably don't need this)
+            // summary
+            $object['content'] = $this->content;
+
+            // published (probably don't need. Might be useful for repeats.)
+
+            // updated (probably don't need this)
 
             // TODO: upstreamDuplicates
 

lib/activitystreamjsondocument.php

@@ -168,7 +168,7 @@ class ActivityStreamJSONDocument extends JSONActivityCollection
         $this->doc['generator'] = 'StatusNet ' . STATUSNET_VERSION; // extension
         $this->doc['title'] = $this->title;
         $this->doc['url']   = $this->url;
-        $this->doc['count'] = $this->count;
+        $this->doc['totalItems'] = $this->count;
         $this->doc['items'] = $this->items;
         $this->doc['links'] = $this->links; // extension
         return json_encode(array_filter($this->doc)); // filter out empty elements

lib/cache.php

@@ -43,11 +43,23 @@
  */
 class Cache
 {
+    /**
+     * @var array additional in-process cache for web requests;
+     *      disabled on CLI, unsafe for long-running daemons
+     */
     var $_items = array();
+    var $_inlineCache = true;
     static $_inst = null;
 
     const COMPRESSED = 1;
 
+    private function __construct() {
+        // Potentially long-running daemons or maintenance scripts
+        // should not use an in-process cache as it becomes out of
+        // date.
+        $this->_inlineCache = (php_sapi_name() != 'cli');
+    }
+
     /**
      * Singleton constructor
      *
@@ -166,7 +178,7 @@ class Cache
 
         common_perf_counter('Cache::get', $key);
         if (Event::handle('StartCacheGet', array(&$key, &$value))) {
-            if (array_key_exists($key, $this->_items)) {
+            if ($this->_inlineCache && array_key_exists($key, $this->_items)) {
                 $value = unserialize($this->_items[$key]);
             }
             Event::handle('EndCacheGet', array($key, &$value));
@@ -193,7 +205,9 @@ class Cache
         if (Event::handle('StartCacheSet', array(&$key, &$value, &$flag,
                                                  &$expiry, &$success))) {
 
+            if ($this->_inlineCache) {
                 $this->_items[$key] = serialize($value);
+            }
 
             $success = true;
 
@@ -244,7 +258,7 @@ class Cache
 
         common_perf_counter('Cache::delete', $key);
         if (Event::handle('StartCacheDelete', array(&$key, &$success))) {
-            if (array_key_exists($key, $this->_items)) {
+            if ($this->_inlineCache && array_key_exists($key, $this->_items)) {
                 unset($this->_items[$key]);
             }
             $success = true;

lib/cachingnoticestream.php

@@ -51,11 +51,13 @@ class CachingNoticeStream extends NoticeStream
 
     public $stream   = null;
     public $cachekey = null;
+    public $useLast  = true;
 
-    function __construct($stream, $cachekey)
+    function __construct($stream, $cachekey, $useLast = true)
     {
         $this->stream   = $stream;
         $this->cachekey = $cachekey;
+        $this->useLast  = $useLast;
     }
 
     function getNoticeIds($offset, $limit, $sinceId, $maxId)
@@ -85,6 +87,7 @@ class CachingNoticeStream extends NoticeStream
             return $ids;
         }
 
+        if ($this->useLast) {
             // Check the cache to see if we have a "last-known-good" version.
             // The actual cache gets blown away when new notices are added, but
             // the "last" value holds a lot of info. We might need to only generate
@@ -109,6 +112,7 @@ class CachingNoticeStream extends NoticeStream
 
                 return $ids;
             }
+        }
 
         // No cache hits :( Generate directly and stick the results
         // into the cache. Note we generate the full cache window.
@@ -118,7 +122,10 @@ class CachingNoticeStream extends NoticeStream
         $windowstr = implode(',', $window);
 
         $result = $cache->set($idkey, $windowstr);
+
+        if ($this->useLast) {
             $result = $cache->set($idkey . ';last', $windowstr);
+        }
 
         // Return just the slice that was requested
 

lib/default.php

@@ -66,7 +66,7 @@ $default =
               'minify' => true, // true to use the minified versions of JS files; false to use orig files. Can aid during development
               ),
         'db' =>
-        array('database' => 'YOU HAVE TO SET THIS IN config.php',
+          array('database' => null, // must be set
               'schema_location' => INSTALLDIR . '/classes',
               'class_location' => INSTALLDIR . '/classes',
               'require_prefix' => 'classes/',
@@ -277,7 +277,7 @@ $default =
               'allow_tagging' => array('all' => true), // equivalent to array('local' => true, 'remote' => true)
               'desclimit' => null),
         'oembed' =>
-        array('endpoint' => 'http://oohembed.com/oohembed/',
+        array('endpoint' => 'https://noembed.com/embed/',
               'order' => array('built-in', 'well-known', 'service', 'discovery'),
         ),
         'search' =>
@@ -352,6 +352,5 @@ $default =
         array('cache' => true), // whether to cache the router object. Defaults to true, turn off for devel
         'discovery' =>
           array('cors' => false), // Allow Cross-Origin Resource Sharing for service discovery (host-meta, XRD, etc.)
-       'performance' => array('high' => false), // disable some features for higher performance; default false
+        'performance' => array('high' => false) // disable some features for higher performance; default false
-       'oldschool' => array('enabled' => false) // enable users to use old-style UI
     );

lib/framework.php

@@ -151,6 +151,23 @@ function PEAR_ErrorToPEAR_Exception($err)
     if ($err->getCode() == DB_DATAOBJECT_ERROR_NODATA) {
         return;
     }
+
+    $msg      = $err->getMessage();
+    $userInfo = $err->getUserInfo();
+
+    // Log this; push the message up as an exception
+
+    common_log(LOG_ERR, "PEAR Error: $msg ($userInfo)");
+
+    // HACK: queue handlers get kicked by the long-query killer, and 
+    // keep the same broken connection. We die here to get a new
+    // process started.
+
+    if (php_sapi_name() == 'cli' && preg_match('/nativecode=2006/', $userInfo)) {
+        common_log(LOG_ERR, "Lost DB connection; dying.");
+        exit(100);
+    }
+
     if ($err->getCode()) {
         throw new PEAR_Exception($err->getMessage(), $err->getCode());
     }

lib/groupeditform.php

@@ -144,8 +144,8 @@ class GroupEditForm extends Form
             $this->out->elementStart('li');
             $this->out->hidden('groupid', $id);
             // TRANS: Field label on group edit form.
-            $this->out->input('nickname', _('Nickname'),
+            $this->out->input('newnickname', _('Nickname'),
-                              ($this->out->arg('nickname')) ? $this->out->arg('nickname') : $nickname,
+                              ($this->out->arg('newnickname')) ? $this->out->arg('newnickname') : $nickname,
                               // TRANS: Field title on group edit form.
                               _('1-64 lowercase letters or numbers, no punctuation or spaces.'));
             $this->out->elementEnd('li');

lib/grouplist.php

@@ -34,8 +34,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
 
 require_once INSTALLDIR.'/lib/widget.php';
 
-define('GROUPS_PER_PAGE', 20);
-
 /**
  * Widget to show a list of groups
  *

lib/groupprofileblock.php

@@ -153,4 +153,23 @@ class GroupProfileBlock extends ProfileBlock
         }
         $this->out->elementEnd('div');
     }
+
+    function showName()
+    {
+        parent::showName();
+        $this->showAliases();
+    }
+
+    function showAliases()
+    {
+        $aliases = $this->group->getAliases();
+
+        if (!empty($aliases)) {
+            $this->out->elementStart('ul', 'group_aliases');
+            foreach ($aliases as $alias) {
+                $this->out->element('li', 'group_alias', $alias);
+            }
+            $this->out->elementEnd('ul');
+        }
+    }
 }

lib/homestubnav.php

@@ -0,0 +1,61 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * Stub sub-menu for sections that need to go home
+ * 
+ * PHP version 5
+ *
+ * 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  Menu
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    // This check helps protect against security problems;
+    // your code file can't be executed directly from the web.
+    exit(1);
+}
+
+/**
+ * stub sub-menu for settings and stuff
+ *
+ * @category  General
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+class HomeStubNav extends Menu
+{
+    function getItems()
+    {
+        return array(array('top',
+                           null,
+                           // TRANS: Menu item in personal group navigation menu.
+                           _m('MENU','Home'),
+                           // TRANS: Menu item title in personal group navigation menu.
+                           // TRANS: %s is a username.
+                           _('Back to top'),
+                           'nav_return_top'));
+    }
+}

lib/noticelistitem.php

@@ -720,4 +720,17 @@ class NoticeListItem extends Widget
             Event::handle('EndCloseNoticeListItemElement', array($this));
         }
     }
+
+    /**
+     * Get the notice in question
+     *
+     * For hooks, etc., this may be useful
+     *
+     * @return Notice The notice we're showing
+     */
+
+    function getNotice()
+    {
+        return $this->notice;
+    }
 }

lib/oembedhelper.php

@@ -61,7 +61,7 @@ class oEmbedHelper
      * Some known hosts are whitelisted with API endpoints where we
      * know they exist but autodiscovery data isn't available.
      * If autodiscovery links are missing and we don't recognize the
-     * host, we'll pass it to oohembed.com's public service which
+     * host, we'll pass it to noembed.com's public service which
      * will either proxy or fake info on a lot of sites.
      *
      * A few hosts are blacklisted due to known problems with oohembed,
@@ -94,7 +94,7 @@ class oEmbedHelper
             case 'built-in':
                 common_log(LOG_INFO, 'Considering built-in oEmbed methods...');
                 // Blacklist: systems with no oEmbed API of their own, which are
-                // either missing from or broken on oohembed.com's proxy.
+                // either missing from or broken on noembed.com's proxy.
                 // we know how to look data up in another way...
                 if (array_key_exists($host, self::$functionMap)) {
                     common_log(LOG_INFO, 'We have a built-in method for ' . $host);

lib/peopletaggroupnav.php

@@ -79,7 +79,13 @@ class PeopletagGroupNav extends Widget
 	// FIXME: we should probably pass this in
 
         $action = $this->action->trimmed('action');
-        $nickname = $this->action->trimmed('tagger');
+
+        if (common_config('singleuser', 'enabled')) {
+            $nickname = User::singleUserNickname();
+        } else {
+            $nickname = $this->action->arg('tagger');
+        }
+
         $tag = $this->action->trimmed('tag');
 
         if ($nickname) {

lib/plugin.php

@@ -159,8 +159,13 @@ class Plugin
         }
 
         if (empty($path)) {
+            // XXX: extra stat().
+            if (@file_exists(INSTALLDIR.'/local/plugins/'.$plugin.'/'.$relative)) {
+                $path = common_config('site', 'path') . '/local/plugins/';
+            } else {
                 $path = common_config('site', 'path') . '/plugins/';
             }
+        }
 
         if ($path[strlen($path)-1] != '/') {
             $path .= '/';

lib/popularity.php

@@ -1,92 +0,0 @@
-<?php
-/**
- * StatusNet, the distributed open-source microblogging tool
- *
- * Wrapper for fetching lists of popular notices.
- *
- * 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  Widget
- * @package   StatusNet
- * @author    Evan Prodromou <evan@status.net>
- * @author    Brion Vibber <brion@status.net>
- * @copyright 2010 StatusNet, Inc.
- * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://status.net/
- */
-
-if (!defined('STATUSNET') && !defined('LACONICA')) {
-    exit(1);
-}
-
-/**
- * Wrapper for fetching notices ranked according to popularity,
- * broken out so it can be called from multiple actions with
- * less code duplication.
- */
-class Popularity
-{
-    public $limit = NOTICES_PER_PAGE;
-    public $offset = 0;
-    public $tag = false;
-    public $expiry = 600;
-
-    /**
-     * Run a cached query to fetch notices, whee!
-     *
-     * @return Notice
-     */
-    function getNotices()
-    {
-        // @fixme there should be a common func for this
-        if (common_config('db', 'type') == 'pgsql') {
-            if (!empty($this->tag)) {
-                $tag = pg_escape_string($this->tag);
-            }
-        } else {
-            if (!empty($this->tag)) {
-                 $tag = mysql_escape_string($this->tag);
-            }
-        }
-        $weightexpr = common_sql_weight('fave.modified', common_config('popular', 'dropoff'));
-        $cutoff = sprintf("fave.modified > '%s'",
-                          common_sql_date(time() - common_config('popular', 'cutoff')));
-        $qry = "SELECT notice.*, $weightexpr as weight ";
-        if(isset($tag)) {
-            $qry .= 'FROM notice_tag, notice JOIN fave ON notice.id = fave.notice_id ' .
-                    "WHERE $cutoff and notice.id = notice_tag.notice_id and '$tag' = notice_tag.tag";
-        } else {
-            $qry .= 'FROM notice JOIN fave ON notice.id = fave.notice_id ' .
-                    "WHERE $cutoff";
-        }
-        $qry .= ' GROUP BY notice.id,notice.profile_id,notice.content,notice.uri,' .
-                'notice.rendered,notice.url,notice.created,notice.modified,' .
-                'notice.reply_to,notice.is_local,notice.source,notice.conversation, ' .
-                'notice.lat,notice.lon,location_id,location_ns,notice.repeat_of';
-        $qry .= ' HAVING \'silenced\' NOT IN (SELECT role FROM profile_role WHERE profile_id=notice.profile_id)';
-        $qry .= ' ORDER BY weight DESC';
-
-        $offset = $this->offset;
-        $limit  = $this->limit + 1;
-
-        $qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset;
-
-        $notice = Memcached_DataObject::cachedQuery('Notice',
-                                                    $qry,
-                                                    1200);
-        return $notice;
-    }
-}

lib/popularnoticesection.php

@@ -22,7 +22,7 @@
  * @category  Widget
  * @package   StatusNet
  * @author    Evan Prodromou <evan@status.net>
- * @copyright 2009 StatusNet, Inc.
+ * @copyright 2009,2011 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/
  */
@@ -45,15 +45,18 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
  */
 class PopularNoticeSection extends NoticeSection
 {
+    protected $viewer;
+
+    function __construct($out, $viewer)
+    {
+        parent::__construct($out);
+        $this->viewer = $viewer;
+    }
+
     function getNotices()
     {
-        $pop = new Popularity();
+        $stream = new PopularNoticeStream($this->viewer);
-        if (!empty($this->out->tag)) {
+        return $stream->getNotices(0, NOTICES_PER_SECTION + 1);
-            $pop->tag = $this->out->tag;
-        }
-        $pop->limit = NOTICES_PER_SECTION;
-        $pop->expiry = 1200;
-        return $pop->getNotices();
     }
 
     function title()

lib/popularnoticestream.php

@@ -0,0 +1,109 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * Stream of notices sorted by popularity
+ * 
+ * PHP version 5
+ *
+ * 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  Popular
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    // This check helps protect against security problems;
+    // your code file can't be executed directly from the web.
+    exit(1);
+}
+
+/**
+ * Stream of notices sorted by popularity
+ *
+ * @category  Popular
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+class PopularNoticeStream extends ScopingNoticeStream
+{
+    function __construct($profile=null)
+    {
+        parent::__construct(new HideSilencedStream(new CachingNoticeStream(new RawPopularNoticeStream(),
+                                                                           'popular',
+                                                                           false)),
+                            $profile);
+    }
+}
+
+class HideSilencedStream extends FilteringNoticeStream
+{
+    /**
+     * Only return notices where the profile is in scope
+     *
+     * @param Notice $notice The notice to check
+     *
+     * @return boolean whether to include the notice
+     */
+
+    function filter($notice)
+    {
+        $author = $notice->getProfile();
+        return !$author->isSilenced();
+    }
+}
+
+class RawPopularNoticeStream extends NoticeStream
+{
+    function getNoticeIds($offset, $limit, $since_id, $max_id)
+    {
+        $weightexpr = common_sql_weight('modified', common_config('popular', 'dropoff'));
+        $cutoff = sprintf("modified > '%s'",
+                          common_sql_date(time() - common_config('popular', 'cutoff')));
+
+        $fave = new Fave();
+        $fave->selectAdd();
+        $fave->selectAdd('notice_id');
+        $fave->selectAdd("$weightexpr as weight");
+        $fave->whereAdd($cutoff);
+        $fave->orderBy('weight DESC');
+        $fave->groupBy('notice_id');
+
+        if (!is_null($offset)) {
+            $fave->limit($offset, $limit);
+        }
+
+        // FIXME: $since_id, $max_id are ignored
+
+        $ids = array();
+
+        if ($fave->find()) {
+            while ($fave->fetch()) {
+                $ids[] = $fave->notice_id;
+            }
+        }
+
+        return $ids;
+    }
+}
+

lib/profileaction.php

@@ -259,7 +259,7 @@ class ProfileAction extends Action
             // TRANS: H2 text for user group membership statistics.
             $this->statsSectionLink('usergroups', _('Groups'));
             $this->text(' ');
-            $this->text($this->profile->getGroups()->N);
+            $this->text($this->profile->getGroups(0, null)->N);
             $this->elementEnd('h2');
 
             if ($groups) {

lib/profileblock.php

@@ -122,8 +122,14 @@ abstract class ProfileBlock extends Widget
 
     function showHomepage()
     {
+        $homepage = $this->homepage();
+
         if (!empty($homepage)) {
-            $this->out->element('a', 'profile_block_homepage', $homepage);
+            $this->out->element('a',
+                                array('href' => $homepage,
+                                      'rel' => 'me',
+                                      'class' => 'profile_block_homepage'),
+                                $homepage);
         }
     }
 

lib/profileminilist.php

@@ -47,6 +47,7 @@ define('PROFILES_PER_MINILIST', 8);
 
 class ProfileMiniList extends ProfileList
 {
+    const MAX_PROFILES = PROFILES_PER_MINILIST; // put it in the class
 
     function startList()
     {

lib/router.php

@@ -156,6 +156,7 @@ class Router
                           'backupaccount',
                           'deleteaccount',
                           'restoreaccount',
+                          'top',
             );
 
             foreach ($main as $a) {
@@ -334,6 +335,10 @@ class Router
                         array('action' => 'showgroup'),
                         array('nickname' => Nickname::DISPLAY_FMT));
 
+            $m->connect('group/:nickname/',
+                        array('action' => 'showgroup'),
+                        array('nickname' => Nickname::DISPLAY_FMT));
+
             $m->connect('group/', array('action' => 'groups'));
             $m->connect('group', array('action' => 'groups'));
             $m->connect('groups/', array('action' => 'groups'));
@@ -817,6 +822,22 @@ class Router
                         array('action' => 'getfile'),
                         array('filename' => '[A-Za-z0-9._-]+'));
 
+            // Common people-tag stuff
+
+            $m->connect('peopletag/:tag', array('action' => 'peopletag',
+                                                'tag'    => self::REGEX_TAG));
+
+            $m->connect('selftag/:tag', array('action' => 'selftag',
+                                              'tag'    => self::REGEX_TAG));
+
+            $m->connect('main/addpeopletag', array('action' => 'addpeopletag'));
+
+            $m->connect('main/removepeopletag', array('action' => 'removepeopletag'));
+
+            $m->connect('main/profilecompletion', array('action' => 'profilecompletion'));
+
+            $m->connect('main/peopletagautocomplete', array('action' => 'peopletagautocomplete'));
+
             // In the "root"
 
             if (common_config('singleuser', 'enabled')) {
@@ -880,6 +901,57 @@ class Router
                 $m->connect('',
                             array('action' => 'showstream',
                                   'nickname' => $nickname));
+
+                // peopletags
+
+                $m->connect('peopletags',
+                            array('action' => 'peopletagsbyuser'));
+
+                $m->connect('peopletags/private',
+                            array('action' => 'peopletagsbyuser',
+                                  'private' => 1));
+
+                $m->connect('peopletags/public',
+                            array('action' => 'peopletagsbyuser',
+                                  'public' => 1));
+
+                $m->connect('othertags',
+                            array('action' => 'peopletagsforuser'));
+
+                $m->connect('peopletagsubscriptions',
+                            array('action' => 'peopletagsubscriptions'));
+
+                $m->connect('all/:tag/subscribers',
+                            array('action' => 'peopletagsubscribers',
+                                  'tag' => self::REGEX_TAG));
+
+                $m->connect('all/:tag/tagged',
+                                array('action' => 'peopletagged',
+                                      'tag' => self::REGEX_TAG));
+
+                $m->connect('all/:tag/edit',
+                                array('action' => 'editpeopletag',
+                                      'tag' => self::REGEX_TAG));
+
+                foreach(array('subscribe', 'unsubscribe') as $v) {
+                    $m->connect('peopletag/:id/'.$v,
+                                    array('action' => $v.'peopletag',
+                                          'id' => '[0-9]{1,64}'));
+                }
+                $m->connect('user/:tagger_id/profiletag/:id/id',
+                                array('action' => 'profiletagbyid',
+                                      'tagger_id' => '[0-9]+',
+                                      'id' => '[0-9]+'));
+
+                $m->connect('all/:tag',
+                                array('action' => 'showprofiletag',
+                                      'tag' => self::REGEX_TAG));
+
+                foreach (array('subscriptions', 'subscribers') as $a) {
+                    $m->connect($a.'/:tag',
+                                array('action' => $a),
+                                array('tag' => self::REGEX_TAG));
+                }
             } else {
                 $m->connect('', array('action' => 'public'));
                 $m->connect('rss', array('action' => 'publicrss'));
@@ -904,20 +976,6 @@ class Router
 
                 // people tags
 
-                $m->connect('peopletag/:tag', array('action' => 'peopletag',
-                                                    'tag'    => self::REGEX_TAG));
-
-                $m->connect('selftag/:tag', array('action' => 'selftag',
-                                                  'tag'    => self::REGEX_TAG));
-
-                $m->connect('main/addpeopletag', array('action' => 'addpeopletag'));
-
-                $m->connect('main/removepeopletag', array('action' => 'removepeopletag'));
-
-                $m->connect('main/profilecompletion', array('action' => 'profilecompletion'));
-
-                $m->connect('main/peopletagautocomplete', array('action' => 'peopletagautocomplete'));
-
                 $m->connect(':nickname/peopletags',
                                 array('action' => 'peopletagsbyuser',
                                       'nickname' => Nickname::DISPLAY_FMT));
@@ -1015,6 +1073,10 @@ class Router
                 $m->connect(':nickname',
                             array('action' => 'showstream'),
                             array('nickname' => Nickname::DISPLAY_FMT));
+
+                $m->connect(':nickname/',
+                            array('action' => 'showstream'),
+                            array('nickname' => Nickname::DISPLAY_FMT));
             }
 
             // AtomPub API

lib/secondarynav.php

@@ -79,9 +79,6 @@ class SecondaryNav extends Menu
                                  // TRANS: Secondary navigation menu item leading to e-mail contact information on the
                                  // TRANS: StatusNet site, where to report bugs, ...
                                  _m('MENU','Contact'));
-            $this->out->menuItem(common_local_url('doc', array('title' => 'badge')),
-                                 // TRANS: Secondary navigation menu item. Leads to information about embedding a timeline widget.
-                                 _m('MENU','Badge'));
             Event::handle('EndSecondaryNav', array($this->action));
         }
         $this->out->elementEnd('ul');

lib/settingsnav.php

@@ -59,23 +59,8 @@ class SettingsNav extends Menu
         $nickname = $user->nickname;
         $name = $user->getProfile()->getBestName();
 
-        // Stub section w/ home link
+        $stub = new HomeStubNav($this->action);
-        $this->action->elementStart('ul');
+        $this->submenu(_m('MENU','Home'), $stub);
-        $this->action->elementStart('li');
-        // TRANS: Header in settings navigation panel.
-        $this->action->element('h3', null, _m('HEADER','Home'));
-        $this->action->elementStart('ul', 'nav');
-        $this->out->menuItem(common_local_url('all', array('nickname' =>
-                                                           $nickname)),
-                             // TRANS: Menu item in settings navigation panel.
-                             _m('MENU','Home'),
-                             // TRANS: Menu item title in settings navigation panel.
-                             // TRANS: %s is a username.
-                             sprintf(_('%s and friends'), $name),
-                             $this->action == 'all', 'nav_timeline_personal');
-        $this->action->elementEnd('ul');
-        $this->action->elementEnd('li');
-        $this->action->elementEnd('ul');
         
         $this->action->elementStart('ul');
         $this->action->elementStart('li');

lib/statusnet.php

@@ -362,6 +362,7 @@ class StatusNet
             if (@file_exists($_config_file)) {
                 // Ignore 0-byte config files
                 if (filesize($_config_file) > 0) {
+                    common_log(LOG_INFO, "Including config file: " . $_config_file);
                     include($_config_file);
                     self::$have_config = true;
                 }
@@ -383,6 +384,7 @@ class StatusNet
                 $config['cache']['base'] = $config['memcached']['base'];
             }
         }
+
         if (array_key_exists('xmpp', $config)) {
             if ($config['xmpp']['enabled']) {
                 addPlugin('xmpp', array(
@@ -398,6 +400,12 @@ class StatusNet
                 ));
             }
         }
+
+        // Check for database server; must exist!
+
+        if (empty($config['db']['database'])) {
+            throw new ServerException("No database server for this site.");
+        }
     }
 
     /**

lib/threadednoticelist.php

@@ -569,17 +569,35 @@ class ThreadedNoticeListRepeatsItem extends NoticeListActorsItem
         return $profiles;
     }
 
+    function magicList($items)
+    {
+        if (count($items) > 4) {
+            return parent::magicList(array_slice($items, 0, 3));
+        } else {
+            return parent::magicList($items);
+        }
+    }
+
     function getListMessage($count, $you)
     {
         if ($count == 1 && $you) {
             // darn first person being different from third person!
             // TRANS: List message for notice repeated by logged in user.
-            return _m('REPEATLIST', 'You have repeated this notice.');
+            return _m('REPEATLIST', 'You repeated this.');
+        } else if ($count > 4) {
+            // TRANS: List message for when more than 4 people repeat something.
+            // TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice.
+            // TRANS: Plural is decided on the total number of users liking the notice (count of %%s + %d).
+            return sprintf(_m('%%s and %d other repeated this.',
+                              '%%s and %d others repeated this.',
+                              $count - 3),
+                           $count - 3);
         } else {
-            // TRANS: List message for repeated notices.
+            // TRANS: List message for favoured notices.
-            // TRANS: %d is the number of users that have repeated a notice.
+            // TRANS: %%s is a list of users liking a notice.
-            return sprintf(_m('One person has repeated this notice.',
+            // TRANS: Plural is based on the number of of users that have favoured a notice.
-                              '%d people have repeated this notice.',
+            return sprintf(_m('%%s repeated this.',
+                              '%%s repeated this.',
                               $count),
                            $count);
         }

lib/widget.php

@@ -80,6 +80,19 @@ class Widget
     {
     }
 
+    /**
+     * Get HTMLOutputter
+     *
+     * Return the HTMLOutputter for the widget.
+     *
+     * @return HTMLOutputter the output helper
+     */
+
+    function getOut()
+    {
+        return $this->out;
+    }
+
     /**
      * Delegate output methods to the outputter attribute.
      *

locale/ar/LC_MESSAGES/statusnet.po

@@ -15,19 +15,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-25 21:42+0000\n"
+"POT-Creation-Date: 2012-03-01 15:45+0000\n"
-"PO-Revision-Date: 2011-09-25 21:44:46+0000\n"
+"PO-Revision-Date: 2012-03-01 15:45:34+0000\n"
 "Language-Team: Arabic <https://translatewiki.net/wiki/Portal:ar>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.19alpha (r98079); Translate extension (2011-09-22)\n"
+"X-Generator: MediaWiki 1.20alpha (r112812); Translate 2012-02-26\n"
-"X-Translation-Project: translatewiki.net at https://translatewiki.net\n"
+"X-Translation-Project: translatewiki.net <https://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: 2011-09-11 15:11:17+0000\n"
+"X-POT-Import-Date: 2012-02-25 15:22:46+0000\n"
 
 #. TRANS: Database error message.
 #, php-format
@@ -46,7 +46,7 @@ msgstr "حدث خطأ."
 #, php-format
 msgid ""
 "No configuration file found. Try running the installation program first."
-msgstr "لم يتم العثور على ملف التشكيل. حاول تشغيل برنامج التثبيت أولاّ."
+msgstr "تعذر العثور على ملف التشكيل. حاول تشغيل برنامج التثبيت أولًا."
 
 #. TRANS: Error message displayed when trying to access a non-existing page.
 msgid "Unknown page"
@@ -146,13 +146,13 @@ msgstr "لست والجًا."
 #. TRANS: Client error displayed trying to subscribe to a non-existing profile.
 #. TRANS: Client error displayed trying to perform an action related to a non-existing profile.
 msgid "No such profile."
-msgstr "لا ملف كهذا."
+msgstr "لا يوجد ملف شخصي بهذا الاسم."
 
 #. TRANS: Client error displayed trying to reference a non-existing list.
 #. TRANS: Client error displayed when referring to a non-existing list.
 #. TRANS: Client error displayed trying to reference a non-existing list.
 msgid "No such list."
-msgstr "لا توجد لائحة كهذه."
+msgstr "اللائحة المقصودة غير موجودة."
 
 #. TRANS: Client error displayed when an unknown error occurs when adding a user to a list.
 #. TRANS: %s is a username.
@@ -177,7 +177,7 @@ msgstr "المدرجون"
 #. TRANS: Server error when page not found (404)
 #. TRANS: Server error when page not found (404).
 msgid "No such page."
-msgstr "لا صفحة كهذه."
+msgstr "الصفحة غير موجودة."
 
 #. TRANS: Client error when user not found for an action.
 #. TRANS: Client error when user not found for an rss related action.
@@ -208,7 +208,6 @@ msgstr "لا صفحة كهذه."
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
-#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed trying to make a micro summary without providing a valid user.
 #. TRANS: Client error displayed trying to send a direct message to a non-existing user.
 #. TRANS: Client error displayed trying to use "one time password login" without using an existing user.
@@ -227,7 +226,7 @@ msgstr "لا صفحة كهذه."
 #. TRANS: Client error displayed when trying to access a mailbox without providing a user.
 #. TRANS: Client error displayed when calling a profile action without specifying a user.
 msgid "No such user."
-msgstr "لا مستخدم كهذا."
+msgstr "لا يوجد مستخدم بهذا الاسم."
 
 #. TRANS: Title of a user's own start page.
 msgid "Home timeline"
@@ -316,8 +315,6 @@ msgstr "أرسل دعوة"
 #. TRANS: %s is a username.
 #. TRANS: Menu item title in personal group navigation menu.
 #. TRANS: %s is a username.
-#. TRANS: Menu item title in settings navigation panel.
-#. TRANS: %s is a username.
 #, php-format
 msgid "%s and friends"
 msgstr "%s والأصدقاء"
@@ -332,7 +329,7 @@ msgstr "مستجدات %1$s وأصدقائه على %2$s!"
 #. TRANS: Client error displayed when trying to handle an unknown API method.
 #. TRANS: Client error displayed when coming across a non-supported API method.
 msgid "API method not found."
-msgstr "لم يتم العثور على وسيلة API."
+msgstr "تعذر العثور على وسيلة API."
 
 #. TRANS: Client error message. POST is a HTTP command. It should not be translated.
 #. TRANS: Client error. POST is a HTTP command. It should not be translated.
@@ -686,7 +683,7 @@ msgstr "أنت قد كنت عضو في تلك المجموعة."
 #. TRANS: Client error displayed when trying to join a group while being blocked form joining it.
 #. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
 msgid "You have been blocked from that group by the admin."
-msgstr "لقد تم طردك من تلك المجموعة من قبل الإدارة."
+msgstr "لقد طردتك إدارة هذه المجموعة."
 
 #. TRANS: Server error displayed when joining a group failed in the database.
 #. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
@@ -965,7 +962,7 @@ msgstr "لا يسمح لك بحذف حالة مستخدم آخر."
 #. TRANS: Error message displayed trying to delete a non-existing notice.
 #. TRANS: Client error displayed trying to show a non-existing notice.
 msgid "No such notice."
-msgstr "لا إشعار كهذا."
+msgstr "الإشعار المطلوب غير موجود."
 
 #. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
@@ -1217,7 +1214,7 @@ msgstr "يجب أن تلج لتغادر مجموعة."
 #. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
 #. TRANS: Client error displayed if no local group with a given name was found requesting group page.
 msgid "No such group."
-msgstr "لا مجموعة كهذه."
+msgstr "لا توجد مجموعة بهذا الاسم."
 
 #. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
 #. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
@@ -1258,7 +1255,7 @@ msgstr ""
 #. TRANS: Client error displayed trying to approve/deny group membership.
 #. TRANS: Client error displayed trying to approve/deny  subscription
 msgid "Internal error: received both cancel and abort."
-msgstr "خطأ داخلي: تم تلقي أمر إلغاء وتراجع"
+msgstr "خطأ داخلي: وصل أمر إلغاء وأمر إجهاض."
 
 #. TRANS: Server error displayed when cancelling a queued group join request fails.
 #. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
@@ -1387,7 +1384,7 @@ msgstr "لا يمكن أن تحذف عضوية شخص آخر."
 #. TRANS: %d is the non-existing profile ID number.
 #, php-format
 msgid "No such profile id: %d."
-msgstr "لا يوجد  ملف تعريف كهذا: %d."
+msgstr "رقم الملف الشخصي هذا غير موجود: %d."
 
 #. TRANS: Client exception thrown when trying to display a subscription for a non-subscribed profile ID.
 #. TRANS: %1$d is the non-existing subscriber ID number, $2$d is the ID of the profile that was not subscribed to.
@@ -1427,7 +1424,7 @@ msgstr "مُشترك فعلا ب%s."
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
 msgid "No such attachment."
-msgstr "لا مرفق كهذا."
+msgstr "المرفق غير موجود."
 
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
@@ -1718,7 +1715,7 @@ msgstr "أكد العنوان"
 #. TRANS: %s can be 'email', 'jabber', or 'sms'.
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
-msgstr "لقد تم التأكد من عنوان حسابك \"%s\"."
+msgstr "لقد تأكدنا من عنوان حسابك \"%s\"."
 
 #. TRANS: Title for page with a conversion (multiple notices in context).
 msgid "Conversation"
@@ -1885,12 +1882,13 @@ msgstr "احذف هذه المجموعة."
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
-msgstr "أنت على وشك حذف إشعار بشكل دائم. عندما تقوم بذلك لن تتمكن من التراجع."
+msgstr ""
+"أنت على وشك حذف الإشعار نهائيًا. تتمكن من التراجع عن هذه الخطوة بعد تنفيذها."
 
 #. TRANS: Page title when deleting a notice.
 #. TRANS: Fieldset legend for the delete notice form.
 msgid "Delete notice"
-msgstr "احذف الإشعار"
+msgstr "حذف إشعار"
 
 #. TRANS: Message for the delete notice form.
 msgid "Are you sure you want to delete this notice?"
@@ -1951,6 +1949,79 @@ msgstr "أضف إلى المفضلات"
 msgid "No such document \"%s\"."
 msgstr "لا مستند باسم \"%s\"."
 
+#. TRANS: Menu item in administrator navigation panel.
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in personal group navigation menu.
+msgctxt "MENU"
+msgid "Home"
+msgstr "الرئيسية"
+
+msgctxt "MENU"
+msgid "Docs"
+msgstr ""
+
+#. TRANS: Secondary navigation menu item leading to help on StatusNet.
+msgctxt "MENU"
+msgid "Help"
+msgstr "مساعدة"
+
+#, fuzzy
+msgid "Getting started"
+msgstr "حُفظت الإعدادات."
+
+#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
+msgctxt "MENU"
+msgid "About"
+msgstr "عن"
+
+#, fuzzy
+msgid "About this site"
+msgstr "ألغِ منع هذا المستخدم"
+
+#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
+msgctxt "MENU"
+msgid "FAQ"
+msgstr "الأسئلة المتكررة"
+
+msgid "Frequently asked questions"
+msgstr ""
+
+#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgctxt "MENU"
+msgid "Contact"
+msgstr "اتصل"
+
+#, fuzzy
+msgid "Contact info"
+msgstr "اتصل"
+
+#, fuzzy
+msgctxt "MENU"
+msgid "Tags"
+msgstr "الوسوم"
+
+msgid "Using tags"
+msgstr ""
+
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in search group navigation panel.
+#. TRANS: Menu item in local navigation menu.
+msgctxt "MENU"
+msgid "Groups"
+msgstr "مجموعات"
+
+#, fuzzy
+msgid "Using groups"
+msgstr "مجموعات المستخدمين"
+
+msgctxt "MENU"
+msgid "API"
+msgstr ""
+
+msgid "RESTful API"
+msgstr ""
+
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
 msgid "Edit application"
@@ -1963,7 +2034,7 @@ msgstr "يجب أن تكون مسجل الدخول لتعدل تطبيقا."
 #. TRANS: Client error displayed trying to edit an application that does not exist.
 #. TRANS: Client error displayed trying to display a non-existing OAuth application.
 msgid "No such application."
-msgstr "لا تطبيق كهذا."
+msgstr "التطبيق المطلوب غير موجود."
 
 #. TRANS: Instructions for "Edit application" form.
 msgid "Use this form to edit your application."
@@ -2085,7 +2156,7 @@ msgstr "استخدم هذا النموذج لتعديل اللائحة."
 
 #. TRANS: Form validation error displayed if the form data for deleting a tag was incorrect.
 msgid "Delete aborted."
-msgstr "تم إجهاض عملية المحو."
+msgstr "أُجهضت عملية المحو."
 
 #. TRANS: Text in confirmation dialog for deleting a tag.
 msgid ""
@@ -2410,7 +2481,7 @@ msgstr "لا مرفقات مرفوعة."
 
 #. TRANS: Client error displayed when requesting a non-existent file.
 msgid "No such file."
-msgstr "لا ملف كهذا."
+msgstr "الملف المقصود غير موجود."
 
 #. TRANS: Client error displayed when requesting a file without having read access to it.
 msgid "Cannot read file."
@@ -2787,7 +2858,7 @@ msgstr "هذا صندوق بريدك الوارد، والذي يسرد رسائ
 
 #. TRANS: Client error displayed when trying to sent invites while they have been disabled.
 msgid "Invites have been disabled."
-msgstr "تم تعطيل الدعوات."
+msgstr "عُطّلت الدعوات."
 
 #. TRANS: Client error displayed when trying to sent invites while not logged in.
 #. TRANS: %s is the StatusNet site name.
@@ -2848,9 +2919,9 @@ msgstr[5] ""
 msgid "Invitation sent to the following person:"
 msgid_plural "Invitations sent to the following people:"
 msgstr[0] ""
-msgstr[1] "أرسلت الدعوة إلى الشخص التالي:"
+msgstr[1] "أُرسلت الدعوة إلى هذا الشخص:"
-msgstr[2] "أرسلت الدعوتين إلى الشخصين التاليين:"
+msgstr[2] "أُرسلت الدعوتان إلى هذين الشخصين:"
-msgstr[3] "أرسلت الدعوات إلى الأشخاص التالين:"
+msgstr[3] "أُرسلت الدعوات إلى هؤلاء الأشخاص:"
 msgstr[4] ""
 msgstr[5] ""
 
@@ -2859,9 +2930,7 @@ msgstr[5] ""
 msgid ""
 "You will be notified when your invitees accept the invitation and register "
 "on the site. Thanks for growing the community!"
-msgstr ""
+msgstr "سوف تُبلغ عند قبول دعوتك والتسجيل في الموقع. نشكر لك إنماء مجتمعنا!"
-"سوف يتم بإبلاغك عندما يقبل من دعوتهم دعوتك ويسجلوا في الموقع. شكرا لك على "
-"إنماء المجتمع!"
 
 #. TRANS: Form instructions.
 msgid ""
@@ -3913,7 +3982,7 @@ msgstr "لا يمكنك إدارة الملحقات."
 
 #. TRANS: Client error displayed when trying to enable or disable a non-existing plugin.
 msgid "No such plugin."
-msgstr "لا ملحق كهذا."
+msgstr "الملحق المقصود غير موجود."
 
 #. TRANS: Page title for AJAX form return when enabling a plugin.
 msgctxt "plugin"
@@ -4076,7 +4145,7 @@ msgstr "سياسة الاشتراكات"
 
 #. TRANS: Dropdown field option for following policy.
 msgid "Let anyone follow me"
-msgstr "السماح لأي شخص بمتابعتي"
+msgstr "اسمح لأي شخص بمتابعتي"
 
 #. TRANS: Dropdown field option for following policy.
 msgid "Ask me first"
@@ -4084,11 +4153,11 @@ msgstr "اسألني أولا"
 
 #. TRANS: Dropdown field title on group edit form.
 msgid "Whether other users need your permission to follow your updates."
-msgstr "حاجة الناس إلى إذنك ليتابعوا مستجداتك."
+msgstr "هل يحتاج الناس إلى إذنك ليتابعوا مستجداتك؟"
 
 #. TRANS: Checkbox label in profile settings.
 msgid "Make updates visible only to my followers"
-msgstr "اجعل المستجدات تظهر فقط لمتابعي"
+msgstr "لا تجعل إشعاراتي تظهر إلا لمتابعيّ"
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
@@ -4222,49 +4291,6 @@ msgstr ""
 "هنا %%site.name%%، خدمة [التدوين المُصغّر](http://en.wikipedia.org/wiki/Micro-"
 "blogging) المبنية على البرنامج الحر [ستاتس نت](http://status.net/)."
 
-#. TRANS: Title for page with public list cloud.
-msgid "Public list cloud"
-msgstr "سحابة اللائحات العمومية"
-
-#. TRANS: Page notice for page with public list cloud.
-#. TRANS: %s is a StatusNet sitename.
-#, php-format
-msgid "These are largest lists on %s"
-msgstr "هذه هي أكبر اللائحات على %s"
-
-#. TRANS: Empty list message on page with public list cloud.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, php-format
-msgid "No one has [listed](%%doc.tags%%) anyone yet."
-msgstr "لم [يدرج](%%doc.tags%%) أحد أحدًا إلى الآن."
-
-#. TRANS: Additional empty list message on page with public list cloud for logged in users.
-msgid "Be the first to list someone!"
-msgstr "كن الأول من يشترك بلائحة أحد ما !"
-
-#. TRANS: Additional empty list message on page with public list cloud for anonymous users.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, php-format
-msgid ""
-"Why not [register an account](%%action.register%%) and be the first to list "
-"someone!"
-msgstr "لم لا [تسجل حسابا](%%action.register%%) وتكون أول من يدرج شخصا!"
-
-#. TRANS: DT element on on page with public list cloud.
-msgid "List cloud"
-msgstr "سحابة اللائحات"
-
-#. TRANS: Link title for number of listed people. %d is the number of listed people.
-#, php-format
-msgid "1 person listed"
-msgid_plural "%d people listed"
-msgstr[0] "لا أحد مدرج"
-msgstr[1] "شخص واحد مدرج"
-msgstr[2] "شخصان مدرجان"
-msgstr[3] "%d أشخاص مدرجون"
-msgstr[4] "%d شخصًا مدرجًا"
-msgstr[5] "%d شخص مدرج"
-
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
 #, php-format
 msgid "%s updates from everyone."
@@ -4309,7 +4335,7 @@ msgstr "أنت والج بالفعل!"
 
 #. TRANS: Client error displayed when password recovery code is not correct.
 msgid "No such recovery code."
-msgstr "لا رمز استعادة كهذا."
+msgstr "رمز الاستعادة هذا غير موجود."
 
 #. TRANS: Client error displayed when no proper password recovery code was submitted.
 msgid "Not a recovery code."
@@ -4995,7 +5021,7 @@ msgid "FOAF for %s group"
 msgstr ""
 
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: %%%%action.register%%%% is the URL for registration, %%%%doc.help%%%% is a URL to help.
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
 #, php-format
@@ -5013,9 +5039,9 @@ msgstr ""
 "أخرى عديدة! ([اقرأ المزيد](%%%%doc.help%%%%))"
 
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept no new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
@@ -5028,7 +5054,7 @@ msgstr ""
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
 msgid "No such message."
-msgstr "لا رسالة كهذه."
+msgstr "الرسالة المطلوبة غير موجودة."
 
 #. TRANS: Client error displayed requesting a single direct message the requesting user was not a party in.
 msgid "Only the sender and recipient may read this message."
@@ -5146,11 +5172,6 @@ msgstr "اعرض الكل"
 msgid "Subscribers"
 msgstr "المشتركون"
 
-#. TRANS: Link for more "People following tag x"
-#. TRANS: if there are more than the mini list's maximum.
-msgid "All subscribers"
-msgstr "جميع المشتركين"
-
 #. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag.
 #, php-format
@@ -5245,7 +5266,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a timeline if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
@@ -5753,13 +5774,12 @@ msgstr "هؤلاء الأشخاص الذي يستمع %s إليهم."
 #. TRANS: This message contains Markdown URLs. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
 "people you know. Try [people search](%%action.peoplesearch%%), look for "
 "members in groups you're interested in and in our [featured users](%%action."
-"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
+"featured%%)."
-"automatically subscribe to people you already follow there."
 msgstr ""
 "أنت لا تستمع الآن لإشعارات أحد. جرب الاشتراك بأناس تعرفهم. حاول أن [تبحث عن "
 "الأشخاص](%%action.peoplesearch%%) وابحث في أعضاء مجموعات أنت مهتم بها وفي "
@@ -5877,7 +5897,7 @@ msgstr "استخدم هذا النموذج لتدرج المشتركين بك أ
 
 #. TRANS: Client error when requesting a tag feed for a non-existing tag.
 msgid "No such tag."
-msgstr "لا وسم كهذا."
+msgstr "لا يوجد وسم بهذا الاسم."
 
 #. TRANS: Client error displayed when trying to unblock a non-blocked user.
 msgid "You haven't blocked that user."
@@ -6091,6 +6111,7 @@ msgid "License"
 msgstr "الرخصة"
 
 #. TRANS: Content part of StatusNet version page.
+#, fuzzy
 msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
 "the terms of the GNU Affero General Public License as published by the Free "
@@ -6160,16 +6181,30 @@ msgstr "تغذرت معالجة المسار '%s'"
 msgid "Robin thinks something is impossible."
 msgstr ""
 
+#. TRANS: Message used to be inserted as %2$s in  the text "No file may
+#. TRANS: be larger than %1$d byte and the file you sent was %2$s.".
+#. TRANS: %1$d is the number of bytes of an uploaded file.
+#, php-format
+msgid "%1$d byte"
+msgid_plural "%1$d bytes"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
 #. TRANS: Message given if an upload is larger than the configured maximum.
-#. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
+#. TRANS: %1$d (used for plural) is the byte limit for uploads,
-#. TRANS: %1$s is used for plural.
+#. TRANS: %2$s is the proper form of "n bytes". This is the only ways to have
+#. TRANS: gettext support multiple plurals in the same message, unfortunately...
 #, php-format
 msgid ""
-"No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
+"No file may be larger than %1$d byte and the file you sent was %2$s. Try to "
-"Try to upload a smaller version."
+"upload a smaller version."
 msgid_plural ""
-"No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
+"No file may be larger than %1$d bytes and the file you sent was %2$s. Try to "
-"Try to upload a smaller version."
+"upload a smaller version."
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
@@ -6716,9 +6751,9 @@ msgid "No content for notice %s."
 msgstr "ابحث عن محتويات في الإشعارات"
 
 #. TRANS: Exception thrown if a non-existing user is provided. %s is a user ID.
-#, fuzzy, php-format
+#, php-format
 msgid "No such user \"%s\"."
-msgstr "لا مستخدم كهذا."
+msgstr "المستخدم \"%s\" غير موجود."
 
 #. TRANS: Client exception thrown when post to collection fails with a 400 status.
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
@@ -6762,19 +6797,10 @@ msgid "saveSettings() not implemented."
 msgstr "الأمر لم يُجهزّ بعد."
 
 #. TRANS: Header in administrator navigation panel.
-#. TRANS: Header in settings navigation panel.
 msgctxt "HEADER"
 msgid "Home"
 msgstr "الرئيسية"
 
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in personal group navigation menu.
-#. TRANS: Menu item in settings navigation panel.
-msgctxt "MENU"
-msgid "Home"
-msgstr "الرئيسية"
-
 #. TRANS: Header in administrator navigation panel.
 msgctxt "HEADER"
 msgid "Admin"
@@ -7614,13 +7640,6 @@ msgctxt "MENU"
 msgid "Public"
 msgstr "العموم"
 
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in search group navigation panel.
-#. TRANS: Menu item in local navigation menu.
-msgctxt "MENU"
-msgid "Groups"
-msgstr "مجموعات"
-
 #. TRANS: Menu item in default local navigation panel.
 #. TRANS: Menu item title in local navigation menu.
 msgctxt "MENU"
@@ -7846,6 +7865,11 @@ msgstr "شاهد الكل"
 msgid "See all groups you belong to."
 msgstr "شاهد كل المجموعات التي تنتمي إليها."
 
+#. TRANS: Menu item title in personal group navigation menu.
+#. TRANS: %s is a username.
+msgid "Back to top"
+msgstr ""
+
 #. TRANS: Client exception 406
 msgid "This page is not available in a media type you accept"
 msgstr ""
@@ -8307,6 +8331,10 @@ msgstr ""
 
 #. TRANS: Subject of group join notification e-mail.
 #. TRANS: %1$s is the joining user's nickname, %2$s is the group name, and %3$s is the StatusNet sitename.
+#, fuzzy, php-format
+msgid "%1$s has joined your group %2$s on %3$s"
+msgstr "انضم %1$s للمجموعة %2$s على %3$s."
+
 #. TRANS: Main body of group join notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
 #. TRANS: %4$s is a block of profile info about the subscriber.
@@ -8601,9 +8629,8 @@ msgstr "في السياق"
 msgid "Repeated by"
 msgstr "كرره"
 
-#, fuzzy
 msgid " "
-msgstr " و "
+msgstr " "
 
 #. TRANS: Link title in notice list item to reply to a notice.
 msgid "Reply to this notice."
@@ -9066,21 +9093,6 @@ msgstr "ابحث عن محتويات في الإشعارات"
 msgid "Find groups on this site"
 msgstr "ابحث عن مجموعات على هذا الموقع"
 
-#. TRANS: Secondary navigation menu item leading to help on StatusNet.
-msgctxt "MENU"
-msgid "Help"
-msgstr "مساعدة"
-
-#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
-msgctxt "MENU"
-msgid "About"
-msgstr "عن"
-
-#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
-msgctxt "MENU"
-msgid "FAQ"
-msgstr "الأسئلة المتكررة"
-
 #. TRANS: Secondary navigation menu item leading to Terms of Service.
 msgctxt "MENU"
 msgid "TOS"
@@ -9101,17 +9113,6 @@ msgctxt "MENU"
 msgid "Version"
 msgstr "النسخة"
 
-#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgctxt "MENU"
-msgid "Contact"
-msgstr "اتصل"
-
-#. TRANS: Secondary navigation menu item. Leads to information about embedding a timeline widget.
-msgctxt "MENU"
-msgid "Badge"
-msgstr "شارة"
-
 #. TRANS: Default title for section/sidebar widget.
 msgid "Untitled section"
 msgstr "قسم غير مُعنون"
@@ -9195,7 +9196,7 @@ msgstr "التطبيقات المخولة المرتبطة"
 #. TRANS: Menu item in settings navigation panel.
 msgctxt "MENU"
 msgid "Old school"
-msgstr ""
+msgstr "الأسلوب القديم"
 
 #. TRANS: Menu item title in settings navigation panel.
 msgid "UI tweaks for old-school users"
@@ -9425,11 +9426,11 @@ msgstr "أعجبك هذا."
 msgid "%%s and %d others like this."
 msgid_plural "%%s and %d others like this."
 msgstr[0] ""
-msgstr[1] "%%s وشخص آخر أعجبه هذا."
+msgstr[1] "%%s وواحد آخر أعجبهم هذا الإشعار."
-msgstr[2] "%%s وشخصان آخران أعجبهما هذا."
+msgstr[2] "%%s واثنان آخران أعجبهم هذا الإشعار."
-msgstr[3] "%%s و%d أشخاص آخرين أعجبهم هذا"
+msgstr[3] "%%s و%d آخرون أعجبهم هذا الإشعار."
-msgstr[4] "%%s و%d شخصًا آخرًا أعجبه هذا"
+msgstr[4] "%%s و%d واحدًا آخر أعجبهم هذا الإشعار."
-msgstr[5] "%%s و%d شخص آخر أعجبه هذا."
+msgstr[5] "%%s و%d آخرون أعجبهم هذا الإشعار."
 
 #. TRANS: List message for favoured notices.
 #. TRANS: %%s is a list of users liking a notice.
@@ -9445,21 +9446,36 @@ msgstr[4] "أعجب %%s"
 msgstr[5] "أعجب %%s"
 
 #. TRANS: List message for notice repeated by logged in user.
+#, fuzzy
 msgctxt "REPEATLIST"
-msgid "You have repeated this notice."
+msgid "You repeated this."
 msgstr "كرّرتَ هذا الإشعار."
 
-#. TRANS: List message for repeated notices.
+#. TRANS: List message for when more than 4 people repeat something.
-#. TRANS: %d is the number of users that have repeated a notice.
+#. TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice.
+#. TRANS: Plural is decided on the total number of users liking the notice (count of %%s + %d).
 #, php-format
-msgid "One person has repeated this notice."
+msgid "%%s and %d other repeated this."
-msgid_plural "%d people have repeated this notice."
+msgid_plural "%%s and %d others repeated this."
-msgstr[0] "لم يكرر أحد هذا الإشعار"
+msgstr[0] ""
-msgstr[1] "كرّر شخص واحد هذا الإشعار"
+msgstr[1] ""
-msgstr[2] "كرّر شخصان هذا الإشعار"
+msgstr[2] ""
-msgstr[3] "كرّر %d أشخاص هذا الإشعار"
+msgstr[3] ""
-msgstr[4] "كرّر %d شخصًا هذا الإشعار"
+msgstr[4] ""
-msgstr[5] "كرّر %d شخص هذا الإشعار"
+msgstr[5] ""
+
+#. TRANS: List message for favoured notices.
+#. TRANS: %%s is a list of users liking a notice.
+#. TRANS: Plural is based on the number of of users that have favoured a notice.
+#, fuzzy, php-format
+msgid "%%s repeated this."
+msgid_plural "%%s repeated this."
+msgstr[0] "لم يعجب أحدًا"
+msgstr[1] "أعجب %%s"
+msgstr[2] "أعجب %%s"
+msgstr[3] "أعجب %%s"
+msgstr[4] "أعجب %%s"
+msgstr[5] "أعجب %%s"
 
 #. TRANS: Form legend.
 #, php-format

locale/bg/LC_MESSAGES/statusnet.po

@@ -11,17 +11,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-25 21:42+0000\n"
+"POT-Creation-Date: 2012-03-01 15:45+0000\n"
-"PO-Revision-Date: 2011-09-25 21:44:49+0000\n"
+"PO-Revision-Date: 2012-03-01 15:45:38+0000\n"
 "Language-Team: Bulgarian <https://translatewiki.net/wiki/Portal:bg>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.19alpha (r98079); Translate extension (2011-09-22)\n"
+"X-Generator: MediaWiki 1.20alpha (r112812); Translate 2012-02-26\n"
-"X-Translation-Project: translatewiki.net at https://translatewiki.net\n"
+"X-Translation-Project: translatewiki.net <https://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: 2011-09-11 15:11:17+0000\n"
+"X-POT-Import-Date: 2012-02-25 15:22:46+0000\n"
 
 #. TRANS: Database error message.
 #, php-format
@@ -204,7 +204,6 @@ msgstr "Няма такака страница."
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
-#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed trying to make a micro summary without providing a valid user.
 #. TRANS: Client error displayed trying to send a direct message to a non-existing user.
 #. TRANS: Client error displayed trying to use "one time password login" without using an existing user.
@@ -309,8 +308,6 @@ msgstr "Покани"
 #. TRANS: %s is a username.
 #. TRANS: Menu item title in personal group navigation menu.
 #. TRANS: %s is a username.
-#. TRANS: Menu item title in settings navigation panel.
-#. TRANS: %s is a username.
 #, php-format
 msgid "%s and friends"
 msgstr "%s и приятели"
@@ -1979,6 +1976,84 @@ msgstr "Добавяне към любимите"
 msgid "No such document \"%s\"."
 msgstr "Няма такава бележка."
 
+#. TRANS: Menu item in administrator navigation panel.
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in personal group navigation menu.
+#, fuzzy
+msgctxt "MENU"
+msgid "Home"
+msgstr "Лична страница"
+
+msgctxt "MENU"
+msgid "Docs"
+msgstr ""
+
+#. TRANS: Secondary navigation menu item leading to help on StatusNet.
+msgctxt "MENU"
+msgid "Help"
+msgstr "Помощ"
+
+#, fuzzy
+msgid "Getting started"
+msgstr "Настройките са запазени."
+
+#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
+#, fuzzy
+msgctxt "MENU"
+msgid "About"
+msgstr "Относно"
+
+#, fuzzy
+msgid "About this site"
+msgstr "Разблокиране на този потребител"
+
+#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
+#, fuzzy
+msgctxt "MENU"
+msgid "FAQ"
+msgstr "Въпроси"
+
+msgid "Frequently asked questions"
+msgstr ""
+
+#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+#, fuzzy
+msgctxt "MENU"
+msgid "Contact"
+msgstr "Контакт"
+
+#, fuzzy
+msgid "Contact info"
+msgstr "Контакт"
+
+#, fuzzy
+msgctxt "MENU"
+msgid "Tags"
+msgstr "Етикети"
+
+msgid "Using tags"
+msgstr ""
+
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in search group navigation panel.
+#. TRANS: Menu item in local navigation menu.
+#, fuzzy
+msgctxt "MENU"
+msgid "Groups"
+msgstr "Групи"
+
+#, fuzzy
+msgid "Using groups"
+msgstr "Групи"
+
+msgctxt "MENU"
+msgid "API"
+msgstr ""
+
+msgid "RESTful API"
+msgstr ""
+
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
 #, fuzzy
@@ -4326,47 +4401,6 @@ msgid ""
 "tool."
 msgstr ""
 
-#. TRANS: Title for page with public list cloud.
-#, fuzzy
-msgid "Public list cloud"
-msgstr "Общ поток, страница %d"
-
-#. TRANS: Page notice for page with public list cloud.
-#. TRANS: %s is a StatusNet sitename.
-#, fuzzy, php-format
-msgid "These are largest lists on %s"
-msgstr "Това са хората, които четат бележките на %s."
-
-#. TRANS: Empty list message on page with public list cloud.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, php-format
-msgid "No one has [listed](%%doc.tags%%) anyone yet."
-msgstr ""
-
-#. TRANS: Additional empty list message on page with public list cloud for logged in users.
-msgid "Be the first to list someone!"
-msgstr ""
-
-#. TRANS: Additional empty list message on page with public list cloud for anonymous users.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, php-format
-msgid ""
-"Why not [register an account](%%action.register%%) and be the first to list "
-"someone!"
-msgstr ""
-
-#. TRANS: DT element on on page with public list cloud.
-#, fuzzy
-msgid "List cloud"
-msgstr "Не е открит методът в API."
-
-#. TRANS: Link title for number of listed people. %d is the number of listed people.
-#, php-format
-msgid "1 person listed"
-msgid_plural "%d people listed"
-msgstr[0] ""
-msgstr[1] ""
-
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
 #, php-format
 msgid "%s updates from everyone."
@@ -5106,7 +5140,7 @@ msgid "FOAF for %s group"
 msgstr "Изходяща кутия за %s"
 
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: %%%%action.register%%%% is the URL for registration, %%%%doc.help%%%% is a URL to help.
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
 #, php-format
@@ -5119,7 +5153,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept no new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
 #, php-format
 msgid ""
@@ -5247,11 +5281,6 @@ msgstr ""
 msgid "Subscribers"
 msgstr "Абонати"
 
-#. TRANS: Link for more "People following tag x"
-#. TRANS: if there are more than the mini list's maximum.
-msgid "All subscribers"
-msgstr "Всички абонати"
-
 #. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag.
 #, fuzzy, php-format
@@ -5867,8 +5896,7 @@ msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
 "people you know. Try [people search](%%action.peoplesearch%%), look for "
 "members in groups you're interested in and in our [featured users](%%action."
-"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
+"featured%%)."
-"automatically subscribe to people you already follow there."
 msgstr ""
 
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user other
@@ -6285,16 +6313,26 @@ msgstr ""
 msgid "Robin thinks something is impossible."
 msgstr ""
 
+#. TRANS: Message used to be inserted as %2$s in  the text "No file may
+#. TRANS: be larger than %1$d byte and the file you sent was %2$s.".
+#. TRANS: %1$d is the number of bytes of an uploaded file.
+#, php-format
+msgid "%1$d byte"
+msgid_plural "%1$d bytes"
+msgstr[0] ""
+msgstr[1] ""
+
 #. TRANS: Message given if an upload is larger than the configured maximum.
-#. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
+#. TRANS: %1$d (used for plural) is the byte limit for uploads,
-#. TRANS: %1$s is used for plural.
+#. TRANS: %2$s is the proper form of "n bytes". This is the only ways to have
+#. TRANS: gettext support multiple plurals in the same message, unfortunately...
 #, php-format
 msgid ""
-"No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
+"No file may be larger than %1$d byte and the file you sent was %2$s. Try to "
-"Try to upload a smaller version."
+"upload a smaller version."
 msgid_plural ""
-"No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
+"No file may be larger than %1$d bytes and the file you sent was %2$s. Try to "
-"Try to upload a smaller version."
+"upload a smaller version."
 msgstr[0] ""
 msgstr[1] ""
 
@@ -6907,21 +6945,11 @@ msgid "saveSettings() not implemented."
 msgstr "Командата все още не се поддържа."
 
 #. TRANS: Header in administrator navigation panel.
-#. TRANS: Header in settings navigation panel.
 #, fuzzy
 msgctxt "HEADER"
 msgid "Home"
 msgstr "Лична страница"
 
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in personal group navigation menu.
-#. TRANS: Menu item in settings navigation panel.
-#, fuzzy
-msgctxt "MENU"
-msgid "Home"
-msgstr "Лична страница"
-
 #. TRANS: Header in administrator navigation panel.
 #, fuzzy
 msgctxt "HEADER"
@@ -7782,14 +7810,6 @@ msgctxt "MENU"
 msgid "Public"
 msgstr "Общ поток"
 
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in search group navigation panel.
-#. TRANS: Menu item in local navigation menu.
-#, fuzzy
-msgctxt "MENU"
-msgid "Groups"
-msgstr "Групи"
-
 #. TRANS: Menu item in default local navigation panel.
 #. TRANS: Menu item title in local navigation menu.
 #, fuzzy
@@ -8021,6 +8041,11 @@ msgstr ""
 msgid "See all groups you belong to."
 msgstr ""
 
+#. TRANS: Menu item title in personal group navigation menu.
+#. TRANS: %s is a username.
+msgid "Back to top"
+msgstr ""
+
 #. TRANS: Client exception 406
 msgid "This page is not available in a media type you accept"
 msgstr "Страницата не е достъпна във вида медия, който приемате"
@@ -8415,6 +8440,10 @@ msgstr ""
 
 #. TRANS: Subject of group join notification e-mail.
 #. TRANS: %1$s is the joining user's nickname, %2$s is the group name, and %3$s is the StatusNet sitename.
+#, fuzzy, php-format
+msgid "%1$s has joined your group %2$s on %3$s"
+msgstr "%1$s напусна групата %2$s"
+
 #. TRANS: Main body of group join notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
 #. TRANS: %4$s is a block of profile info about the subscriber.
@@ -9208,23 +9237,6 @@ msgstr "Търсене в съдържанието на бележките"
 msgid "Find groups on this site"
 msgstr "Търсене на групи в сайта"
 
-#. TRANS: Secondary navigation menu item leading to help on StatusNet.
-msgctxt "MENU"
-msgid "Help"
-msgstr "Помощ"
-
-#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
-#, fuzzy
-msgctxt "MENU"
-msgid "About"
-msgstr "Относно"
-
-#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
-#, fuzzy
-msgctxt "MENU"
-msgid "FAQ"
-msgstr "Въпроси"
-
 #. TRANS: Secondary navigation menu item leading to Terms of Service.
 #, fuzzy
 msgctxt "MENU"
@@ -9249,19 +9261,6 @@ msgctxt "MENU"
 msgid "Version"
 msgstr "Версия"
 
-#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-#, fuzzy
-msgctxt "MENU"
-msgid "Contact"
-msgstr "Контакт"
-
-#. TRANS: Secondary navigation menu item. Leads to information about embedding a timeline widget.
-#, fuzzy
-msgctxt "MENU"
-msgid "Badge"
-msgstr "Табелка"
-
 #. TRANS: Default title for section/sidebar widget.
 msgid "Untitled section"
 msgstr "Неозаглавен раздел"
@@ -9601,16 +9600,26 @@ msgstr[1] ""
 #. TRANS: List message for notice repeated by logged in user.
 #, fuzzy
 msgctxt "REPEATLIST"
-msgid "You have repeated this notice."
+msgid "You repeated this."
 msgstr "Вече сте повторили тази бележка."
 
-#. TRANS: List message for repeated notices.
+#. TRANS: List message for when more than 4 people repeat something.
-#. TRANS: %d is the number of users that have repeated a notice.
+#. TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice.
+#. TRANS: Plural is decided on the total number of users liking the notice (count of %%s + %d).
+#, php-format
+msgid "%%s and %d other repeated this."
+msgid_plural "%%s and %d others repeated this."
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: List message for favoured notices.
+#. TRANS: %%s is a list of users liking a notice.
+#. TRANS: Plural is based on the number of of users that have favoured a notice.
 #, fuzzy, php-format
-msgid "One person has repeated this notice."
+msgid "%%s repeated this."
-msgid_plural "%d people have repeated this notice."
+msgid_plural "%%s repeated this."
-msgstr[0] "Вече сте повторили тази бележка."
+msgstr[0] "Повторено за %s"
-msgstr[1] "Вече сте повторили тази бележка."
+msgstr[1] "Повторено за %s"
 
 #. TRANS: Form legend.
 #, fuzzy, php-format

locale/br/LC_MESSAGES/statusnet.po

@@ -12,17 +12,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-25 21:42+0000\n"
+"POT-Creation-Date: 2012-03-01 15:45+0000\n"
-"PO-Revision-Date: 2011-09-25 21:44:51+0000\n"
+"PO-Revision-Date: 2012-03-01 15:45:40+0000\n"
 "Language-Team: Breton <https://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.19alpha (r98079); Translate extension (2011-09-22)\n"
+"X-Generator: MediaWiki 1.20alpha (r112812); Translate 2012-02-26\n"
-"X-Translation-Project: translatewiki.net at https://translatewiki.net\n"
+"X-Translation-Project: translatewiki.net <https://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: 2011-09-11 15:11:17+0000\n"
+"X-POT-Import-Date: 2012-02-25 15:22:46+0000\n"
 
 #. TRANS: Database error message.
 #, php-format
@@ -133,7 +133,7 @@ msgstr "Ur gudenn 'zo bet gant ho jedaouer dalc'h. Mar plij adklaskit."
 
 #. TRANS: Error message displayed when trying to perform an action that requires a logged in user.
 msgid "Not logged in."
-msgstr "Nann-kevreet."
+msgstr "Digevreet."
 
 #. TRANS: Client error displayed trying to perform an action related to a non-existing profile.
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
@@ -204,7 +204,6 @@ msgstr "N'eus ket eus ar bajenn-se."
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
-#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed trying to make a micro summary without providing a valid user.
 #. TRANS: Client error displayed trying to send a direct message to a non-existing user.
 #. TRANS: Client error displayed trying to use "one time password login" without using an existing user.
@@ -226,15 +225,14 @@ msgid "No such user."
 msgstr "N'eus ket eus an implijer-se."
 
 #. TRANS: Title of a user's own start page.
-#, fuzzy
 msgid "Home timeline"
-msgstr "Oberezhioù %s"
+msgstr "Degemer - neudennad"
 
 #. TRANS: Title of another user's start page.
 #. TRANS: %s is the other user's name.
-#, fuzzy, php-format
+#, php-format
 msgid "%s's home timeline"
-msgstr "Oberezhioù %s"
+msgstr "Neudennad oberezhioù %s"
 
 #. TRANS: %s is user nickname.
 #. TRANS: Feed title.
@@ -314,8 +312,6 @@ msgstr "Kas pedadennoù"
 #. TRANS: %s is a username.
 #. TRANS: Menu item title in personal group navigation menu.
 #. TRANS: %s is a username.
-#. TRANS: Menu item title in settings navigation panel.
-#. TRANS: %s is a username.
 #, php-format
 msgid "%s and friends"
 msgstr "%s hag e vignoned"
@@ -764,42 +760,36 @@ msgid "You cannot delete lists that do not belong to you."
 msgstr ""
 
 #. TRANS: Client error displayed when referring to a non-list member.
-#, fuzzy
 msgid "The specified user is not a member of this list."
 msgstr "N'eo ket an implijer-mañ ezel eus ur strollad."
 
 #. TRANS: Client error displayed when trying to add members to a list without having the right to do so.
-#, fuzzy
 msgid "You are not allowed to add members to this list."
-msgstr "N'oc'h ket ezel eus ar strollad-mañ."
+msgstr "N'och ket aotreet da ouzhpennañ izili d'ar roll-mañ."
 
 #. TRANS: Client error displayed when trying to modify list members without specifying them.
-#, fuzzy
 msgid "You must specify a member."
-msgstr "Mankout a ra ar profil."
+msgstr "Rankout a rit spisaat un ezel."
 
 #. TRANS: Client error displayed when trying to remove members from a list without having the right to do so.
-#, fuzzy
 msgid "You are not allowed to remove members from this list."
-msgstr "N'oc'h ket ezel eus ar strollad-mañ."
+msgstr "N'och ket aotreet da zilemel izili deus ar roll-mañ."
 
 #. TRANS: Client error displayed when trying to remove a list member that is not part of a list.
 msgid "The user you are trying to remove from the list is not a member."
-msgstr ""
+msgstr "An implijer a glaskit dilemel n'eo ket ezel deus ar roll."
 
 #. TRANS: Client error displayed when trying to create a list without a name.
-#, fuzzy
 msgid "A list must have a name."
-msgstr "Ne c'hell ket an alias bezañ ar memes hini eget al lesanv."
+msgstr "Ur roll a rank kaout un anv."
 
 #. TRANS: Client error displayed when a membership check for a user is nagative.
 msgid "The specified user is not a subscriber of this list."
-msgstr ""
+msgstr "N'eo ket an implijer-mañ koumanantet d'ar roll."
 
 #. TRANS: Client error displayed when trying to unsubscribe from a non-subscribed list.
-#, fuzzy
 msgid "You are not subscribed to this list."
-msgstr "N'oc'h ket koumanantet d'ar profil-se."
+msgstr "N'oc'h ket koumanantet d'ar roll-mañ."
 
 #. TRANS: Client error displayed when uploading a media file has failed.
 msgid "Upload failed."
@@ -975,7 +965,7 @@ msgstr "N'eo ket skoret an hentenn HTTP."
 
 #. TRANS: Exception thrown requesting an unsupported notice output format.
 #. TRANS: %s is the requested output format.
-#, fuzzy, php-format
+#, php-format
 msgid "Unsupported format: %s."
 msgstr "Diembreget eo ar furmad : %s"
 
@@ -1602,9 +1592,8 @@ msgid "Yes"
 msgstr "Ya"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#, fuzzy
 msgid "Block this user."
-msgstr "Stankañ an implijer-mañ"
+msgstr "Stankañ an implijer-mañ."
 
 #. TRANS: Server error displayed when blocking a user fails.
 msgid "Failed to save block information."
@@ -1697,7 +1686,7 @@ msgstr "N'eo ket bet anavezet seurt ar chomlec'h %s"
 #. TRANS: Client error for an already confirmed email/jabber/sms address.
 #. TRANS: Client error for an already confirmed IM address.
 msgid "That address has already been confirmed."
-msgstr "Kadarnaet eo bet dija ar chomlec'h-mañ."
+msgstr "Kadarnaet eo bet ar chomlec'h-mañ c'hoazh."
 
 #. TRANS: Server error displayed when updating IM preferences fails.
 #. TRANS: Server error thrown on database error removing a registered IM address.
@@ -1960,6 +1949,75 @@ msgstr "Ouzhpennañ d'ar pennrolloù"
 msgid "No such document \"%s\"."
 msgstr "N'eo ket bet kavet ar restr \"%s\""
 
+#. TRANS: Menu item in administrator navigation panel.
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in personal group navigation menu.
+msgctxt "MENU"
+msgid "Home"
+msgstr "Degemer"
+
+msgctxt "MENU"
+msgid "Docs"
+msgstr "Teuliadur"
+
+#. TRANS: Secondary navigation menu item leading to help on StatusNet.
+msgctxt "MENU"
+msgid "Help"
+msgstr "Skoazell"
+
+msgid "Getting started"
+msgstr "Kregiñ ganti"
+
+#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
+msgctxt "MENU"
+msgid "About"
+msgstr "Diwar-benn"
+
+msgid "About this site"
+msgstr "Diwar-benn al lec'hienn-mañ"
+
+#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
+msgctxt "MENU"
+msgid "FAQ"
+msgstr "FAG"
+
+msgid "Frequently asked questions"
+msgstr "Foar ar Goulennoù"
+
+#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgctxt "MENU"
+msgid "Contact"
+msgstr "Darempred"
+
+#, fuzzy
+msgid "Contact info"
+msgstr "Darempred"
+
+msgctxt "MENU"
+msgid "Tags"
+msgstr "Balizennoù"
+
+msgid "Using tags"
+msgstr "Implijout balizennoù"
+
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in search group navigation panel.
+#. TRANS: Menu item in local navigation menu.
+msgctxt "MENU"
+msgid "Groups"
+msgstr "Strolladoù"
+
+msgid "Using groups"
+msgstr "Implijout strolladoù"
+
+msgctxt "MENU"
+msgid "API"
+msgstr "API"
+
+msgid "RESTful API"
+msgstr ""
+
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
 msgid "Edit application"
@@ -1985,7 +2043,6 @@ msgstr "Ret eo lakaat un anv."
 
 #. TRANS: Validation error shown when providing too long a name in the "Edit application" form.
 #. TRANS: Validation error shown when providing too long a name in the "New application" form.
-#, fuzzy
 msgid "Name is too long (maximum 255 characters)."
 msgstr "Re hir eo an anv (255 arouezenn d'ar muiañ)."
 
@@ -2014,7 +2071,6 @@ 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.
-#, fuzzy
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "Re hir eo an aozadur (255 arouezenn d'ar muiañ)."
 
@@ -2050,7 +2106,7 @@ msgstr "Rankout a reoc'h bezañ luget evit krouiñ ur strollad."
 
 #. TRANS: Form instructions for group edit form.
 msgid "Use this form to edit the group."
-msgstr "Leunit ar furmskrid-mañ evit kemmañ dibarzhioù ar strollad."
+msgstr "Implijit ar furmskrid-mañ evit kemmañ dibarzhioù ar strollad."
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
@@ -2066,20 +2122,19 @@ msgstr "Enrollet eo bet ho dibarzhioù."
 
 #. TRANS: Title for edit list page after deleting a tag.
 #. TRANS: %s is a list.
-#, fuzzy, php-format
+#, php-format
 msgid "Delete %s list"
-msgstr "Diverkañ an implijer-mañ"
+msgstr "Diverkañ ar roll %s"
 
 #. TRANS: Title for edit list page.
 #. TRANS: %s is a list.
 #. TRANS: Form legend for list edit form.
 #. TRANS: %s is a list.
-#, fuzzy, php-format
+#, php-format
 msgid "Edit list %s"
-msgstr "N'eo ket reizh ar merk-se : %s."
+msgstr "Kemmañ ar roll %s"
 
 #. TRANS: Error message displayed when trying to perform an action that requires a tagging user or ID.
-#, fuzzy
 msgid "No tagger or ID."
 msgstr "Lesanv pe ID ebet."
 
@@ -2088,19 +2143,16 @@ msgid "Not a local user."
 msgstr "N'eo ket un implijer lec'hel."
 
 #. TRANS: Client error displayed when reting to edit a tag that was not self-created.
-#, fuzzy
 msgid "You must be the creator of the tag to edit it."
-msgstr "Rankout a reer bezañ merour evit kemmañ ar strollad."
+msgstr "Rankout a reer bezañ krouer ar balizenn evit kemmañ anezhi."
 
 #. TRANS: Form instruction for edit list form.
-#, fuzzy
 msgid "Use this form to edit the list."
-msgstr "Leunit ar furmskrid-mañ evit kemmañ dibarzhioù ar strollad."
+msgstr "Implijit ar furmskrid-mañ evit kemmañ dibarzhioù ar roll."
 
 #. TRANS: Form validation error displayed if the form data for deleting a tag was incorrect.
-#, fuzzy
 msgid "Delete aborted."
-msgstr "Dilemel un ali"
+msgstr "Diverkadenn bet nullet."
 
 #. TRANS: Text in confirmation dialog for deleting a tag.
 msgid ""
@@ -4308,50 +4360,6 @@ msgstr ""
 "%%site.name%% a zo ur servij [micro-blogging](http://br.wikipedia.org/wiki/"
 "Microblog) diazezet war ar meziant frank [StatusNet](http://status.net/)."
 
-#. TRANS: Title for page with public list cloud.
-#, fuzzy
-msgid "Public list cloud"
-msgstr "Koumoulenn a merkoù foran"
-
-#. TRANS: Page notice for page with public list cloud.
-#. TRANS: %s is a StatusNet sitename.
-#, fuzzy, php-format
-msgid "These are largest lists on %s"
-msgstr "Ar merkoù ziwezhañ evit ar re vrudetañ war %s "
-
-#. TRANS: Empty list message on page with public list cloud.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, php-format
-msgid "No one has [listed](%%doc.tags%%) anyone yet."
-msgstr ""
-
-#. TRANS: Additional empty list message on page with public list cloud for logged in users.
-#, fuzzy
-msgid "Be the first to list someone!"
-msgstr "Bezit an hini gentañ oc'h embann unan !"
-
-#. TRANS: Additional empty list message on page with public list cloud for anonymous users.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, fuzzy, php-format
-msgid ""
-"Why not [register an account](%%action.register%%) and be the first to list "
-"someone!"
-msgstr ""
-"Perak ne [groufec'h ket ur gont](%%action.register%%) ha bezañ an hini "
-"gentañ da embann un dra !"
-
-#. TRANS: DT element on on page with public list cloud.
-#, fuzzy
-msgid "List cloud"
-msgstr "N'eo ket bet kavet an implijer."
-
-#. TRANS: Link title for number of listed people. %d is the number of listed people.
-#, php-format
-msgid "1 person listed"
-msgid_plural "%d people listed"
-msgstr[0] ""
-msgstr[1] ""
-
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
 #, fuzzy, php-format
 msgid "%s updates from everyone."
@@ -4394,7 +4402,7 @@ msgstr ""
 
 #. TRANS: Client error displayed trying to recover password while already logged in.
 msgid "You are already logged in!"
-msgstr "Luget oc'h dija !"
+msgstr "Kevreet oc'h c'hoazh !"
 
 #. TRANS: Client error displayed when password recovery code is not correct.
 msgid "No such recovery code."
@@ -4938,7 +4946,7 @@ msgstr[1] "Krouet gant %1$s - moned %2$s dre ziouer - %3$d implijer"
 
 #. TRANS: Header on the OAuth application page.
 msgid "Application actions"
-msgstr "Obererezhioù ar poellad"
+msgstr "Obererezhioù an arload"
 
 #. TRANS: Link text to edit application on the OAuth application page.
 #, fuzzy
@@ -5081,7 +5089,7 @@ msgid "FOAF for %s group"
 msgstr "Mignon ur mignon evit ar strollad %s"
 
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: %%%%action.register%%%% is the URL for registration, %%%%doc.help%%%% is a URL to help.
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
 #, fuzzy, php-format
@@ -5096,7 +5104,7 @@ msgstr ""
 "Microblog) diazezet war ar meziant frank [StatusNet](http://status.net/)."
 
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept no new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
 #, fuzzy, php-format
 msgid ""
@@ -5230,11 +5238,6 @@ msgstr "Diskouez pep tra"
 msgid "Subscribers"
 msgstr "Koumananterien"
 
-#. TRANS: Link for more "People following tag x"
-#. TRANS: if there are more than the mini list's maximum.
-msgid "All subscribers"
-msgstr "An holl goumananterien"
-
 #. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag.
 #, fuzzy, php-format
@@ -5854,8 +5857,7 @@ msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
 "people you know. Try [people search](%%action.peoplesearch%%), look for "
 "members in groups you're interested in and in our [featured users](%%action."
-"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
+"featured%%)."
-"automatically subscribe to people you already follow there."
 msgstr ""
 
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user other
@@ -6269,16 +6271,26 @@ msgstr ""
 msgid "Robin thinks something is impossible."
 msgstr ""
 
+#. TRANS: Message used to be inserted as %2$s in  the text "No file may
+#. TRANS: be larger than %1$d byte and the file you sent was %2$s.".
+#. TRANS: %1$d is the number of bytes of an uploaded file.
+#, php-format
+msgid "%1$d byte"
+msgid_plural "%1$d bytes"
+msgstr[0] ""
+msgstr[1] ""
+
 #. TRANS: Message given if an upload is larger than the configured maximum.
-#. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
+#. TRANS: %1$d (used for plural) is the byte limit for uploads,
-#. TRANS: %1$s is used for plural.
+#. TRANS: %2$s is the proper form of "n bytes". This is the only ways to have
+#. TRANS: gettext support multiple plurals in the same message, unfortunately...
 #, php-format
 msgid ""
-"No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
+"No file may be larger than %1$d byte and the file you sent was %2$s. Try to "
-"Try to upload a smaller version."
+"upload a smaller version."
 msgid_plural ""
-"No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
+"No file may be larger than %1$d bytes and the file you sent was %2$s. Try to "
-"Try to upload a smaller version."
+"upload a smaller version."
 msgstr[0] ""
 msgstr[1] ""
 
@@ -6869,19 +6881,10 @@ msgid "saveSettings() not implemented."
 msgstr "N'eo ket bet emplementet saveSettings()."
 
 #. TRANS: Header in administrator navigation panel.
-#. TRANS: Header in settings navigation panel.
 msgctxt "HEADER"
 msgid "Home"
 msgstr "Degemer"
 
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in personal group navigation menu.
-#. TRANS: Menu item in settings navigation panel.
-msgctxt "MENU"
-msgid "Home"
-msgstr "Degemer"
-
 #. TRANS: Header in administrator navigation panel.
 #, fuzzy
 msgctxt "HEADER"
@@ -7722,13 +7725,6 @@ msgctxt "MENU"
 msgid "Public"
 msgstr "Foran"
 
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in search group navigation panel.
-#. TRANS: Menu item in local navigation menu.
-msgctxt "MENU"
-msgid "Groups"
-msgstr "Strolladoù"
-
 #. TRANS: Menu item in default local navigation panel.
 #. TRANS: Menu item title in local navigation menu.
 msgctxt "MENU"
@@ -7956,6 +7952,11 @@ msgstr "Diskouez pep tra"
 msgid "See all groups you belong to."
 msgstr ""
 
+#. TRANS: Menu item title in personal group navigation menu.
+#. TRANS: %s is a username.
+msgid "Back to top"
+msgstr ""
+
 #. TRANS: Client exception 406
 msgid "This page is not available in a media type you accept"
 msgstr ""
@@ -8341,6 +8342,10 @@ msgstr ""
 
 #. TRANS: Subject of group join notification e-mail.
 #. TRANS: %1$s is the joining user's nickname, %2$s is the group name, and %3$s is the StatusNet sitename.
+#, fuzzy, php-format
+msgid "%1$s has joined your group %2$s on %3$s"
+msgstr "%1$s a zo bet er strollad %2$s."
+
 #. TRANS: Main body of group join notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
 #. TRANS: %4$s is a block of profile info about the subscriber.
@@ -9103,21 +9108,6 @@ msgstr "Klask alioù en danvez"
 msgid "Find groups on this site"
 msgstr "Klask strolladoù el lec'hienn-mañ"
 
-#. TRANS: Secondary navigation menu item leading to help on StatusNet.
-msgctxt "MENU"
-msgid "Help"
-msgstr "Skoazell"
-
-#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
-msgctxt "MENU"
-msgid "About"
-msgstr "Diwar-benn"
-
-#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
-msgctxt "MENU"
-msgid "FAQ"
-msgstr "FAG"
-
 #. TRANS: Secondary navigation menu item leading to Terms of Service.
 msgctxt "MENU"
 msgid "TOS"
@@ -9138,17 +9128,6 @@ msgctxt "MENU"
 msgid "Version"
 msgstr "Stumm"
 
-#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgctxt "MENU"
-msgid "Contact"
-msgstr "Darempred"
-
-#. TRANS: Secondary navigation menu item. Leads to information about embedding a timeline widget.
-msgctxt "MENU"
-msgid "Badge"
-msgstr "Badj"
-
 #. TRANS: Default title for section/sidebar widget.
 msgid "Untitled section"
 msgstr "Rann hep titl"
@@ -9473,17 +9452,28 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: List message for notice repeated by logged in user.
+#, fuzzy
 msgctxt "REPEATLIST"
-msgid "You have repeated this notice."
+msgid "You repeated this."
 msgstr "Adkemeret ho peus ar c'hemenn-mañ."
 
-#. TRANS: List message for repeated notices.
+#. TRANS: List message for when more than 4 people repeat something.
-#. TRANS: %d is the number of users that have repeated a notice.
+#. TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice.
+#. TRANS: Plural is decided on the total number of users liking the notice (count of %%s + %d).
+#, php-format
+msgid "%%s and %d other repeated this."
+msgid_plural "%%s and %d others repeated this."
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: List message for favoured notices.
+#. TRANS: %%s is a list of users liking a notice.
+#. TRANS: Plural is based on the number of of users that have favoured a notice.
 #, fuzzy, php-format
-msgid "One person has repeated this notice."
+msgid "%%s repeated this."
-msgid_plural "%d people have repeated this notice."
+msgid_plural "%%s repeated this."
-msgstr[0] "Kemenn bet adkemeret dija."
+msgstr[0] "Adkemeret evit %s"
-msgstr[1] "Kemenn bet adkemeret dija."
+msgstr[1] "Adkemeret evit %s"
 
 #. TRANS: Form legend.
 #, fuzzy, php-format

locale/ca/LC_MESSAGES/statusnet.po

@@ -16,17 +16,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-25 21:42+0000\n"
+"POT-Creation-Date: 2012-03-01 15:45+0000\n"
-"PO-Revision-Date: 2011-09-25 21:44:52+0000\n"
+"PO-Revision-Date: 2012-03-01 15:45:42+0000\n"
 "Language-Team: Catalan <https://translatewiki.net/wiki/Portal:ca>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.19alpha (r98079); Translate extension (2011-09-22)\n"
+"X-Generator: MediaWiki 1.20alpha (r112812); Translate 2012-02-26\n"
-"X-Translation-Project: translatewiki.net at https://translatewiki.net\n"
+"X-Translation-Project: translatewiki.net <https://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: 2011-09-11 15:11:17+0000\n"
+"X-POT-Import-Date: 2012-02-25 15:22:46+0000\n"
 
 #. TRANS: Database error message.
 #, php-format
@@ -219,7 +219,6 @@ msgstr "No existeix la pàgina."
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
-#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed trying to make a micro summary without providing a valid user.
 #. TRANS: Client error displayed trying to send a direct message to a non-existing user.
 #. TRANS: Client error displayed trying to use "one time password login" without using an existing user.
@@ -330,8 +329,6 @@ msgstr "Envia una invitació"
 #. TRANS: %s is a username.
 #. TRANS: Menu item title in personal group navigation menu.
 #. TRANS: %s is a username.
-#. TRANS: Menu item title in settings navigation panel.
-#. TRANS: %s is a username.
 #, php-format
 msgid "%s and friends"
 msgstr "%s i amics"
@@ -1977,6 +1974,74 @@ msgstr "Afegeix als preferits"
 msgid "No such document \"%s\"."
 msgstr "No existeix el document «%s»"
 
+#. TRANS: Menu item in administrator navigation panel.
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in personal group navigation menu.
+msgctxt "MENU"
+msgid "Home"
+msgstr "Inici"
+
+msgctxt "MENU"
+msgid "Docs"
+msgstr "Documents"
+
+#. TRANS: Secondary navigation menu item leading to help on StatusNet.
+msgctxt "MENU"
+msgid "Help"
+msgstr "Ajuda"
+
+msgid "Getting started"
+msgstr "Primers passos"
+
+#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
+msgctxt "MENU"
+msgid "About"
+msgstr "Quant a"
+
+msgid "About this site"
+msgstr "Quant a aquest lloc"
+
+#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
+msgctxt "MENU"
+msgid "FAQ"
+msgstr "Preguntes més freqüents"
+
+msgid "Frequently asked questions"
+msgstr "Preguntes més freqüents"
+
+#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgctxt "MENU"
+msgid "Contact"
+msgstr "Contacte"
+
+msgid "Contact info"
+msgstr "Informació de contacte"
+
+msgctxt "MENU"
+msgid "Tags"
+msgstr "Etiquetes"
+
+msgid "Using tags"
+msgstr "Ús de les etiquetes"
+
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in search group navigation panel.
+#. TRANS: Menu item in local navigation menu.
+msgctxt "MENU"
+msgid "Groups"
+msgstr "Grups"
+
+msgid "Using groups"
+msgstr "Ús dels grups"
+
+msgctxt "MENU"
+msgid "API"
+msgstr "API"
+
+msgid "RESTful API"
+msgstr "RESTful API"
+
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
 msgid "Edit application"
@@ -3396,13 +3461,12 @@ msgid "Not a supported data format."
 msgstr "Format de data no suportat."
 
 #. TRANS: Page title for profile settings.
-#, fuzzy
 msgid "Old school UI settings"
-msgstr "Paràmetres de missatgeria instantània"
+msgstr "Paràmetres d'interfície de la versió antiga"
 
 #. TRANS: Usage instructions for profile settings.
 msgid "If you like it \"the old way\", you can set that here."
-msgstr ""
+msgstr "Si us agrada a l'antiga, podeu definir-ho des d'aquí."
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
@@ -3410,13 +3474,13 @@ msgid "Settings saved."
 msgstr "S'ha desat la configuració."
 
 msgid "Only stream mode (no conversations) in timelines"
-msgstr ""
+msgstr "Només mode de flux (sense converses) a les línies temporals"
 
 msgid "Show conversation page as hierarchical trees"
-msgstr ""
+msgstr "Mostra la pàgina de converses com arbres jeràrquics."
 
 msgid "Show nicknames (not full names) in timelines"
-msgstr ""
+msgstr "Mostra els sobrenoms (no els noms sencers) en les línies temporals"
 
 #. TRANS: Button text to save a list.
 msgid "Save"
@@ -4292,47 +4356,6 @@ msgstr ""
 "Això és %%site.name%%, un servei de [microblogging](http://ca.wikipedia.org/"
 "wiki/Microblogging) basat en l'eina lliure [StatusNet](http://status.net/)."
 
-#. TRANS: Title for page with public list cloud.
-msgid "Public list cloud"
-msgstr "Núvol públic de llistes"
-
-#. TRANS: Page notice for page with public list cloud.
-#. TRANS: %s is a StatusNet sitename.
-#, php-format
-msgid "These are largest lists on %s"
-msgstr "Aquestes són les llistes més extenses a %s"
-
-#. TRANS: Empty list message on page with public list cloud.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, php-format
-msgid "No one has [listed](%%doc.tags%%) anyone yet."
-msgstr "Ningú ha [llistat](%%doc.tags%%) encara ningú."
-
-#. TRANS: Additional empty list message on page with public list cloud for logged in users.
-msgid "Be the first to list someone!"
-msgstr "Sigueu el primer en llistar algú!"
-
-#. TRANS: Additional empty list message on page with public list cloud for anonymous users.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, php-format
-msgid ""
-"Why not [register an account](%%action.register%%) and be the first to list "
-"someone!"
-msgstr ""
-"Per què no hi [registreu un compte](%%action.register%%) i sou el primer en "
-"llistar algú!"
-
-#. TRANS: DT element on on page with public list cloud.
-msgid "List cloud"
-msgstr "Núvol de llistes"
-
-#. TRANS: Link title for number of listed people. %d is the number of listed people.
-#, php-format
-msgid "1 person listed"
-msgid_plural "%d people listed"
-msgstr[0] "S'ha llistat 1 persona"
-msgstr[1] "S'han llistat %d persones"
-
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
 #, php-format
 msgid "%s updates from everyone."
@@ -5079,7 +5102,7 @@ msgid "FOAF for %s group"
 msgstr "Safata de sortida per %s"
 
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: %%%%action.register%%%% is the URL for registration, %%%%doc.help%%%% is a URL to help.
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
 #, php-format
@@ -5098,7 +5121,7 @@ msgstr ""
 "%))"
 
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept no new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
 #, php-format
 msgid ""
@@ -5109,8 +5132,8 @@ msgid ""
 msgstr ""
 "**%s** és un grup d'usuaris a %%%%site.name%%%%, un servei de [microblogging]"
 "(http://ca.wikipedia.org/wiki/Microblogging) basat en l'eina lliure "
-"[StatusNet](http://status.net/). Els seus membre comparteixen missatges "
+"[StatusNet](http://status.net/). Els seus membres comparteixen missatges "
-"curts sobre llur vida i interessos. "
+"curts de llurs vides i interessos."
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
 msgid "No such message."
@@ -5232,11 +5255,6 @@ msgstr "Mostra-ho tot"
 msgid "Subscribers"
 msgstr "Subscriptors"
 
-#. TRANS: Link for more "People following tag x"
-#. TRANS: if there are more than the mini list's maximum.
-msgid "All subscribers"
-msgstr "Tots els subscriptors"
-
 #. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag.
 #, php-format
@@ -5851,15 +5869,12 @@ msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
 "people you know. Try [people search](%%action.peoplesearch%%), look for "
 "members in groups you're interested in and in our [featured users](%%action."
-"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
+"featured%%)."
-"automatically subscribe to people you already follow there."
 msgstr ""
 "No esteu escoltant els avisos de ningú ara mateix, proveu de subscriure-us a "
 "gent que coneixeu. Proveu de [cercar gent](%%action.peoplesearch%%), trobar "
 "membres de grups en què esteu interessats i en els nostres [usuaris "
-"destacats](%%action.featured%%). Si sou un [usuari del Twitter](%%action."
+"destacats](%%action.featured%%)."
-"twittersettings%%), podeu subscriure-us automàticament a gent que ja seguiu "
-"allà."
 
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user other
 #. TRANS: than the logged in user that has no subscriptions. %s is the user nickname.
@@ -6199,10 +6214,10 @@ msgid ""
 "Software Foundation, either version 3 of the License, or (at your option) "
 "any later version."
 msgstr ""
-"L'StatusNet és programari lliure; podeu redistribuir-lo i/o modificar-lo "
+"L'StatusNet és programari lliure: podeu redistribuir-lo i/o modificar-lo "
 "d'acord amb els termes de la llicència GNU Affero General Public License tal "
-"i com la publica la Free Software Foundation; tant per a la versió 3 de la "
+"com la publica la Free Software Foundation; tant per a la versió 3 de la "
-"llicència, com (a la vostra discreció) per a una versió posterior. "
+"llicència, com (a la vostra discreció) per a qualsevol versió posterior."
 
 #. TRANS: Content part of StatusNet version page.
 msgid ""
@@ -6211,7 +6226,7 @@ msgid ""
 "FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License "
 "for more details."
 msgstr ""
-"Aquest programa es distribueix amb la voluntat que sigui útil, perquè sense "
+"Aquest programa es distribueix amb la voluntat que sigui útil, però sense "
 "cap mena de garantia; sense tampoc cap garantia implícita respecte a la seva "
 "comercialització o idoneïtat per a cap propòsit en particular. Consulteu la "
 "llicència GNU Affero General Public License per a més detalls."
@@ -6269,22 +6284,32 @@ msgstr "No es pot processar l'URL «%s»"
 msgid "Robin thinks something is impossible."
 msgstr "El Robin pensa que quelcom és impossible."
 
+#. TRANS: Message used to be inserted as %2$s in  the text "No file may
+#. TRANS: be larger than %1$d byte and the file you sent was %2$s.".
+#. TRANS: %1$d is the number of bytes of an uploaded file.
+#, php-format
+msgid "%1$d byte"
+msgid_plural "%1$d bytes"
+msgstr[0] "%1$d byte"
+msgstr[1] "%1$d bytes"
+
 #. TRANS: Message given if an upload is larger than the configured maximum.
-#. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
+#. TRANS: %1$d (used for plural) is the byte limit for uploads,
-#. TRANS: %1$s is used for plural.
+#. TRANS: %2$s is the proper form of "n bytes". This is the only ways to have
+#. TRANS: gettext support multiple plurals in the same message, unfortunately...
 #, php-format
 msgid ""
-"No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
+"No file may be larger than %1$d byte and the file you sent was %2$s. Try to "
-"Try to upload a smaller version."
+"upload a smaller version."
 msgid_plural ""
-"No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
+"No file may be larger than %1$d bytes and the file you sent was %2$s. Try to "
-"Try to upload a smaller version."
+"upload a smaller version."
 msgstr[0] ""
-"Cap fitxer pot ser major de %1$d byte i el fitxer que heu enviat era de %2$d "
+"Cap fitxer pot ser major de %1$d byte i el fitxer que heu enviat n'era d'%2"
-"bytes. Proveu de pujar una versió de mida menor."
+"$s. Proveu de pujar una versió de mida menor."
 msgstr[1] ""
-"Cap fitxer pot ser major de %1$d bytes i el fitxer que heu enviat era de %2"
+"Cap fitxer pot ser major de %1$d bytes i el fitxer que heu enviat n'era de %2"
-"$d bytes. Proveu de pujar una versió de mida menor."
+"$s bytes. Proveu de pujar una versió de mida menor."
 
 #. TRANS: Message given if an upload would exceed user quota.
 #. TRANS: %d (number) is the user quota in bytes and is used for plural.
@@ -6520,7 +6545,7 @@ msgid ""
 "allowed number. Try unlisting others first."
 msgstr ""
 "Ja teniu %1$d o més persones a la llista %2$s, que és el nombre màxim "
-"permès. Proveu de treure'n de la llista uns quants primer."
+"permès. Proveu de treure'n de la llista uns altres primer."
 
 #. TRANS: Exception thrown when inserting a list subscription in the database fails.
 msgid "Adding list subscription failed."
@@ -6877,19 +6902,10 @@ msgid "saveSettings() not implemented."
 msgstr "El saveSettings() no està implementat."
 
 #. TRANS: Header in administrator navigation panel.
-#. TRANS: Header in settings navigation panel.
 msgctxt "HEADER"
 msgid "Home"
 msgstr "Inici"
 
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in personal group navigation menu.
-#. TRANS: Menu item in settings navigation panel.
-msgctxt "MENU"
-msgid "Home"
-msgstr "Inici"
-
 #. TRANS: Header in administrator navigation panel.
 msgctxt "HEADER"
 msgid "Admin"
@@ -7702,13 +7718,6 @@ msgctxt "MENU"
 msgid "Public"
 msgstr "Públic"
 
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in search group navigation panel.
-#. TRANS: Menu item in local navigation menu.
-msgctxt "MENU"
-msgid "Groups"
-msgstr "Grups"
-
 #. TRANS: Menu item in default local navigation panel.
 #. TRANS: Menu item title in local navigation menu.
 msgctxt "MENU"
@@ -7931,6 +7940,11 @@ msgstr "Mostra-ho tot"
 msgid "See all groups you belong to."
 msgstr "Mostra tots els grups en què pertanyeu."
 
+#. TRANS: Menu item title in personal group navigation menu.
+#. TRANS: %s is a username.
+msgid "Back to top"
+msgstr "Torna a dalt"
+
 #. TRANS: Client exception 406
 msgid "This page is not available in a media type you accept"
 msgstr "Aquesta pàgina no està disponible en un tipus de mèdia que acceptis."
@@ -8396,6 +8410,10 @@ msgstr ""
 
 #. TRANS: Subject of group join notification e-mail.
 #. TRANS: %1$s is the joining user's nickname, %2$s is the group name, and %3$s is the StatusNet sitename.
+#, php-format
+msgid "%1$s has joined your group %2$s on %3$s"
+msgstr "%1$s s'ha unit al grup %2$s a %3$s"
+
 #. TRANS: Main body of group join notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
 #. TRANS: %4$s is a block of profile info about the subscriber.
@@ -8692,9 +8710,8 @@ msgstr "en context"
 msgid "Repeated by"
 msgstr "Repetit per"
 
-#, fuzzy
 msgid " "
-msgstr ", "
+msgstr " "
 
 #. TRANS: Link title in notice list item to reply to a notice.
 msgid "Reply to this notice."
@@ -9151,21 +9168,6 @@ msgstr "Cerca el contingut dels avisos"
 msgid "Find groups on this site"
 msgstr "Cerca grups en aquest lloc"
 
-#. TRANS: Secondary navigation menu item leading to help on StatusNet.
-msgctxt "MENU"
-msgid "Help"
-msgstr "Ajuda"
-
-#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
-msgctxt "MENU"
-msgid "About"
-msgstr "Quant a"
-
-#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
-msgctxt "MENU"
-msgid "FAQ"
-msgstr "Preguntes més freqüents"
-
 #. TRANS: Secondary navigation menu item leading to Terms of Service.
 msgctxt "MENU"
 msgid "TOS"
@@ -9186,17 +9188,6 @@ msgctxt "MENU"
 msgid "Version"
 msgstr "Versió"
 
-#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgctxt "MENU"
-msgid "Contact"
-msgstr "Contacte"
-
-#. TRANS: Secondary navigation menu item. Leads to information about embedding a timeline widget.
-msgctxt "MENU"
-msgid "Badge"
-msgstr "Insígnia"
-
 #. TRANS: Default title for section/sidebar widget.
 msgid "Untitled section"
 msgstr "Secció sense títol"
@@ -9280,11 +9271,12 @@ msgstr "Aplicacions de connexió autoritzades"
 #. TRANS: Menu item in settings navigation panel.
 msgctxt "MENU"
 msgid "Old school"
-msgstr ""
+msgstr "A l'antiga"
 
 #. TRANS: Menu item title in settings navigation panel.
 msgid "UI tweaks for old-school users"
 msgstr ""
+"Modificacions d'interfícies per als usuaris que els hi agrada a l'antiga"
 
 #. TRANS: Title of form to silence a user.
 msgctxt "TITLE"
@@ -9518,16 +9510,26 @@ msgstr[1] "A %%s els hi agrada."
 
 #. TRANS: List message for notice repeated by logged in user.
 msgctxt "REPEATLIST"
-msgid "You have repeated this notice."
+msgid "You repeated this."
-msgstr "Heu repetit l'avís."
+msgstr "Ho heu repetit."
 
-#. TRANS: List message for repeated notices.
+#. TRANS: List message for when more than 4 people repeat something.
-#. TRANS: %d is the number of users that have repeated a notice.
+#. TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice.
+#. TRANS: Plural is decided on the total number of users liking the notice (count of %%s + %d).
 #, php-format
-msgid "One person has repeated this notice."
+msgid "%%s and %d other repeated this."
-msgid_plural "%d people have repeated this notice."
+msgid_plural "%%s and %d others repeated this."
-msgstr[0] "Una persona ha repetit l'avís."
+msgstr[0] "%%s i %d altre ho han repetit."
-msgstr[1] "%d persones ha repetit l'avís."
+msgstr[1] "%%s i %d altres ho han repetit."
+
+#. TRANS: List message for favoured notices.
+#. TRANS: %%s is a list of users liking a notice.
+#. TRANS: Plural is based on the number of of users that have favoured a notice.
+#, php-format
+msgid "%%s repeated this."
+msgid_plural "%%s repeated this."
+msgstr[0] "%%s ho ha repetit."
+msgstr[1] "%%s ho han repetit."
 
 #. TRANS: Form legend.
 #, php-format

locale/cs/LC_MESSAGES/statusnet.po

@@ -14,18 +14,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-25 21:42+0000\n"
+"POT-Creation-Date: 2012-03-01 15:45+0000\n"
-"PO-Revision-Date: 2011-09-25 21:44:54+0000\n"
+"PO-Revision-Date: 2012-03-01 15:45:44+0000\n"
 "Language-Team: Czech <https://translatewiki.net/wiki/Portal:cs>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.19alpha (r98079); Translate extension (2011-09-22)\n"
+"X-Generator: MediaWiki 1.20alpha (r112812); Translate 2012-02-26\n"
-"X-Translation-Project: translatewiki.net at https://translatewiki.net\n"
+"X-Translation-Project: translatewiki.net <https://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: 2011-09-11 15:11:17+0000\n"
+"X-POT-Import-Date: 2012-02-25 15:22:46+0000\n"
 
 #. TRANS: Database error message.
 #, php-format
@@ -209,7 +209,6 @@ msgstr "Tady žádná taková stránka není."
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
-#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed trying to make a micro summary without providing a valid user.
 #. TRANS: Client error displayed trying to send a direct message to a non-existing user.
 #. TRANS: Client error displayed trying to use "one time password login" without using an existing user.
@@ -322,8 +321,6 @@ msgstr "Pozvánky"
 #. TRANS: %s is a username.
 #. TRANS: Menu item title in personal group navigation menu.
 #. TRANS: %s is a username.
-#. TRANS: Menu item title in settings navigation panel.
-#. TRANS: %s is a username.
 #, php-format
 msgid "%s and friends"
 msgstr "%s a přátelé"
@@ -2027,6 +2024,84 @@ msgstr "Přidat do oblíbených"
 msgid "No such document \"%s\"."
 msgstr "Žádný dokument \"%s\" neexistuje"
 
+#. TRANS: Menu item in administrator navigation panel.
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in personal group navigation menu.
+#, fuzzy
+msgctxt "MENU"
+msgid "Home"
+msgstr "Moje stránky"
+
+msgctxt "MENU"
+msgid "Docs"
+msgstr ""
+
+#. TRANS: Secondary navigation menu item leading to help on StatusNet.
+msgctxt "MENU"
+msgid "Help"
+msgstr "Nápověda"
+
+#, fuzzy
+msgid "Getting started"
+msgstr "Nastavení uloženo"
+
+#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
+#, fuzzy
+msgctxt "MENU"
+msgid "About"
+msgstr "O nás"
+
+#, fuzzy
+msgid "About this site"
+msgstr "Odblokovat tohoto uživatele"
+
+#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
+#, fuzzy
+msgctxt "MENU"
+msgid "FAQ"
+msgstr "FAQ"
+
+msgid "Frequently asked questions"
+msgstr ""
+
+#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+#, fuzzy
+msgctxt "MENU"
+msgid "Contact"
+msgstr "Kontakt"
+
+#, fuzzy
+msgid "Contact info"
+msgstr "Kontakt"
+
+#, fuzzy
+msgctxt "MENU"
+msgid "Tags"
+msgstr "Tagy"
+
+msgid "Using tags"
+msgstr ""
+
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in search group navigation panel.
+#. TRANS: Menu item in local navigation menu.
+#, fuzzy
+msgctxt "MENU"
+msgid "Groups"
+msgstr "Skupiny"
+
+#, fuzzy
+msgid "Using groups"
+msgstr "Skupin uživatel"
+
+msgctxt "MENU"
+msgid "API"
+msgstr ""
+
+msgid "RESTful API"
+msgstr ""
+
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
 msgid "Edit application"
@@ -4416,50 +4491,6 @@ msgstr ""
 "faq#mikroblog) služba založená na Free Software nástroji [StatusNet](http://"
 "status.net/)."
 
-#. TRANS: Title for page with public list cloud.
-#, fuzzy
-msgid "Public list cloud"
-msgstr "Veřejný tag cloud"
-
-#. TRANS: Page notice for page with public list cloud.
-#. TRANS: %s is a StatusNet sitename.
-#, fuzzy, php-format
-msgid "These are largest lists on %s"
-msgstr "Poslední nejpopulárnější značky na %s "
-
-#. TRANS: Empty list message on page with public list cloud.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, fuzzy, php-format
-msgid "No one has [listed](%%doc.tags%%) anyone yet."
-msgstr "Nikdo ještě neposlal oznámení s [tagem](%%doc.tags%%)."
-
-#. TRANS: Additional empty list message on page with public list cloud for logged in users.
-#, fuzzy
-msgid "Be the first to list someone!"
-msgstr "Pošlete něco jako první!"
-
-#. TRANS: Additional empty list message on page with public list cloud for anonymous users.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, fuzzy, php-format
-msgid ""
-"Why not [register an account](%%action.register%%) and be the first to list "
-"someone!"
-msgstr ""
-"Proč ne [zaregistrovat účet](%%action.register%%) a poslat něco jako první!"
-
-#. TRANS: DT element on on page with public list cloud.
-#, fuzzy
-msgid "List cloud"
-msgstr " API metoda nebyla nalezena."
-
-#. TRANS: Link title for number of listed people. %d is the number of listed people.
-#, php-format
-msgid "1 person listed"
-msgid_plural "%d people listed"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
 #, fuzzy, php-format
 msgid "%s updates from everyone."
@@ -5222,7 +5253,7 @@ msgid "FOAF for %s group"
 msgstr "FOAF pro skupinu %s"
 
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: %%%%action.register%%%% is the URL for registration, %%%%doc.help%%%% is a URL to help.
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
 #, php-format
@@ -5240,9 +5271,9 @@ msgstr ""
 "členem této skupiny a mnoha dalších! ([Čtěte více](%%%%doc.help%%%%))"
 
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept no new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
@@ -5375,11 +5406,6 @@ msgstr ""
 msgid "Subscribers"
 msgstr "Odběratelé"
 
-#. TRANS: Link for more "People following tag x"
-#. TRANS: if there are more than the mini list's maximum.
-msgid "All subscribers"
-msgstr "Všichni odběratelé"
-
 #. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag.
 #, fuzzy, php-format
@@ -5473,7 +5499,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a timeline if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
@@ -6007,13 +6033,12 @@ msgstr "Toto jsou lidé, jejímž sdělením %s naslouchá"
 #. TRANS: This message contains Markdown URLs. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
 "people you know. Try [people search](%%action.peoplesearch%%), look for "
 "members in groups you're interested in and in our [featured users](%%action."
-"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
+"featured%%)."
-"automatically subscribe to people you already follow there."
 msgstr ""
 "Momentálně nenasloucháte níčím oznámením, zkuste se přihlásit k lidem které "
 "znáte. Zkuste [Vyhledávání lidí](%%action.peoplesearch%%), podívejte se po "
@@ -6366,6 +6391,7 @@ msgid "License"
 msgstr "Licence"
 
 #. TRANS: Content part of StatusNet version page.
+#, fuzzy
 msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
 "the terms of the GNU Affero General Public License as published by the Free "
@@ -6378,6 +6404,7 @@ msgstr ""
 "kterékoli pozdější verze. "
 
 #. TRANS: Content part of StatusNet version page.
+#, fuzzy
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -6446,16 +6473,27 @@ msgstr "Nemůžu zpracovat URL '%s'"
 msgid "Robin thinks something is impossible."
 msgstr "Robin si myslí, že je něco nemožné."
 
+#. TRANS: Message used to be inserted as %2$s in  the text "No file may
+#. TRANS: be larger than %1$d byte and the file you sent was %2$s.".
+#. TRANS: %1$d is the number of bytes of an uploaded file.
+#, php-format
+msgid "%1$d byte"
+msgid_plural "%1$d bytes"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
 #. TRANS: Message given if an upload is larger than the configured maximum.
-#. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
+#. TRANS: %1$d (used for plural) is the byte limit for uploads,
-#. TRANS: %1$s is used for plural.
+#. TRANS: %2$s is the proper form of "n bytes". This is the only ways to have
+#. TRANS: gettext support multiple plurals in the same message, unfortunately...
 #, fuzzy, php-format
 msgid ""
-"No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
+"No file may be larger than %1$d byte and the file you sent was %2$s. Try to "
-"Try to upload a smaller version."
+"upload a smaller version."
 msgid_plural ""
-"No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
+"No file may be larger than %1$d bytes and the file you sent was %2$s. Try to "
-"Try to upload a smaller version."
+"upload a smaller version."
 msgstr[0] ""
 "Žádný soubor nesmí být větší než %1$d bajtů a soubor, který jste poslal měl %"
 "2$d bajtů. Zkuste nahrát menší verzi."
@@ -7061,21 +7099,11 @@ msgid "saveSettings() not implemented."
 msgstr "saveSettings () není implementována."
 
 #. TRANS: Header in administrator navigation panel.
-#. TRANS: Header in settings navigation panel.
 #, fuzzy
 msgctxt "HEADER"
 msgid "Home"
 msgstr "Moje stránky"
 
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in personal group navigation menu.
-#. TRANS: Menu item in settings navigation panel.
-#, fuzzy
-msgctxt "MENU"
-msgid "Home"
-msgstr "Moje stránky"
-
 #. TRANS: Header in administrator navigation panel.
 #, fuzzy
 msgctxt "HEADER"
@@ -7926,14 +7954,6 @@ msgctxt "MENU"
 msgid "Public"
 msgstr "Veřejné"
 
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in search group navigation panel.
-#. TRANS: Menu item in local navigation menu.
-#, fuzzy
-msgctxt "MENU"
-msgid "Groups"
-msgstr "Skupiny"
-
 #. TRANS: Menu item in default local navigation panel.
 #. TRANS: Menu item title in local navigation menu.
 #, fuzzy
@@ -8167,6 +8187,11 @@ msgstr ""
 msgid "See all groups you belong to."
 msgstr ""
 
+#. TRANS: Menu item title in personal group navigation menu.
+#. TRANS: %s is a username.
+msgid "Back to top"
+msgstr ""
+
 #. TRANS: Client exception 406
 msgid "This page is not available in a media type you accept"
 msgstr "Tato stránka není k dispozici v typu média která přijímáte."
@@ -8655,6 +8680,10 @@ msgstr ""
 
 #. TRANS: Subject of group join notification e-mail.
 #. TRANS: %1$s is the joining user's nickname, %2$s is the group name, and %3$s is the StatusNet sitename.
+#, fuzzy, php-format
+msgid "%1$s has joined your group %2$s on %3$s"
+msgstr "%1$s se připojil(a) ke skupině %2$s."
+
 #. TRANS: Main body of group join notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
 #. TRANS: %4$s is a block of profile info about the subscriber.
@@ -9452,23 +9481,6 @@ msgstr "Najít v obsahu oznámení"
 msgid "Find groups on this site"
 msgstr "Najít skupiny na této stránce"
 
-#. TRANS: Secondary navigation menu item leading to help on StatusNet.
-msgctxt "MENU"
-msgid "Help"
-msgstr "Nápověda"
-
-#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
-#, fuzzy
-msgctxt "MENU"
-msgid "About"
-msgstr "O nás"
-
-#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
-#, fuzzy
-msgctxt "MENU"
-msgid "FAQ"
-msgstr "FAQ"
-
 #. TRANS: Secondary navigation menu item leading to Terms of Service.
 #, fuzzy
 msgctxt "MENU"
@@ -9493,19 +9505,6 @@ msgctxt "MENU"
 msgid "Version"
 msgstr "Verze"
 
-#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-#, fuzzy
-msgctxt "MENU"
-msgid "Contact"
-msgstr "Kontakt"
-
-#. TRANS: Secondary navigation menu item. Leads to information about embedding a timeline widget.
-#, fuzzy
-msgctxt "MENU"
-msgid "Badge"
-msgstr "Odznak"
-
 #. TRANS: Default title for section/sidebar widget.
 msgid "Untitled section"
 msgstr "Oddíl bez názvu"
@@ -9852,17 +9851,28 @@ msgstr[2] ""
 #. TRANS: List message for notice repeated by logged in user.
 #, fuzzy
 msgctxt "REPEATLIST"
-msgid "You have repeated this notice."
+msgid "You repeated this."
 msgstr "Již jste zopakoval toto oznámení."
 
-#. TRANS: List message for repeated notices.
+#. TRANS: List message for when more than 4 people repeat something.
-#. TRANS: %d is the number of users that have repeated a notice.
+#. TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice.
+#. TRANS: Plural is decided on the total number of users liking the notice (count of %%s + %d).
+#, php-format
+msgid "%%s and %d other repeated this."
+msgid_plural "%%s and %d others repeated this."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#. TRANS: List message for favoured notices.
+#. TRANS: %%s is a list of users liking a notice.
+#. TRANS: Plural is based on the number of of users that have favoured a notice.
 #, fuzzy, php-format
-msgid "One person has repeated this notice."
+msgid "%%s repeated this."
-msgid_plural "%d people have repeated this notice."
+msgid_plural "%%s repeated this."
-msgstr[0] "Již jste zopakoval toto oznámení."
+msgstr[0] "Opakováno uživatelem %s"
-msgstr[1] "Již jste zopakoval toto oznámení."
+msgstr[1] "Opakováno uživatelem %s"
-msgstr[2] "Již jste zopakoval toto oznámení."
+msgstr[2] "Opakováno uživatelem %s"
 
 #. TRANS: Form legend.
 #, fuzzy, php-format

locale/en_GB/LC_MESSAGES/statusnet.po

@@ -16,18 +16,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-25 21:42+0000\n"
+"POT-Creation-Date: 2012-03-01 15:45+0000\n"
-"PO-Revision-Date: 2011-09-25 21:44:56+0000\n"
+"PO-Revision-Date: 2012-03-01 15:45:48+0000\n"
 "Language-Team: British English <https://translatewiki.net/wiki/Portal:en-"
 "gb>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.19alpha (r98079); Translate extension (2011-09-22)\n"
+"X-Generator: MediaWiki 1.20alpha (r112812); Translate 2012-02-26\n"
-"X-Translation-Project: translatewiki.net at https://translatewiki.net\n"
+"X-Translation-Project: translatewiki.net <https://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: 2011-09-11 15:11:17+0000\n"
+"X-POT-Import-Date: 2012-02-25 15:22:46+0000\n"
 
 #. TRANS: Database error message.
 #, php-format
@@ -210,7 +210,6 @@ msgstr "No such page."
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
-#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed trying to make a micro summary without providing a valid user.
 #. TRANS: Client error displayed trying to send a direct message to a non-existing user.
 #. TRANS: Client error displayed trying to use "one time password login" without using an existing user.
@@ -322,8 +321,6 @@ msgstr "Invitations"
 #. TRANS: %s is a username.
 #. TRANS: Menu item title in personal group navigation menu.
 #. TRANS: %s is a username.
-#. TRANS: Menu item title in settings navigation panel.
-#. TRANS: %s is a username.
 #, php-format
 msgid "%s and friends"
 msgstr "%s and friends"
@@ -2013,6 +2010,84 @@ msgstr "Add to favourites"
 msgid "No such document \"%s\"."
 msgstr "No such document \"%s\""
 
+#. TRANS: Menu item in administrator navigation panel.
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in personal group navigation menu.
+#, fuzzy
+msgctxt "MENU"
+msgid "Home"
+msgstr "Homepage"
+
+msgctxt "MENU"
+msgid "Docs"
+msgstr ""
+
+#. TRANS: Secondary navigation menu item leading to help on StatusNet.
+msgctxt "MENU"
+msgid "Help"
+msgstr "Help"
+
+#, fuzzy
+msgid "Getting started"
+msgstr "Settings saved."
+
+#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
+#, fuzzy
+msgctxt "MENU"
+msgid "About"
+msgstr "About"
+
+#, fuzzy
+msgid "About this site"
+msgstr "Unblock this user"
+
+#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
+#, fuzzy
+msgctxt "MENU"
+msgid "FAQ"
+msgstr "F.A.Q."
+
+msgid "Frequently asked questions"
+msgstr ""
+
+#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+#, fuzzy
+msgctxt "MENU"
+msgid "Contact"
+msgstr "Contact"
+
+#, fuzzy
+msgid "Contact info"
+msgstr "Contact"
+
+#, fuzzy
+msgctxt "MENU"
+msgid "Tags"
+msgstr "Tags"
+
+msgid "Using tags"
+msgstr ""
+
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in search group navigation panel.
+#. TRANS: Menu item in local navigation menu.
+#, fuzzy
+msgctxt "MENU"
+msgid "Groups"
+msgstr "Groups"
+
+#, fuzzy
+msgid "Using groups"
+msgstr "User groups"
+
+msgctxt "MENU"
+msgid "API"
+msgstr ""
+
+msgid "RESTful API"
+msgstr ""
+
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
 msgid "Edit application"
@@ -4381,49 +4456,6 @@ msgstr ""
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool."
 
-#. TRANS: Title for page with public list cloud.
-#, fuzzy
-msgid "Public list cloud"
-msgstr "Public tag cloud"
-
-#. TRANS: Page notice for page with public list cloud.
-#. TRANS: %s is a StatusNet sitename.
-#, fuzzy, php-format
-msgid "These are largest lists on %s"
-msgstr "These are most popular recent tags on %s "
-
-#. TRANS: Empty list message on page with public list cloud.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, php-format
-msgid "No one has [listed](%%doc.tags%%) anyone yet."
-msgstr ""
-
-#. TRANS: Additional empty list message on page with public list cloud for logged in users.
-msgid "Be the first to list someone!"
-msgstr ""
-
-#. TRANS: Additional empty list message on page with public list cloud for anonymous users.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, fuzzy, php-format
-msgid ""
-"Why not [register an account](%%action.register%%) and be the first to list "
-"someone!"
-msgstr ""
-"Why not [register an account](%%action.register%%) and be the first to post "
-"one!"
-
-#. TRANS: DT element on on page with public list cloud.
-#, fuzzy
-msgid "List cloud"
-msgstr "API method not found."
-
-#. TRANS: Link title for number of listed people. %d is the number of listed people.
-#, php-format
-msgid "1 person listed"
-msgid_plural "%d people listed"
-msgstr[0] ""
-msgstr[1] ""
-
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
 #, fuzzy, php-format
 msgid "%s updates from everyone."
@@ -5172,7 +5204,7 @@ msgid "FOAF for %s group"
 msgstr "FOAF for %s group"
 
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: %%%%action.register%%%% is the URL for registration, %%%%doc.help%%%% is a URL to help.
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
 #, php-format
@@ -5190,9 +5222,9 @@ msgstr ""
 "of this group and many more! ([Read more](%%%%doc.help%%%%))"
 
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept no new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
@@ -5325,11 +5357,6 @@ msgstr ""
 msgid "Subscribers"
 msgstr "Subscribers"
 
-#. TRANS: Link for more "People following tag x"
-#. TRANS: if there are more than the mini list's maximum.
-msgid "All subscribers"
-msgstr "All subscribers"
-
 #. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag.
 #, fuzzy, php-format
@@ -5421,7 +5448,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a timeline if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
@@ -5946,8 +5973,7 @@ msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
 "people you know. Try [people search](%%action.peoplesearch%%), look for "
 "members in groups you're interested in and in our [featured users](%%action."
-"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
+"featured%%)."
-"automatically subscribe to people you already follow there."
 msgstr ""
 
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user other
@@ -6289,6 +6315,7 @@ msgid "License"
 msgstr "License"
 
 #. TRANS: Content part of StatusNet version page.
+#, fuzzy
 msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
 "the terms of the GNU Affero General Public License as published by the Free "
@@ -6301,6 +6328,7 @@ msgstr ""
 "any later version. "
 
 #. TRANS: Content part of StatusNet version page.
+#, fuzzy
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -6368,16 +6396,26 @@ msgstr ""
 msgid "Robin thinks something is impossible."
 msgstr ""
 
+#. TRANS: Message used to be inserted as %2$s in  the text "No file may
+#. TRANS: be larger than %1$d byte and the file you sent was %2$s.".
+#. TRANS: %1$d is the number of bytes of an uploaded file.
+#, php-format
+msgid "%1$d byte"
+msgid_plural "%1$d bytes"
+msgstr[0] ""
+msgstr[1] ""
+
 #. TRANS: Message given if an upload is larger than the configured maximum.
-#. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
+#. TRANS: %1$d (used for plural) is the byte limit for uploads,
-#. TRANS: %1$s is used for plural.
+#. TRANS: %2$s is the proper form of "n bytes". This is the only ways to have
+#. TRANS: gettext support multiple plurals in the same message, unfortunately...
 #, php-format
 msgid ""
-"No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
+"No file may be larger than %1$d byte and the file you sent was %2$s. Try to "
-"Try to upload a smaller version."
+"upload a smaller version."
 msgid_plural ""
-"No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
+"No file may be larger than %1$d bytes and the file you sent was %2$s. Try to "
-"Try to upload a smaller version."
+"upload a smaller version."
 msgstr[0] ""
 msgstr[1] ""
 
@@ -6972,21 +7010,11 @@ msgid "saveSettings() not implemented."
 msgstr "saveSettings() not implemented."
 
 #. TRANS: Header in administrator navigation panel.
-#. TRANS: Header in settings navigation panel.
 #, fuzzy
 msgctxt "HEADER"
 msgid "Home"
 msgstr "Homepage"
 
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in personal group navigation menu.
-#. TRANS: Menu item in settings navigation panel.
-#, fuzzy
-msgctxt "MENU"
-msgid "Home"
-msgstr "Homepage"
-
 #. TRANS: Header in administrator navigation panel.
 #, fuzzy
 msgctxt "HEADER"
@@ -7817,14 +7845,6 @@ msgctxt "MENU"
 msgid "Public"
 msgstr "Public"
 
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in search group navigation panel.
-#. TRANS: Menu item in local navigation menu.
-#, fuzzy
-msgctxt "MENU"
-msgid "Groups"
-msgstr "Groups"
-
 #. TRANS: Menu item in default local navigation panel.
 #. TRANS: Menu item title in local navigation menu.
 #, fuzzy
@@ -8055,6 +8075,11 @@ msgstr ""
 msgid "See all groups you belong to."
 msgstr ""
 
+#. TRANS: Menu item title in personal group navigation menu.
+#. TRANS: %s is a username.
+msgid "Back to top"
+msgstr ""
+
 #. TRANS: Client exception 406
 msgid "This page is not available in a media type you accept"
 msgstr "This page is not available in a media type you accept"
@@ -8457,6 +8482,10 @@ msgstr ""
 
 #. TRANS: Subject of group join notification e-mail.
 #. TRANS: %1$s is the joining user's nickname, %2$s is the group name, and %3$s is the StatusNet sitename.
+#, fuzzy, php-format
+msgid "%1$s has joined your group %2$s on %3$s"
+msgstr "%1$s joined group %2$s"
+
 #. TRANS: Main body of group join notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
 #. TRANS: %4$s is a block of profile info about the subscriber.
@@ -9246,23 +9275,6 @@ msgstr "Find content of notices"
 msgid "Find groups on this site"
 msgstr "Find groups on this site"
 
-#. TRANS: Secondary navigation menu item leading to help on StatusNet.
-msgctxt "MENU"
-msgid "Help"
-msgstr "Help"
-
-#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
-#, fuzzy
-msgctxt "MENU"
-msgid "About"
-msgstr "About"
-
-#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
-#, fuzzy
-msgctxt "MENU"
-msgid "FAQ"
-msgstr "F.A.Q."
-
 #. TRANS: Secondary navigation menu item leading to Terms of Service.
 msgctxt "MENU"
 msgid "TOS"
@@ -9286,19 +9298,6 @@ msgctxt "MENU"
 msgid "Version"
 msgstr "Version"
 
-#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-#, fuzzy
-msgctxt "MENU"
-msgid "Contact"
-msgstr "Contact"
-
-#. TRANS: Secondary navigation menu item. Leads to information about embedding a timeline widget.
-#, fuzzy
-msgctxt "MENU"
-msgid "Badge"
-msgstr "Badge"
-
 #. TRANS: Default title for section/sidebar widget.
 msgid "Untitled section"
 msgstr "Untitled section"
@@ -9631,16 +9630,26 @@ msgstr[1] ""
 #. TRANS: List message for notice repeated by logged in user.
 #, fuzzy
 msgctxt "REPEATLIST"
-msgid "You have repeated this notice."
+msgid "You repeated this."
 msgstr "You already repeated that notice."
 
-#. TRANS: List message for repeated notices.
+#. TRANS: List message for when more than 4 people repeat something.
-#. TRANS: %d is the number of users that have repeated a notice.
+#. TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice.
+#. TRANS: Plural is decided on the total number of users liking the notice (count of %%s + %d).
+#, php-format
+msgid "%%s and %d other repeated this."
+msgid_plural "%%s and %d others repeated this."
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: List message for favoured notices.
+#. TRANS: %%s is a list of users liking a notice.
+#. TRANS: Plural is based on the number of of users that have favoured a notice.
 #, fuzzy, php-format
-msgid "One person has repeated this notice."
+msgid "%%s repeated this."
-msgid_plural "%d people have repeated this notice."
+msgid_plural "%%s repeated this."
-msgstr[0] "Already repeated that notice."
+msgstr[0] "Repeated to %s"
-msgstr[1] "Already repeated that notice."
+msgstr[1] "Repeated to %s"
 
 #. TRANS: Form legend.
 #, fuzzy, php-format

locale/eo/LC_MESSAGES/statusnet.po

@@ -17,17 +17,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-25 21:42+0000\n"
+"POT-Creation-Date: 2012-03-01 15:45+0000\n"
-"PO-Revision-Date: 2011-09-25 21:44:58+0000\n"
+"PO-Revision-Date: 2012-03-01 15:45:50+0000\n"
 "Language-Team: Esperanto <https://translatewiki.net/wiki/Portal:eo>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.19alpha (r98079); Translate extension (2011-09-22)\n"
+"X-Generator: MediaWiki 1.20alpha (r112812); Translate 2012-02-26\n"
-"X-Translation-Project: translatewiki.net at https://translatewiki.net\n"
+"X-Translation-Project: translatewiki.net <https://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: 2011-09-11 15:11:17+0000\n"
+"X-POT-Import-Date: 2012-02-25 15:22:46+0000\n"
 
 #. TRANS: Database error message.
 #, php-format
@@ -208,7 +208,6 @@ msgstr "Ne estas tiu paĝo."
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
-#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed trying to make a micro summary without providing a valid user.
 #. TRANS: Client error displayed trying to send a direct message to a non-existing user.
 #. TRANS: Client error displayed trying to use "one time password login" without using an existing user.
@@ -319,8 +318,6 @@ msgstr "Sendi inviton"
 #. TRANS: %s is a username.
 #. TRANS: Menu item title in personal group navigation menu.
 #. TRANS: %s is a username.
-#. TRANS: Menu item title in settings navigation panel.
-#. TRANS: %s is a username.
 #, php-format
 msgid "%s and friends"
 msgstr "%s kaj amikoj"
@@ -1989,6 +1986,84 @@ msgstr "Aldoni al ŝatolisto"
 msgid "No such document \"%s\"."
 msgstr "Ne estas tia dokumento \"%s\""
 
+#. TRANS: Menu item in administrator navigation panel.
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in personal group navigation menu.
+#, fuzzy
+msgctxt "MENU"
+msgid "Home"
+msgstr "Hejmpaĝo"
+
+msgctxt "MENU"
+msgid "Docs"
+msgstr ""
+
+#. TRANS: Secondary navigation menu item leading to help on StatusNet.
+msgctxt "MENU"
+msgid "Help"
+msgstr "Helpo"
+
+#, fuzzy
+msgid "Getting started"
+msgstr "Agordo konservitas."
+
+#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
+#, fuzzy
+msgctxt "MENU"
+msgid "About"
+msgstr "Enkonduko"
+
+#, fuzzy
+msgid "About this site"
+msgstr "Malbloki ĉi tiun uzanton"
+
+#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
+#, fuzzy
+msgctxt "MENU"
+msgid "FAQ"
+msgstr "Oftaj demandoj"
+
+msgid "Frequently asked questions"
+msgstr ""
+
+#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+#, fuzzy
+msgctxt "MENU"
+msgid "Contact"
+msgstr "Kontakto"
+
+#, fuzzy
+msgid "Contact info"
+msgstr "Kontakto"
+
+#, fuzzy
+msgctxt "MENU"
+msgid "Tags"
+msgstr "Markiloj"
+
+msgid "Using tags"
+msgstr ""
+
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in search group navigation panel.
+#. TRANS: Menu item in local navigation menu.
+#, fuzzy
+msgctxt "MENU"
+msgid "Groups"
+msgstr "Grupoj"
+
+#, fuzzy
+msgid "Using groups"
+msgstr "Uzantaj grupoj"
+
+msgctxt "MENU"
+msgid "API"
+msgstr ""
+
+msgid "RESTful API"
+msgstr ""
+
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
 msgid "Edit application"
@@ -4338,48 +4413,6 @@ msgstr ""
 "blogging) servo surbaze de libera servila programo [StatusNet](http://status."
 "net/)."
 
-#. TRANS: Title for page with public list cloud.
-#, fuzzy
-msgid "Public list cloud"
-msgstr "Publika markil-nubo"
-
-#. TRANS: Page notice for page with public list cloud.
-#. TRANS: %s is a StatusNet sitename.
-#, fuzzy, php-format
-msgid "These are largest lists on %s"
-msgstr "Jen la plej popularaj entikedoj lastatempaj ĉe %s "
-
-#. TRANS: Empty list message on page with public list cloud.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, fuzzy, php-format
-msgid "No one has [listed](%%doc.tags%%) anyone yet."
-msgstr "Neniu jam afiŝis avizon kun [haketentikedon](%%doc.tags%%)."
-
-#. TRANS: Additional empty list message on page with public list cloud for logged in users.
-#, fuzzy
-msgid "Be the first to list someone!"
-msgstr "Estu la unua afiŝanto!"
-
-#. TRANS: Additional empty list message on page with public list cloud for anonymous users.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, fuzzy, php-format
-msgid ""
-"Why not [register an account](%%action.register%%) and be the first to list "
-"someone!"
-msgstr "Kial ne [krei konton](%%action.register%%) kaj esti la unua afiŝanto!"
-
-#. TRANS: DT element on on page with public list cloud.
-#, fuzzy
-msgid "List cloud"
-msgstr "Listo ne ekzistas."
-
-#. TRANS: Link title for number of listed people. %d is the number of listed people.
-#, php-format
-msgid "1 person listed"
-msgid_plural "%d people listed"
-msgstr[0] ""
-msgstr[1] ""
-
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
 #, fuzzy, php-format
 msgid "%s updates from everyone."
@@ -5129,7 +5162,7 @@ msgid "FOAF for %s group"
 msgstr "Foramiko de grupo %s"
 
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: %%%%action.register%%%% is the URL for registration, %%%%doc.help%%%% is a URL to help.
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
 #, php-format
@@ -5146,9 +5179,9 @@ msgstr ""
 "parto de tiu ĉi grupo kaj multe pli! ([Pli](%%doc.help%%))"
 
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept no new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
@@ -5278,11 +5311,6 @@ msgstr ""
 msgid "Subscribers"
 msgstr "Abonantoj"
 
-#. TRANS: Link for more "People following tag x"
-#. TRANS: if there are more than the mini list's maximum.
-msgid "All subscribers"
-msgstr "Ĉiuj abonantoj"
-
 #. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag.
 #, fuzzy, php-format
@@ -5375,7 +5403,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a timeline if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
@@ -5906,13 +5934,12 @@ msgstr "Jen homoj, kies avizoj %s rigardas."
 #. TRANS: This message contains Markdown URLs. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
 "people you know. Try [people search](%%action.peoplesearch%%), look for "
 "members in groups you're interested in and in our [featured users](%%action."
-"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
+"featured%%)."
-"automatically subscribe to people you already follow there."
 msgstr ""
 "Vi ne nun abonas ies ajn avizoj. Provu aboni konatojn. Provu [homserĉi](%%"
 "action.peoplesearch%%), kontrolu grupanojn en interesaj grupoj, kaj nian "
@@ -6263,6 +6290,7 @@ msgid "License"
 msgstr "Licenco"
 
 #. TRANS: Content part of StatusNet version page.
+#, fuzzy
 msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
 "the terms of the GNU Affero General Public License as published by the Free "
@@ -6275,6 +6303,7 @@ msgstr ""
 "ĉiu posta versio taŭgas. "
 
 #. TRANS: Content part of StatusNet version page.
+#, fuzzy
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -6338,16 +6367,26 @@ msgstr "Malsukcesis trakti URL '%s'"
 msgid "Robin thinks something is impossible."
 msgstr "Robin pensas ke io neeblas."
 
+#. TRANS: Message used to be inserted as %2$s in  the text "No file may
+#. TRANS: be larger than %1$d byte and the file you sent was %2$s.".
+#. TRANS: %1$d is the number of bytes of an uploaded file.
+#, php-format
+msgid "%1$d byte"
+msgid_plural "%1$d bytes"
+msgstr[0] ""
+msgstr[1] ""
+
 #. TRANS: Message given if an upload is larger than the configured maximum.
-#. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
+#. TRANS: %1$d (used for plural) is the byte limit for uploads,
-#. TRANS: %1$s is used for plural.
+#. TRANS: %2$s is the proper form of "n bytes". This is the only ways to have
+#. TRANS: gettext support multiple plurals in the same message, unfortunately...
 #, fuzzy, php-format
 msgid ""
-"No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
+"No file may be larger than %1$d byte and the file you sent was %2$s. Try to "
-"Try to upload a smaller version."
+"upload a smaller version."
 msgid_plural ""
-"No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
+"No file may be larger than %1$d bytes and the file you sent was %2$s. Try to "
-"Try to upload a smaller version."
+"upload a smaller version."
 msgstr[0] ""
 "Grandlimo por sendota dosiero estas %1$d bajtoj, tamen tio, kion vi volis "
 "sendi grandas %2$d bajtojn. Provu per versio pli malgranda."
@@ -6947,21 +6986,11 @@ msgid "saveSettings() not implemented."
 msgstr "saveSettings() ne jam realigita."
 
 #. TRANS: Header in administrator navigation panel.
-#. TRANS: Header in settings navigation panel.
 #, fuzzy
 msgctxt "HEADER"
 msgid "Home"
 msgstr "Hejmpaĝo"
 
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in personal group navigation menu.
-#. TRANS: Menu item in settings navigation panel.
-#, fuzzy
-msgctxt "MENU"
-msgid "Home"
-msgstr "Hejmpaĝo"
-
 #. TRANS: Header in administrator navigation panel.
 #, fuzzy
 msgctxt "HEADER"
@@ -7799,14 +7828,6 @@ msgctxt "MENU"
 msgid "Public"
 msgstr "Publika"
 
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in search group navigation panel.
-#. TRANS: Menu item in local navigation menu.
-#, fuzzy
-msgctxt "MENU"
-msgid "Groups"
-msgstr "Grupoj"
-
 #. TRANS: Menu item in default local navigation panel.
 #. TRANS: Menu item title in local navigation menu.
 #, fuzzy
@@ -8036,6 +8057,11 @@ msgstr ""
 msgid "See all groups you belong to."
 msgstr ""
 
+#. TRANS: Menu item title in personal group navigation menu.
+#. TRANS: %s is a username.
+msgid "Back to top"
+msgstr ""
+
 #. TRANS: Client exception 406
 msgid "This page is not available in a media type you accept"
 msgstr "La paĝo estas ne havebla je la komunikil-tipo, kiun vi akceptas"
@@ -8516,6 +8542,10 @@ msgstr ""
 
 #. TRANS: Subject of group join notification e-mail.
 #. TRANS: %1$s is the joining user's nickname, %2$s is the group name, and %3$s is the StatusNet sitename.
+#, fuzzy, php-format
+msgid "%1$s has joined your group %2$s on %3$s"
+msgstr "%1$s aliĝis vian grupon %2$s ĉe %3$s."
+
 #. TRANS: Main body of group join notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
 #. TRANS: %4$s is a block of profile info about the subscriber.
@@ -9309,23 +9339,6 @@ msgstr "Serĉi enhavon ĉe la retejo"
 msgid "Find groups on this site"
 msgstr "Serĉi grupon ĉe la retejo"
 
-#. TRANS: Secondary navigation menu item leading to help on StatusNet.
-msgctxt "MENU"
-msgid "Help"
-msgstr "Helpo"
-
-#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
-#, fuzzy
-msgctxt "MENU"
-msgid "About"
-msgstr "Enkonduko"
-
-#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
-#, fuzzy
-msgctxt "MENU"
-msgid "FAQ"
-msgstr "Oftaj demandoj"
-
 #. TRANS: Secondary navigation menu item leading to Terms of Service.
 #, fuzzy
 msgctxt "MENU"
@@ -9350,19 +9363,6 @@ msgctxt "MENU"
 msgid "Version"
 msgstr "Versio"
 
-#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-#, fuzzy
-msgctxt "MENU"
-msgid "Contact"
-msgstr "Kontakto"
-
-#. TRANS: Secondary navigation menu item. Leads to information about embedding a timeline widget.
-#, fuzzy
-msgctxt "MENU"
-msgid "Badge"
-msgstr "Insigno"
-
 #. TRANS: Default title for section/sidebar widget.
 msgid "Untitled section"
 msgstr "Sentitola sekcio"
@@ -9704,16 +9704,26 @@ msgstr[1] ""
 #. TRANS: List message for notice repeated by logged in user.
 #, fuzzy
 msgctxt "REPEATLIST"
-msgid "You have repeated this notice."
+msgid "You repeated this."
 msgstr "La avizo jam ripetiĝis."
 
-#. TRANS: List message for repeated notices.
+#. TRANS: List message for when more than 4 people repeat something.
-#. TRANS: %d is the number of users that have repeated a notice.
+#. TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice.
+#. TRANS: Plural is decided on the total number of users liking the notice (count of %%s + %d).
+#, php-format
+msgid "%%s and %d other repeated this."
+msgid_plural "%%s and %d others repeated this."
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: List message for favoured notices.
+#. TRANS: %%s is a list of users liking a notice.
+#. TRANS: Plural is based on the number of of users that have favoured a notice.
 #, fuzzy, php-format
-msgid "One person has repeated this notice."
+msgid "%%s repeated this."
-msgid_plural "%d people have repeated this notice."
+msgid_plural "%%s repeated this."
-msgstr[0] "La avizo jam ripetiĝis."
+msgstr[0] "Ripetita al %s"
-msgstr[1] "La avizo jam ripetiĝis."
+msgstr[1] "Ripetita al %s"
 
 #. TRANS: Form legend.
 #, fuzzy, php-format

locale/fa/LC_MESSAGES/statusnet.po

@@ -19,8 +19,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-25 21:42+0000\n"
+"POT-Creation-Date: 2012-03-01 15:45+0000\n"
-"PO-Revision-Date: 2011-09-25 21:45:03+0000\n"
+"PO-Revision-Date: 2012-03-01 15:45:56+0000\n"
 "Last-Translator: Ahmad Sufi Mahmudi\n"
 "Language-Team: Persian <https://translatewiki.net/wiki/Portal:fa>\n"
 "MIME-Version: 1.0\n"
@@ -29,9 +29,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.19alpha (r98079); Translate extension (2011-09-22)\n"
+"X-Generator: MediaWiki 1.20alpha (r112812); Translate 2012-02-26\n"
-"X-Translation-Project: translatewiki.net at https://translatewiki.net\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
-"X-POT-Import-Date: 2011-09-11 15:11:17+0000\n"
+"X-POT-Import-Date: 2012-02-25 15:22:46+0000\n"
 
 #. TRANS: Database error message.
 #, php-format
@@ -220,7 +220,6 @@ msgstr "چنین صفحه‌ای وجود ندارد."
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
-#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed trying to make a micro summary without providing a valid user.
 #. TRANS: Client error displayed trying to send a direct message to a non-existing user.
 #. TRANS: Client error displayed trying to use "one time password login" without using an existing user.
@@ -331,8 +330,6 @@ msgstr "دعوت‌نامه‌ها"
 #. TRANS: %s is a username.
 #. TRANS: Menu item title in personal group navigation menu.
 #. TRANS: %s is a username.
-#. TRANS: Menu item title in settings navigation panel.
-#. TRANS: %s is a username.
 #, php-format
 msgid "%s and friends"
 msgstr "%s و دوستان"
@@ -2002,6 +1999,84 @@ msgstr "افزودن به برگزیده‌ها"
 msgid "No such document \"%s\"."
 msgstr "چنین پیوستی وجود ندارد."
 
+#. TRANS: Menu item in administrator navigation panel.
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in personal group navigation menu.
+#, fuzzy
+msgctxt "MENU"
+msgid "Home"
+msgstr "خانه"
+
+msgctxt "MENU"
+msgid "Docs"
+msgstr ""
+
+#. TRANS: Secondary navigation menu item leading to help on StatusNet.
+msgctxt "MENU"
+msgid "Help"
+msgstr "کمک"
+
+#, fuzzy
+msgid "Getting started"
+msgstr "تنظیمات ذخیره شد."
+
+#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
+#, fuzzy
+msgctxt "MENU"
+msgid "About"
+msgstr "دربارهٔ"
+
+#, fuzzy
+msgid "About this site"
+msgstr "آزاد سازی کاربر"
+
+#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
+#, fuzzy
+msgctxt "MENU"
+msgid "FAQ"
+msgstr "سوال‌های رایج"
+
+msgid "Frequently asked questions"
+msgstr ""
+
+#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+#, fuzzy
+msgctxt "MENU"
+msgid "Contact"
+msgstr "تماس"
+
+#, fuzzy
+msgid "Contact info"
+msgstr "تماس"
+
+#, fuzzy
+msgctxt "MENU"
+msgid "Tags"
+msgstr "برچسب‌ها"
+
+msgid "Using tags"
+msgstr ""
+
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in search group navigation panel.
+#. TRANS: Menu item in local navigation menu.
+#, fuzzy
+msgctxt "MENU"
+msgid "Groups"
+msgstr "گروه‌ها"
+
+#, fuzzy
+msgid "Using groups"
+msgstr "گروه‌های کاربر"
+
+msgctxt "MENU"
+msgid "API"
+msgstr ""
+
+msgid "RESTful API"
+msgstr ""
+
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
 msgid "Edit application"
@@ -4389,49 +4464,6 @@ msgstr ""
 "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/) است."
 
-#. TRANS: Title for page with public list cloud.
-#, fuzzy
-msgid "Public list cloud"
-msgstr "ابر برچسب عمومی"
-
-#. TRANS: Page notice for page with public list cloud.
-#. TRANS: %s is a StatusNet sitename.
-#, fuzzy, php-format
-msgid "These are largest lists on %s"
-msgstr "این‌ها محبوب‌ترین برچسب‌های اخیر روی %s هستند "
-
-#. TRANS: Empty list message on page with public list cloud.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, fuzzy, php-format
-msgid "No one has [listed](%%doc.tags%%) anyone yet."
-msgstr "هیچ‌کس هنوز پیامی با یک [برچسب](%%doc.tags%%) نفرستاده است."
-
-#. TRANS: Additional empty list message on page with public list cloud for logged in users.
-#, fuzzy
-msgid "Be the first to list someone!"
-msgstr "اولین نفری باشید که چیزی می‌فرستد!"
-
-#. TRANS: Additional empty list message on page with public list cloud for anonymous users.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, fuzzy, php-format
-msgid ""
-"Why not [register an account](%%action.register%%) and be the first to list "
-"someone!"
-msgstr ""
-"چرا به [باز کردن یک حساب](%%action.register%%) اقدام نمی‌کنید و اولین نفری "
-"باشید که چیزی می‌فرستد!"
-
-#. TRANS: DT element on on page with public list cloud.
-#, fuzzy
-msgid "List cloud"
-msgstr "رابط مورد نظر پیدا نشد."
-
-#. TRANS: Link title for number of listed people. %d is the number of listed people.
-#, php-format
-msgid "1 person listed"
-msgid_plural "%d people listed"
-msgstr[0] ""
-
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
 #, fuzzy, php-format
 msgid "%s updates from everyone."
@@ -5189,7 +5221,7 @@ msgid "FOAF for %s group"
 msgstr "FOAF برای گروه %s"
 
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: %%%%action.register%%%% is the URL for registration, %%%%doc.help%%%% is a URL to help.
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
 #, php-format
@@ -5208,9 +5240,9 @@ msgstr ""
 "گروه و بلکه بیش‌تر بشوید! ([بیش‌تر بخوانید](%%%%doc.help%%%%))"
 
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept no new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
@@ -5343,11 +5375,6 @@ msgstr ""
 msgid "Subscribers"
 msgstr "مشترک‌ها"
 
-#. TRANS: Link for more "People following tag x"
-#. TRANS: if there are more than the mini list's maximum.
-msgid "All subscribers"
-msgstr "تمام مشترک‌ها"
-
 #. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag.
 #, fuzzy, php-format
@@ -5442,7 +5469,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a timeline if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
@@ -5978,13 +6005,12 @@ msgstr "این‌ها کسانی هستند که %s پیام‌هایشان را
 #. TRANS: This message contains Markdown URLs. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
 "people you know. Try [people search](%%action.peoplesearch%%), look for "
 "members in groups you're interested in and in our [featured users](%%action."
-"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
+"featured%%)."
-"automatically subscribe to people you already follow there."
 msgstr ""
 "شما در حال حاضر پیام‌های هیچ‌کس را دنبال نمی‌کنید، تلاش کنید که مشترک افرادی که "
 "می‌شناسید شوید. [جست‌وجوی افراد](%%action.peoplesearch%%) را امتحان کنید، "
@@ -6336,6 +6362,7 @@ msgid "License"
 msgstr "مجوز"
 
 #. TRANS: Content part of StatusNet version page.
+#, fuzzy
 msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
 "the terms of the GNU Affero General Public License as published by the Free "
@@ -6347,6 +6374,7 @@ msgstr ""
 "هر نسخهٔ بعدی دیگری، که توسط بنیاد نرم‌افزارهای آزاد منتشر شده است، ویرایش کنید"
 
 #. TRANS: Content part of StatusNet version page.
+#, fuzzy
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -6414,16 +6442,25 @@ msgstr ""
 msgid "Robin thinks something is impossible."
 msgstr ""
 
+#. TRANS: Message used to be inserted as %2$s in  the text "No file may
+#. TRANS: be larger than %1$d byte and the file you sent was %2$s.".
+#. TRANS: %1$d is the number of bytes of an uploaded file.
+#, php-format
+msgid "%1$d byte"
+msgid_plural "%1$d bytes"
+msgstr[0] ""
+
 #. TRANS: Message given if an upload is larger than the configured maximum.
-#. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
+#. TRANS: %1$d (used for plural) is the byte limit for uploads,
-#. TRANS: %1$s is used for plural.
+#. TRANS: %2$s is the proper form of "n bytes". This is the only ways to have
+#. TRANS: gettext support multiple plurals in the same message, unfortunately...
 #, fuzzy, php-format
 msgid ""
-"No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
+"No file may be larger than %1$d byte and the file you sent was %2$s. Try to "
-"Try to upload a smaller version."
+"upload a smaller version."
 msgid_plural ""
-"No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
+"No file may be larger than %1$d bytes and the file you sent was %2$s. Try to "
-"Try to upload a smaller version."
+"upload a smaller version."
 msgstr[0] ""
 "هیچ پرونده‌ای نباید بزرگ‌تر از %d بایت باشد و پرونده‌ای که شما فرستادید %d بایت "
 "بود. بارگذاری یک نسخهٔ کوچک‌تر را امتحان کنید."
@@ -7026,21 +7063,11 @@ msgid "saveSettings() not implemented."
 msgstr "saveSettings() پیاده نشده است."
 
 #. TRANS: Header in administrator navigation panel.
-#. TRANS: Header in settings navigation panel.
 #, fuzzy
 msgctxt "HEADER"
 msgid "Home"
 msgstr "خانه"
 
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in personal group navigation menu.
-#. TRANS: Menu item in settings navigation panel.
-#, fuzzy
-msgctxt "MENU"
-msgid "Home"
-msgstr "خانه"
-
 #. TRANS: Header in administrator navigation panel.
 #, fuzzy
 msgctxt "HEADER"
@@ -7287,7 +7314,6 @@ msgstr "لغو کردن"
 
 #. TRANS: Submit button text to accept a group membership request on approve group form.
 #. TRANS: Submit button text to accept a subscription request on approve sub form.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Accept"
 msgstr "پذیرفتن"
@@ -7881,14 +7907,6 @@ msgctxt "MENU"
 msgid "Public"
 msgstr "عمومی"
 
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in search group navigation panel.
-#. TRANS: Menu item in local navigation menu.
-#, fuzzy
-msgctxt "MENU"
-msgid "Groups"
-msgstr "گروه‌ها"
-
 #. TRANS: Menu item in default local navigation panel.
 #. TRANS: Menu item title in local navigation menu.
 #, fuzzy
@@ -8118,6 +8136,11 @@ msgstr ""
 msgid "See all groups you belong to."
 msgstr ""
 
+#. TRANS: Menu item title in personal group navigation menu.
+#. TRANS: %s is a username.
+msgid "Back to top"
+msgstr ""
+
 #. TRANS: Client exception 406
 msgid "This page is not available in a media type you accept"
 msgstr "این صفحه در نوع رسانه‌ای که پذیرفته‌اید، در دسترس نیست."
@@ -8601,6 +8624,10 @@ msgstr ""
 
 #. TRANS: Subject of group join notification e-mail.
 #. TRANS: %1$s is the joining user's nickname, %2$s is the group name, and %3$s is the StatusNet sitename.
+#, fuzzy, php-format
+msgid "%1$s has joined your group %2$s on %3$s"
+msgstr "%1$s به گروه %2$s پیوست."
+
 #. TRANS: Main body of group join notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
 #. TRANS: %4$s is a block of profile info about the subscriber.
@@ -9394,23 +9421,6 @@ msgstr "پیدا کردن محتوای پیام‌ها"
 msgid "Find groups on this site"
 msgstr "پیدا کردن گروه‌ها در این وب‌گاه"
 
-#. TRANS: Secondary navigation menu item leading to help on StatusNet.
-msgctxt "MENU"
-msgid "Help"
-msgstr "کمک"
-
-#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
-#, fuzzy
-msgctxt "MENU"
-msgid "About"
-msgstr "دربارهٔ"
-
-#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
-#, fuzzy
-msgctxt "MENU"
-msgid "FAQ"
-msgstr "سوال‌های رایج"
-
 #. TRANS: Secondary navigation menu item leading to Terms of Service.
 #, fuzzy
 msgctxt "MENU"
@@ -9435,19 +9445,6 @@ msgctxt "MENU"
 msgid "Version"
 msgstr "نسخه"
 
-#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-#, fuzzy
-msgctxt "MENU"
-msgid "Contact"
-msgstr "تماس"
-
-#. TRANS: Secondary navigation menu item. Leads to information about embedding a timeline widget.
-#, fuzzy
-msgctxt "MENU"
-msgid "Badge"
-msgstr "نشان"
-
 #. TRANS: Default title for section/sidebar widget.
 msgid "Untitled section"
 msgstr "بخش بی‌نام"
@@ -9781,15 +9778,24 @@ msgstr[0] ""
 #. TRANS: List message for notice repeated by logged in user.
 #, fuzzy
 msgctxt "REPEATLIST"
-msgid "You have repeated this notice."
+msgid "You repeated this."
 msgstr "شما قبلا آن پیام را تکرار کرده‌اید."
 
-#. TRANS: List message for repeated notices.
+#. TRANS: List message for when more than 4 people repeat something.
-#. TRANS: %d is the number of users that have repeated a notice.
+#. TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice.
+#. TRANS: Plural is decided on the total number of users liking the notice (count of %%s + %d).
+#, php-format
+msgid "%%s and %d other repeated this."
+msgid_plural "%%s and %d others repeated this."
+msgstr[0] ""
+
+#. TRANS: List message for favoured notices.
+#. TRANS: %%s is a list of users liking a notice.
+#. TRANS: Plural is based on the number of of users that have favoured a notice.
 #, fuzzy, php-format
-msgid "One person has repeated this notice."
+msgid "%%s repeated this."
-msgid_plural "%d people have repeated this notice."
+msgid_plural "%%s repeated this."
-msgstr[0] "قبلا آن پیام تکرار شده است."
+msgstr[0] "تکرار شده به %s"
 
 #. TRANS: Form legend.
 #, fuzzy, php-format

locale/fi/LC_MESSAGES/statusnet.po

@@ -18,17 +18,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-25 21:42+0000\n"
+"POT-Creation-Date: 2012-03-01 15:45+0000\n"
-"PO-Revision-Date: 2011-09-25 21:45:05+0000\n"
+"PO-Revision-Date: 2012-03-01 15:45:58+0000\n"
 "Language-Team: Finnish <https://translatewiki.net/wiki/Portal:fi>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.19alpha (r98079); Translate extension (2011-09-22)\n"
+"X-Generator: MediaWiki 1.20alpha (r112812); Translate 2012-02-26\n"
-"X-Translation-Project: translatewiki.net at https://translatewiki.net\n"
+"X-Translation-Project: translatewiki.net <https://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: 2011-09-11 15:11:17+0000\n"
+"X-POT-Import-Date: 2012-02-25 15:22:46+0000\n"
 
 #. TRANS: Database error message.
 #, fuzzy, php-format
@@ -219,7 +219,6 @@ msgstr "Sivua ei ole."
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
-#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed trying to make a micro summary without providing a valid user.
 #. TRANS: Client error displayed trying to send a direct message to a non-existing user.
 #. TRANS: Client error displayed trying to use "one time password login" without using an existing user.
@@ -331,8 +330,6 @@ msgstr "Kutsu(t) lähetettiin"
 #. TRANS: %s is a username.
 #. TRANS: Menu item title in personal group navigation menu.
 #. TRANS: %s is a username.
-#. TRANS: Menu item title in settings navigation panel.
-#. TRANS: %s is a username.
 #, php-format
 msgid "%s and friends"
 msgstr "%s ja kaverit"
@@ -1974,6 +1971,82 @@ msgstr "Lisää suosikkeihin"
 msgid "No such document \"%s\"."
 msgstr "Dokumenttia ”%s” ei ole."
 
+#. TRANS: Menu item in administrator navigation panel.
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in personal group navigation menu.
+msgctxt "MENU"
+msgid "Home"
+msgstr "Koti"
+
+msgctxt "MENU"
+msgid "Docs"
+msgstr ""
+
+#. TRANS: Secondary navigation menu item leading to help on StatusNet.
+msgctxt "MENU"
+msgid "Help"
+msgstr "Ohje"
+
+#, fuzzy
+msgid "Getting started"
+msgstr "Asetukset tallennettu."
+
+#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
+#, fuzzy
+msgctxt "MENU"
+msgid "About"
+msgstr "Tietoa"
+
+#, fuzzy
+msgid "About this site"
+msgstr "Poista esto tältä käyttäjältä"
+
+#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
+#, fuzzy
+msgctxt "MENU"
+msgid "FAQ"
+msgstr "UKK"
+
+msgid "Frequently asked questions"
+msgstr ""
+
+#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+#, fuzzy
+msgctxt "MENU"
+msgid "Contact"
+msgstr "Ota yhteyttä"
+
+#, fuzzy
+msgid "Contact info"
+msgstr "Ota yhteyttä"
+
+#, fuzzy
+msgctxt "MENU"
+msgid "Tags"
+msgstr "Tagit"
+
+msgid "Using tags"
+msgstr ""
+
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in search group navigation panel.
+#. TRANS: Menu item in local navigation menu.
+msgctxt "MENU"
+msgid "Groups"
+msgstr "Ryhmät"
+
+#, fuzzy
+msgid "Using groups"
+msgstr "Käyttäjäryhmät"
+
+msgctxt "MENU"
+msgid "API"
+msgstr ""
+
+msgid "RESTful API"
+msgstr ""
+
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
 msgid "Edit application"
@@ -3875,10 +3948,9 @@ msgstr "Tuota tagia ei ole."
 
 #. TRANS: Submit button text for tag filter form.
 #. TRANS: Submit button text on gallery action page.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Go"
-msgstr "Mene"
+msgstr "Siirry"
 
 #. TRANS: Message displayed for anonymous users on page that displays lists by a user.
 #. TRANS: This message contains Markdown links in the form [description](links).
@@ -4319,52 +4391,6 @@ msgstr ""
 "Tämä on %%site.name%%, [mikroblogaus](http://en.wikipedia.org/wiki/Micro-"
 "blogging)palvelu "
 
-#. TRANS: Title for page with public list cloud.
-#, fuzzy
-msgid "Public list cloud"
-msgstr "Julkinen tagipilvi"
-
-#. TRANS: Page notice for page with public list cloud.
-#. TRANS: %s is a StatusNet sitename.
-#, fuzzy, php-format
-msgid "These are largest lists on %s"
-msgstr "Nämä ovat suosituimmat viimeaikaiset tagit %s -palvelussa"
-
-#. TRANS: Empty list message on page with public list cloud.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, fuzzy, php-format
-msgid "No one has [listed](%%doc.tags%%) anyone yet."
-msgstr ""
-"Kukaan ei ole vielä lähettänyt päivitystä tagilla [hashtag](%%doc.tags%%) "
-"vielä."
-
-#. TRANS: Additional empty list message on page with public list cloud for logged in users.
-#, fuzzy
-msgid "Be the first to list someone!"
-msgstr "Ole ensimmäinen joka lähettää päivityksen!"
-
-#. TRANS: Additional empty list message on page with public list cloud for anonymous users.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, fuzzy, php-format
-msgid ""
-"Why not [register an account](%%action.register%%) and be the first to list "
-"someone!"
-msgstr ""
-"Ole ensimmäinen joka [lähettää päivityksen tästä aiheesta](%%%%action."
-"newnotice%%%%?status_textarea=%s)!"
-
-#. TRANS: DT element on on page with public list cloud.
-#, fuzzy
-msgid "List cloud"
-msgstr "API-metodia ei löytynyt."
-
-#. TRANS: Link title for number of listed people. %d is the number of listed people.
-#, php-format
-msgid "1 person listed"
-msgid_plural "%d people listed"
-msgstr[0] ""
-msgstr[1] ""
-
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
 #, fuzzy, php-format
 msgid "%s updates from everyone."
@@ -5118,7 +5144,7 @@ msgid "FOAF for %s group"
 msgstr "Käyttäjän %s lähetetyt viestit"
 
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: %%%%action.register%%%% is the URL for registration, %%%%doc.help%%%% is a URL to help.
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
 #, php-format
@@ -5131,7 +5157,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept no new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
 #, fuzzy, php-format
 msgid ""
@@ -5266,11 +5292,6 @@ msgstr "Näytä kaikki"
 msgid "Subscribers"
 msgstr "Tilaajat"
 
-#. TRANS: Link for more "People following tag x"
-#. TRANS: if there are more than the mini list's maximum.
-msgid "All subscribers"
-msgstr "Kaikki tilaajat"
-
 #. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag.
 #, fuzzy, php-format
@@ -5884,8 +5905,7 @@ msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
 "people you know. Try [people search](%%action.peoplesearch%%), look for "
 "members in groups you're interested in and in our [featured users](%%action."
-"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
+"featured%%)."
-"automatically subscribe to people you already follow there."
 msgstr ""
 
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user other
@@ -6127,7 +6147,6 @@ msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr ""
 
 #. TRANS: Fieldset legend in user administration panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Profile"
 msgstr "Profiili"
@@ -6306,16 +6325,26 @@ msgstr ""
 msgid "Robin thinks something is impossible."
 msgstr ""
 
+#. TRANS: Message used to be inserted as %2$s in  the text "No file may
+#. TRANS: be larger than %1$d byte and the file you sent was %2$s.".
+#. TRANS: %1$d is the number of bytes of an uploaded file.
+#, php-format
+msgid "%1$d byte"
+msgid_plural "%1$d bytes"
+msgstr[0] ""
+msgstr[1] ""
+
 #. TRANS: Message given if an upload is larger than the configured maximum.
-#. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
+#. TRANS: %1$d (used for plural) is the byte limit for uploads,
-#. TRANS: %1$s is used for plural.
+#. TRANS: %2$s is the proper form of "n bytes". This is the only ways to have
+#. TRANS: gettext support multiple plurals in the same message, unfortunately...
 #, php-format
 msgid ""
-"No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
+"No file may be larger than %1$d byte and the file you sent was %2$s. Try to "
-"Try to upload a smaller version."
+"upload a smaller version."
 msgid_plural ""
-"No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
+"No file may be larger than %1$d bytes and the file you sent was %2$s. Try to "
-"Try to upload a smaller version."
+"upload a smaller version."
 msgstr[0] ""
 msgstr[1] ""
 
@@ -6916,19 +6945,10 @@ msgid "saveSettings() not implemented."
 msgstr "Komentoa saveSettings() ei ole toteutettu."
 
 #. TRANS: Header in administrator navigation panel.
-#. TRANS: Header in settings navigation panel.
 msgctxt "HEADER"
 msgid "Home"
 msgstr "Koti"
 
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in personal group navigation menu.
-#. TRANS: Menu item in settings navigation panel.
-msgctxt "MENU"
-msgid "Home"
-msgstr "Koti"
-
 #. TRANS: Header in administrator navigation panel.
 msgctxt "HEADER"
 msgid "Admin"
@@ -7770,13 +7790,6 @@ msgctxt "MENU"
 msgid "Public"
 msgstr "Julkinen"
 
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in search group navigation panel.
-#. TRANS: Menu item in local navigation menu.
-msgctxt "MENU"
-msgid "Groups"
-msgstr "Ryhmät"
-
 #. TRANS: Menu item in default local navigation panel.
 #. TRANS: Menu item title in local navigation menu.
 #, fuzzy
@@ -8006,6 +8019,11 @@ msgstr "Näytä kaikki"
 msgid "See all groups you belong to."
 msgstr ""
 
+#. TRANS: Menu item title in personal group navigation menu.
+#. TRANS: %s is a username.
+msgid "Back to top"
+msgstr ""
+
 #. TRANS: Client exception 406
 msgid "This page is not available in a media type you accept"
 msgstr "Tämä sivu ei ole saatavilla sinulle sopivassa mediatyypissä."
@@ -8407,6 +8425,10 @@ msgstr ""
 
 #. TRANS: Subject of group join notification e-mail.
 #. TRANS: %1$s is the joining user's nickname, %2$s is the group name, and %3$s is the StatusNet sitename.
+#, fuzzy, php-format
+msgid "%1$s has joined your group %2$s on %3$s"
+msgstr "%s liittyi ryhmään %s"
+
 #. TRANS: Main body of group join notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
 #. TRANS: %4$s is a block of profile info about the subscriber.
@@ -9181,23 +9203,6 @@ msgstr "Hae päivityksien sisällöstä"
 msgid "Find groups on this site"
 msgstr "Etsi ryhmiä tästä palvelusta"
 
-#. TRANS: Secondary navigation menu item leading to help on StatusNet.
-msgctxt "MENU"
-msgid "Help"
-msgstr "Ohje"
-
-#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
-#, fuzzy
-msgctxt "MENU"
-msgid "About"
-msgstr "Tietoa"
-
-#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
-#, fuzzy
-msgctxt "MENU"
-msgid "FAQ"
-msgstr "UKK"
-
 #. TRANS: Secondary navigation menu item leading to Terms of Service.
 msgctxt "MENU"
 msgid "TOS"
@@ -9221,19 +9226,6 @@ msgctxt "MENU"
 msgid "Version"
 msgstr "Omat"
 
-#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-#, fuzzy
-msgctxt "MENU"
-msgid "Contact"
-msgstr "Ota yhteyttä"
-
-#. TRANS: Secondary navigation menu item. Leads to information about embedding a timeline widget.
-#, fuzzy
-msgctxt "MENU"
-msgid "Badge"
-msgstr "Tönäise"
-
 #. TRANS: Default title for section/sidebar widget.
 msgid "Untitled section"
 msgstr "Nimetön osa"
@@ -9567,16 +9559,26 @@ msgstr[1] ""
 #. TRANS: List message for notice repeated by logged in user.
 #, fuzzy
 msgctxt "REPEATLIST"
-msgid "You have repeated this notice."
+msgid "You repeated this."
 msgstr "Sinä kuulut jo tähän ryhmään."
 
-#. TRANS: List message for repeated notices.
+#. TRANS: List message for when more than 4 people repeat something.
-#. TRANS: %d is the number of users that have repeated a notice.
+#. TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice.
+#. TRANS: Plural is decided on the total number of users liking the notice (count of %%s + %d).
+#, php-format
+msgid "%%s and %d other repeated this."
+msgid_plural "%%s and %d others repeated this."
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: List message for favoured notices.
+#. TRANS: %%s is a list of users liking a notice.
+#. TRANS: Plural is based on the number of of users that have favoured a notice.
 #, fuzzy, php-format
-msgid "One person has repeated this notice."
+msgid "%%s repeated this."
-msgid_plural "%d people have repeated this notice."
+msgid_plural "%%s repeated this."
-msgstr[0] "Tätä päivitystä ei voi poistaa."
+msgstr[0] "Toistettu käyttäjälle %s"
-msgstr[1] "Tätä päivitystä ei voi poistaa."
+msgstr[1] "Toistettu käyttäjälle %s"
 
 #. TRANS: Form legend.
 #, fuzzy, php-format

locale/fur/LC_MESSAGES/statusnet.po

@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-25 21:42+0000\n"
+"POT-Creation-Date: 2012-03-01 15:45+0000\n"
-"PO-Revision-Date: 2011-09-25 21:45:08+0000\n"
+"PO-Revision-Date: 2012-03-01 15:46:03+0000\n"
 "Language-Team: Friulian <https://translatewiki.net/wiki/Portal:fur>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-09-11 15:11:17+0000\n"
+"X-POT-Import-Date: 2012-02-25 15:22:46+0000\n"
-"X-Generator: MediaWiki 1.19alpha (r98079); Translate extension (2011-09-22)\n"
+"X-Generator: MediaWiki 1.20alpha (r112812); Translate 2012-02-26\n"
-"X-Translation-Project: translatewiki.net at https://translatewiki.net\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: fur\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -93,9 +93,8 @@ msgid "Closed"
 msgstr "Sierât"
 
 #. TRANS: Button title to save access settings in site admin panel.
-#, fuzzy
 msgid "Save access settings."
-msgstr "Salve lis impuestazions di acès"
+msgstr "Salve lis impuestazions di acès."
 
 #. TRANS: Button text to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
@@ -205,7 +204,6 @@ msgstr "La pagjine no esist."
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
-#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed trying to make a micro summary without providing a valid user.
 #. TRANS: Client error displayed trying to send a direct message to a non-existing user.
 #. TRANS: Client error displayed trying to use "one time password login" without using an existing user.
@@ -316,8 +314,6 @@ msgstr "Invide"
 #. TRANS: %s is a username.
 #. TRANS: Menu item title in personal group navigation menu.
 #. TRANS: %s is a username.
-#. TRANS: Menu item title in settings navigation panel.
-#. TRANS: %s is a username.
 #, php-format
 msgid "%s and friends"
 msgstr "%s e amîs"
@@ -426,17 +422,15 @@ msgid "Unblock user failed."
 msgstr ""
 
 #. TRANS: Client exception thrown when no conversation ID is given.
-#, fuzzy
 msgid "No conversation ID."
-msgstr "nissun id de tabaiade"
+msgstr "Nissun ID de tabaiade."
 
 #. TRANS: Client exception thrown when referring to a non-existing conversation ID (%d).
-#, fuzzy, php-format
+#, php-format
 msgid "No conversation with ID %d."
-msgstr "nissun id de tabaiade"
+msgstr "Nissune conversazion cun ID %d."
 
 #. TRANS: Title for conversion timeline.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Conversation"
 msgstr "Tabaiade"
@@ -1045,7 +1039,7 @@ msgstr "%1$s inzornaments preferîts di %2$s / %3$s."
 #. TRANS: %s is the error message.
 #, php-format
 msgid "Could not generate feed for list - %s"
-msgstr ""
+msgstr "No si à podût gjenerâ il canâl pe liste - %s"
 
 #. TRANS: Title for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
@@ -1116,7 +1110,7 @@ msgstr "Inzornaments etichetâts cun %1$s su %2$s!"
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
 msgid "Only the user can add to their own timeline."
-msgstr ""
+msgstr "Dome l'utent al pues zontâ alc ae sô ativitât."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
 msgid "Only accept AtomPub for Atom feeds."
@@ -1708,15 +1702,13 @@ msgstr "Tabaiade"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#, fuzzy
 msgid "Conversation feed (Activity Streams JSON)"
-msgstr "Canâl dai avîs par %s (Activity Streams JSON)"
+msgstr "Canâl des tabaiadis (flus di ativitât JSON)"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
-#, fuzzy
 msgid "Conversation feed (RSS 2.0)"
-msgstr "Canâl dai avîs par %s (RSS 2.0)"
+msgstr "Canâl des tabaiadis (RSS 2.0)"
 
 #. TRANS: Title for conversation page.
 #. TRANS: Title for page that shows a notice.
@@ -1779,9 +1771,8 @@ msgid "Enter \"%s\" to confirm that you want to delete your account."
 msgstr "Inserìs \"%s\" par confermâ che tu vuelis eliminâ la tô identitât."
 
 #. TRANS: Button title for user account deletion.
-#, fuzzy
 msgid "Permanently delete your account."
-msgstr "Elimine par simpri la tô identitât"
+msgstr "Elimine par simpri la tô identitât."
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
 msgid "You must be logged in to delete an application."
@@ -1932,6 +1923,74 @@ msgstr "Zonte ai preferîts"
 msgid "No such document \"%s\"."
 msgstr ""
 
+#. TRANS: Menu item in administrator navigation panel.
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in personal group navigation menu.
+msgctxt "MENU"
+msgid "Home"
+msgstr "Inizi"
+
+msgctxt "MENU"
+msgid "Docs"
+msgstr ""
+
+#. TRANS: Secondary navigation menu item leading to help on StatusNet.
+msgctxt "MENU"
+msgid "Help"
+msgstr "Jutori"
+
+msgid "Getting started"
+msgstr "Par scomençâ"
+
+#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
+msgctxt "MENU"
+msgid "About"
+msgstr "Informazions"
+
+msgid "About this site"
+msgstr "Informazions su chest sît"
+
+#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
+msgctxt "MENU"
+msgid "FAQ"
+msgstr "Domandis plui frecuentis"
+
+msgid "Frequently asked questions"
+msgstr "Domandis fatis plui spes"
+
+#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgctxt "MENU"
+msgid "Contact"
+msgstr "Contats"
+
+msgid "Contact info"
+msgstr "Informazions di contat"
+
+msgctxt "MENU"
+msgid "Tags"
+msgstr "Etichetis"
+
+msgid "Using tags"
+msgstr "Ûs des etichetis"
+
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in search group navigation panel.
+#. TRANS: Menu item in local navigation menu.
+msgctxt "MENU"
+msgid "Groups"
+msgstr "Grups"
+
+msgid "Using groups"
+msgstr "Ûs dai grups"
+
+msgctxt "MENU"
+msgid "API"
+msgstr "API"
+
+msgid "RESTful API"
+msgstr "API RESTful"
+
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
 msgid "Edit application"
@@ -1982,7 +2041,7 @@ msgstr "La URL sorzint no je valide."
 #. TRANS: Validation error shown when not providing an organisation in the "Edit application" form.
 #. TRANS: Validation error shown when not providing an organisation in the "New application" form.
 msgid "Organization is required."
-msgstr ""
+msgstr "E covente une organizazion."
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
 msgid "Organization is too long (maximum 255 characters)."
@@ -2379,7 +2438,7 @@ msgstr ""
 
 #. TRANS: Client error displayed when an invalid notice ID was given trying do display a file.
 msgid "No notice."
-msgstr ""
+msgstr "Nissun avîs."
 
 #. TRANS: Client error displayed when trying do display a file for a notice without a file attachement.
 msgid "No attachments."
@@ -2472,7 +2531,7 @@ msgstr ""
 #. TRANS: Client error displayed trying to perform an action without providing an ID.
 #. TRANS: Client error displayed trying to find a user by ID without providing an ID.
 msgid "No ID."
-msgstr ""
+msgstr "Nissun ID."
 
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
@@ -2570,8 +2629,8 @@ msgid ""
 "for one](%%%%action.groupsearch%%%%) or [start your own](%%%%action.newgroup%"
 "%%%)!"
 msgstr ""
-"I grups di %%%%site.name%%%% ti permetin cjatâ e tabaiâ cun int che e à "
+"I grups di %%%%site.name%%%% ti permetin di cjatâ e tabaiâ cun int che e à "
-"interès simîi. Daspò che tu ti unissis a un grup tu puedis mandâ messaçs a "
+"interès simii. Daspò che tu ti unissis a un grup tu puedis mandâ messaçs a "
 "ducj chei altris membris dal grup doprant la scurte \"!groupname\". No son "
 "grups che ti plasin? Prove a [cirint un](%%%%action.groupsearch%%%%) o "
 "[scomence il to](%%%%action.newgroup%%%%)!"
@@ -2642,13 +2701,13 @@ msgstr "Impuestazions IM"
 #. TRANS: Instant messaging settings page instructions.
 #. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
 #. TRANS: the order and formatting of link text and link should remain unchanged.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "You can send and receive notices through [instant messaging](%%doc.im%%). "
 "Configure your addresses and settings below."
 msgstr ""
 "Tu puedis mandâ e ricevi avîs par mieç di [messaçs istantaniis](%%doc.im%%). "
-"Configure ca sot la tô direzion e lis impuestazions."
+"Configure ca sot lis tôs direzions e lis impuestazions."
 
 #. TRANS: Message given in the IM settings if IM is not enabled on the site.
 msgid "IM is not available."
@@ -2844,7 +2903,7 @@ msgstr "Dopre chest modul par invidâ amîs e coleghis a doprâ il servizi."
 #. TRANS: the StatusNet sitename.
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
-msgstr ""
+msgstr "%1$s ti à invidât a iscriviti su %2$s"
 
 #. TRANS: Client error displayed when trying to join a group while not logged in.
 msgid "You must be logged in to join a group."
@@ -3314,13 +3373,13 @@ msgid "Not a supported data format."
 msgstr ""
 
 #. TRANS: Page title for profile settings.
-#, fuzzy
 msgid "Old school UI settings"
-msgstr "Impuestazions IM"
+msgstr "Impuestazions pe viere muse"
 
 #. TRANS: Usage instructions for profile settings.
 msgid "If you like it \"the old way\", you can set that here."
 msgstr ""
+"Se ti plaseve di plui la grafiche di une volte, tu puedis configurâle culì."
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
@@ -3649,9 +3708,8 @@ msgid "Server to direct SSL requests to."
 msgstr ""
 
 #. TRANS: Button title text to store form data in the Paths admin panel.
-#, fuzzy
 msgid "Save path settings."
-msgstr "Salve lis impuestazions dal sît."
+msgstr "Salve lis impuestazions dal percors."
 
 #. TRANS: Instructions for the "People search" page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
@@ -3778,7 +3836,7 @@ msgstr "Va"
 #. TRANS: Message displayed for anonymous users on page that displays lists by a user.
 #. TRANS: This message contains Markdown links in the form [description](links).
 #. TRANS: %s is a tagger nickname.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "These are lists created by **%s**. Lists are how you sort similar people on %"
 "%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -3812,7 +3870,7 @@ msgstr "Listis che a contegnin %1$s, pagjine %2$d"
 #. TRANS: Message displayed for anonymous users on page that displays lists for a user.
 #. TRANS: This message contains Markdown links in the form [description](links).
 #. TRANS: %s is a tagger nickname.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "These are lists for **%s**. lists are how you sort similar people on %%%%"
 "site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -3824,7 +3882,7 @@ msgstr ""
 "ordin personis similis su %%site.name%%, un servizi di [microblogging]"
 "(http://en.wikipedia.org/wiki/Micro-blogging) basât sul imprest libar "
 "[StatusNet](http://status.net/). Tu puedis tignî di voli ce che a stan "
-"fasint sotscrivinti ae ativitât de etichete."
+"fasint sotscrivinti ae ativitât de liste."
 
 #. TRANS: Message displayed on page that displays lists a user was added to when there are none.
 #. TRANS: This message contains Markdown links in the form [description](links).
@@ -4049,6 +4107,8 @@ msgstr "In ce fûs orari ti cjatistu par solit?"
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)."
 msgstr ""
+"Sotscrîf in automatic a ducj chei che si sotscrivin a mi (ideâl par non "
+"umans)."
 
 #. TRANS: Dropdown field label on profile settings, for what policies to apply when someone else tries to subscribe to your updates.
 msgid "Subscription policy"
@@ -4064,11 +4124,11 @@ msgstr "Domandimi prime"
 
 #. TRANS: Dropdown field title on group edit form.
 msgid "Whether other users need your permission to follow your updates."
-msgstr ""
+msgstr "Se i altris utents a àn di vê il permès par seguî i tiei inzornaments."
 
 #. TRANS: Checkbox label in profile settings.
 msgid "Make updates visible only to my followers"
-msgstr ""
+msgstr "Mostre i inzornaments dome a chei che mi seguissin"
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
@@ -4125,9 +4185,8 @@ msgid "Beyond the page limit (%s)."
 msgstr ""
 
 #. TRANS: Server error displayed when a public timeline cannot be retrieved.
-#, fuzzy
 msgid "Could not retrieve public timeline."
-msgstr "No si à podût creâ il preferît."
+msgstr "No si à podût recuperâ la ativitât publiche."
 
 #. TRANS: Title for all public timeline pages but the first.
 #. TRANS: %d is the page number.
@@ -4141,22 +4200,18 @@ msgid "Public timeline"
 msgstr "Ativitât publiche"
 
 #. TRANS: Link description for public timeline feed.
-#, fuzzy
 msgid "Public Timeline Feed (Activity Streams JSON)"
-msgstr "Canâl de ativitât publiche (Activity Streams JSON)"
+msgstr "Canâl de ativitât publiche (flus di ativitât JSON)"
 
 #. TRANS: Link description for public timeline feed.
-#, fuzzy
 msgid "Public Timeline Feed (RSS 1.0)"
 msgstr "Canâl de ativitât publiche (RSS 1.0)"
 
 #. TRANS: Link description for public timeline feed.
-#, fuzzy
 msgid "Public Timeline Feed (RSS 2.0)"
 msgstr "Canâl de ativitât publiche (RSS 2.0)"
 
 #. TRANS: Link description for public timeline feed.
-#, fuzzy
 msgid "Public Timeline Feed (Atom)"
 msgstr "Canâl de ativitât publiche (Atom)"
 
@@ -4203,47 +4258,6 @@ msgstr ""
 "org/wiki/Micro-blogging) basât sul imprest libar [StatusNet](http://status."
 "net/)."
 
-#. TRANS: Title for page with public list cloud.
-msgid "Public list cloud"
-msgstr "Nûl des listis publichis"
-
-#. TRANS: Page notice for page with public list cloud.
-#. TRANS: %s is a StatusNet sitename.
-#, php-format
-msgid "These are largest lists on %s"
-msgstr "Chestis a son lis listis plui popolârs su %s"
-
-#. TRANS: Empty list message on page with public list cloud.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, php-format
-msgid "No one has [listed](%%doc.tags%%) anyone yet."
-msgstr "Nissun nol à ancjemò metût altris in [listis](%%%%doc.tags%%%%)."
-
-#. TRANS: Additional empty list message on page with public list cloud for logged in users.
-msgid "Be the first to list someone!"
-msgstr "Met cualchidun in liste par prin!"
-
-#. TRANS: Additional empty list message on page with public list cloud for anonymous users.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, php-format
-msgid ""
-"Why not [register an account](%%action.register%%) and be the first to list "
-"someone!"
-msgstr ""
-"Parcè no [tu regjistris une identitât](%%%%action.register%%%%) e tu metis "
-"cualchidun in liste par prin!"
-
-#. TRANS: DT element on on page with public list cloud.
-msgid "List cloud"
-msgstr "Nûl des listis"
-
-#. TRANS: Link title for number of listed people. %d is the number of listed people.
-#, php-format
-msgid "1 person listed"
-msgid_plural "%d people listed"
-msgstr[0] "1 persone in liste"
-msgstr[1] "%d personis in liste"
-
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
 #, php-format
 msgid "%s updates from everyone."
@@ -4269,7 +4283,7 @@ msgstr ""
 #. TRANS: Message shown to a logged in user for the public tag cloud
 #. TRANS: while no tags exist yet. "One" refers to the non-existing hashtag.
 msgid "Be the first to post one!"
-msgstr ""
+msgstr "Publiche alc par prin!"
 
 #. TRANS: Message shown to a anonymous user for the public tag cloud
 #. TRANS: while no tags exist yet. "One" refers to the non-existing hashtag.
@@ -4798,7 +4812,7 @@ msgstr ""
 
 #. TRANS: Header on the OAuth application page.
 msgid "Application profile"
-msgstr ""
+msgstr "Profîl de aplicazion"
 
 #. TRANS: Information output on an OAuth application page.
 #. TRANS: %1$s is the application creator, %2$s is "read-only" or "read-write",
@@ -4954,7 +4968,7 @@ msgid "FOAF for %s group"
 msgstr "FOAF pal grup %s"
 
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: %%%%action.register%%%% is the URL for registration, %%%%doc.help%%%% is a URL to help.
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
 #, php-format
@@ -4973,7 +4987,7 @@ msgstr ""
 "help%%))"
 
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept no new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
 #, php-format
 msgid ""
@@ -5107,11 +5121,6 @@ msgstr "Mostre dut"
 msgid "Subscribers"
 msgstr "Sotscritôrs"
 
-#. TRANS: Link for more "People following tag x"
-#. TRANS: if there are more than the mini list's maximum.
-msgid "All subscribers"
-msgstr "Ducj i sotscritôrs"
-
 #. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag.
 #, php-format
@@ -5258,7 +5267,7 @@ msgstr ""
 #. TRANS: %s is the invalid language code.
 #, php-format
 msgid "Unknown language \"%s\"."
-msgstr ""
+msgstr "Lenghe \"%s\" no cognossude."
 
 #. TRANS: Client error displayed trying to save site settings with a text limit below 0.
 msgid "Minimum text limit is 0 (unlimited)."
@@ -5572,7 +5581,7 @@ msgstr ""
 
 #. TRANS: Input field label for snapshot report URL in admin panel for snapshots.
 msgid "Report URL"
-msgstr ""
+msgstr "Segnale URL"
 
 #. TRANS: Input field title for snapshot report URL in admin panel for snapshots.
 msgid "Snapshots will be sent to this URL."
@@ -5711,14 +5720,12 @@ msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
 "people you know. Try [people search](%%action.peoplesearch%%), look for "
 "members in groups you're interested in and in our [featured users](%%action."
-"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
+"featured%%)."
-"automatically subscribe to people you already follow there."
 msgstr ""
 "No tu stâs seguint i avîs di nissun par cumò, prove a sotscrivi cualchidun "
 "che tu cognossis. Prove a [cirî int](%%action.peoplesearch%%), cjalâ i "
 "membris di grups che ti interessin e i [utents plui famôs](%%action.featured%"
-"%). Se tu sês un [utent di Twitter](%%action.twittersettings%%), tu puedis "
+"%)."
-"in automatic sotscriviti ae int che tu seguivis di là."
 
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user other
 #. TRANS: than the logged in user that has no subscriptions. %s is the user nickname.
@@ -5961,7 +5968,7 @@ msgstr "Gnûfs utents"
 
 #. TRANS: Field label in user admin panel for setting new user welcome text.
 msgid "New user welcome"
-msgstr ""
+msgstr "Benvignût pai gnûfs utents"
 
 #. TRANS: Tooltip in user admin panel for setting new user welcome text.
 msgid "Welcome text for new users (maximum 255 characters)."
@@ -6029,12 +6036,12 @@ msgstr "StatusNet %s"
 
 #. TRANS: Content part of StatusNet version page.
 #. TRANS: %1$s is the engine name (StatusNet) and %2$s is the StatusNet version.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "This site is powered by %1$s version %2$s, Copyright 2008-2011 StatusNet, "
 "Inc. and contributors."
 msgstr ""
-"Chest sît al funzione graziis a %1$s version %2$s, Copyright 2008-2010 "
+"Chest sît al funzione graziis a %1$s version %2$s, Copyright 2008-2011 "
 "StatusNet, Inc. e i colaboradôrs."
 
 #. TRANS: Header for StatusNet contributors section on the version page.
@@ -6118,16 +6125,26 @@ msgstr ""
 msgid "Robin thinks something is impossible."
 msgstr ""
 
+#. TRANS: Message used to be inserted as %2$s in  the text "No file may
+#. TRANS: be larger than %1$d byte and the file you sent was %2$s.".
+#. TRANS: %1$d is the number of bytes of an uploaded file.
+#, php-format
+msgid "%1$d byte"
+msgid_plural "%1$d bytes"
+msgstr[0] ""
+msgstr[1] ""
+
 #. TRANS: Message given if an upload is larger than the configured maximum.
-#. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
+#. TRANS: %1$d (used for plural) is the byte limit for uploads,
-#. TRANS: %1$s is used for plural.
+#. TRANS: %2$s is the proper form of "n bytes". This is the only ways to have
+#. TRANS: gettext support multiple plurals in the same message, unfortunately...
 #, php-format
 msgid ""
-"No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
+"No file may be larger than %1$d byte and the file you sent was %2$s. Try to "
-"Try to upload a smaller version."
+"upload a smaller version."
 msgid_plural ""
-"No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
+"No file may be larger than %1$d bytes and the file you sent was %2$s. Try to "
-"Try to upload a smaller version."
+"upload a smaller version."
 msgstr[0] ""
 msgstr[1] ""
 
@@ -6196,9 +6213,9 @@ msgid "Could not create login token for %s"
 msgstr ""
 
 #. TRANS: Exception thrown when a program code class (%s) cannot be instantiated.
-#, fuzzy, php-format
+#, php-format
 msgid "Cannot instantiate class %s."
-msgstr "No si pues istanziâ la clas"
+msgstr "No si pues istanziâ la clas %s."
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
 msgid "No database name or DSN found anywhere."
@@ -6702,19 +6719,10 @@ msgid "saveSettings() not implemented."
 msgstr ""
 
 #. TRANS: Header in administrator navigation panel.
-#. TRANS: Header in settings navigation panel.
 msgctxt "HEADER"
 msgid "Home"
 msgstr "Inizi"
 
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in personal group navigation menu.
-#. TRANS: Menu item in settings navigation panel.
-msgctxt "MENU"
-msgid "Home"
-msgstr "Inizi"
-
 #. TRANS: Header in administrator navigation panel.
 msgctxt "HEADER"
 msgid "Admin"
@@ -6883,7 +6891,7 @@ msgstr ""
 
 #. TRANS: Radio button label for application type
 msgid "Browser"
-msgstr ""
+msgstr "Sgarfadôr"
 
 #. TRANS: Radio button label for application type
 msgid "Desktop"
@@ -6895,7 +6903,7 @@ msgstr ""
 
 #. TRANS: Radio button label for access type.
 msgid "Read-only"
-msgstr "Dome in scriture"
+msgstr "Dome in leture"
 
 #. TRANS: Radio button label for access type.
 msgid "Read-write"
@@ -6906,14 +6914,12 @@ msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 
 #. TRANS: Submit button title.
-#, fuzzy
 msgid "Cancel application changes."
-msgstr "Aplicazions conetudis"
+msgstr "Anule i cambiaments ae aplicazion."
 
 #. TRANS: Submit button title.
-#, fuzzy
 msgid "Save application changes."
-msgstr "Gnove aplicazion"
+msgstr "Salve i cambiaments ae aplicazion."
 
 #. TRANS: Name for an anonymous application in application list.
 msgid "Unknown application"
@@ -6926,16 +6932,16 @@ msgstr " di "
 
 #. TRANS: Application access type
 msgid "read-write"
-msgstr ""
+msgstr "in leture e scriture"
 
 #. TRANS: Application access type
 msgid "read-only"
-msgstr ""
+msgstr "dome in leture"
 
 #. TRANS: Used in application list. %1$s is a modified date, %2$s is access type ("read-write" or "read-only")
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
-msgstr ""
+msgstr "Aprovât %1$s - acès \"%2$s\"."
 
 #. TRANS: Access token in the application list.
 #. TRANS: %s are the first 7 characters of the access token.
@@ -7526,13 +7532,6 @@ msgctxt "MENU"
 msgid "Public"
 msgstr "Public"
 
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in search group navigation panel.
-#. TRANS: Menu item in local navigation menu.
-msgctxt "MENU"
-msgid "Groups"
-msgstr "Grups"
-
 #. TRANS: Menu item in default local navigation panel.
 #. TRANS: Menu item title in local navigation menu.
 msgctxt "MENU"
@@ -7564,7 +7563,7 @@ msgstr "Gjave dai preferîts"
 
 #. TRANS: Button title for removing the favourite status for a favourite notice.
 msgid "Remove this notice from your list of favorite notices."
-msgstr ""
+msgstr "Gjave chest avîs de tô liste dai avîs preferîts."
 
 #. TRANS: Form legend for adding the favourite status to a notice.
 msgid "Favor this notice"
@@ -7577,7 +7576,7 @@ msgstr "Preferìs"
 
 #. TRANS: Button title for adding the favourite status to a notice.
 msgid "Add this notice to your list of favorite notices."
-msgstr ""
+msgstr "Zonte chest avîs ae tô liste dai avîs preferîts."
 
 #. TRANS: Feed type name.
 msgid "RSS 1.0"
@@ -7597,7 +7596,7 @@ msgstr "FOAF"
 
 #. TRANS: Feed type name. See http://activitystrea.ms/
 msgid "Activity Streams"
-msgstr ""
+msgstr "Flus di ativitâts"
 
 #. TRANS: Client exception thrown when an imported feed does not have an author.
 msgid "No author in the feed."
@@ -7639,12 +7638,10 @@ msgid "All members"
 msgstr "Ducj i membris"
 
 #. TRANS: Header for mini list of users with a pending membership request on a group page (h2).
-#, fuzzy
 msgid "Pending"
-msgstr "In spiete (%d)"
+msgstr "In spiete"
 
 #. TRANS: Header for mini list of users that are blocked in a group page (h2).
-#, fuzzy
 msgid "Blocked"
 msgstr "Blocâts"
 
@@ -7750,6 +7747,11 @@ msgstr "Viôt dut"
 msgid "See all groups you belong to."
 msgstr ""
 
+#. TRANS: Menu item title in personal group navigation menu.
+#. TRANS: %s is a username.
+msgid "Back to top"
+msgstr ""
+
 #. TRANS: Client exception 406
 msgid "This page is not available in a media type you accept"
 msgstr ""
@@ -7879,9 +7881,8 @@ msgid "Leave"
 msgstr "Lasse"
 
 #. TRANS: Link title for seeing all lists.
-#, fuzzy
 msgid "See all lists you have created."
-msgstr "Cjale dutis lis listis che tu âs creât"
+msgstr "Cjale dutis lis listis che tu âs creât."
 
 #. TRANS: Menu item for logging in to the StatusNet site.
 #. TRANS: Menu item in primary navigation panel.
@@ -8131,6 +8132,10 @@ msgstr ""
 
 #. TRANS: Subject of group join notification e-mail.
 #. TRANS: %1$s is the joining user's nickname, %2$s is the group name, and %3$s is the StatusNet sitename.
+#, php-format
+msgid "%1$s has joined your group %2$s on %3$s"
+msgstr "%1$s si à unît al to grup %2$s su %3$s"
+
 #. TRANS: Main body of group join notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
 #. TRANS: %4$s is a block of profile info about the subscriber.
@@ -8216,10 +8221,9 @@ msgid "Make Admin"
 msgstr ""
 
 #. TRANS: Submit button title.
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Make this user an admin."
-msgstr "Bloche chest utent"
+msgstr "Promôf chest utent a aministradôr."
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
 msgid "There was a database error while saving your file. Please try again."
@@ -8421,23 +8425,20 @@ msgstr "intune tabaiade"
 msgid "Repeated by"
 msgstr "Ripetût di"
 
-#, fuzzy
 msgid " "
-msgstr ", "
+msgstr " "
 
 #. TRANS: Link title in notice list item to reply to a notice.
-#, fuzzy
 msgid "Reply to this notice."
-msgstr "Rispuint a chest avîs"
+msgstr "Rispuint a chest avîs."
 
 #. TRANS: Link text in notice list item to reply to a notice.
 msgid "Reply"
 msgstr "Rispuint"
 
 #. TRANS: Link title in notice list item to delete a notice.
-#, fuzzy
 msgid "Delete this notice from the timeline."
-msgstr "Elimine chest avîs"
+msgstr "Elimine chest avîs de ativitât."
 
 #. TRANS: Title for repeat form status in notice list when a notice has been repeated.
 msgid "Notice repeated."
@@ -8874,21 +8875,6 @@ msgstr "Cjate il contignût di avîs"
 msgid "Find groups on this site"
 msgstr "Cjate grups in chest sît"
 
-#. TRANS: Secondary navigation menu item leading to help on StatusNet.
-msgctxt "MENU"
-msgid "Help"
-msgstr "Jutori"
-
-#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
-msgctxt "MENU"
-msgid "About"
-msgstr "Informazions"
-
-#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
-msgctxt "MENU"
-msgid "FAQ"
-msgstr "Domandis plui frecuentis"
-
 #. TRANS: Secondary navigation menu item leading to Terms of Service.
 msgctxt "MENU"
 msgid "TOS"
@@ -8909,17 +8895,6 @@ msgctxt "MENU"
 msgid "Version"
 msgstr "Version"
 
-#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgctxt "MENU"
-msgid "Contact"
-msgstr "Contats"
-
-#. TRANS: Secondary navigation menu item. Leads to information about embedding a timeline widget.
-msgctxt "MENU"
-msgid "Badge"
-msgstr ""
-
 #. TRANS: Default title for section/sidebar widget.
 msgid "Untitled section"
 msgstr "Sezion cence non"
@@ -9003,11 +8978,11 @@ msgstr ""
 #. TRANS: Menu item in settings navigation panel.
 msgctxt "MENU"
 msgid "Old school"
-msgstr ""
+msgstr "Come une volte"
 
 #. TRANS: Menu item title in settings navigation panel.
 msgid "UI tweaks for old-school users"
-msgstr ""
+msgstr "Impuestazions de grafiche pai utents des vieris versions"
 
 #. TRANS: Title of form to silence a user.
 msgctxt "TITLE"
@@ -9234,16 +9209,26 @@ msgstr[1] "Chest i plâs a %%s."
 
 #. TRANS: List message for notice repeated by logged in user.
 msgctxt "REPEATLIST"
-msgid "You have repeated this notice."
+msgid "You repeated this."
-msgstr "Tu âs ripetût chest avîs."
+msgstr "Tu lu âs ripetût."
 
-#. TRANS: List message for repeated notices.
+#. TRANS: List message for when more than 4 people repeat something.
-#. TRANS: %d is the number of users that have repeated a notice.
+#. TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice.
+#. TRANS: Plural is decided on the total number of users liking the notice (count of %%s + %d).
 #, php-format
-msgid "One person has repeated this notice."
+msgid "%%s and %d other repeated this."
-msgid_plural "%d people have repeated this notice."
+msgid_plural "%%s and %d others repeated this."
-msgstr[0] "Une persone e à ripetût chest avîs."
+msgstr[0] "Ripetût di %%s e %d altri."
-msgstr[1] "%d personis a àn ripetût chest avîs."
+msgstr[1] "Ripetût di %%s e %d altris."
+
+#. TRANS: List message for favoured notices.
+#. TRANS: %%s is a list of users liking a notice.
+#. TRANS: Plural is based on the number of of users that have favoured a notice.
+#, php-format
+msgid "%%s repeated this."
+msgid_plural "%%s repeated this."
+msgstr[0] "%%s lu à ripetût."
+msgstr[1] "%%s lu àn ripetût."
 
 #. TRANS: Form legend.
 #, php-format
@@ -9345,9 +9330,8 @@ msgid "Unsubscribe"
 msgstr "Anule la sotscrizion"
 
 #. TRANS: Button title on unsubscribe form.
-#, fuzzy
 msgid "Unsubscribe from this user."
-msgstr "Anule la sotscrizion a chest utent"
+msgstr "Anule la sotscrizion a chest utent."
 
 #. TRANS: Exception text shown when no profile can be found for a user.
 #. TRANS: %1$s is a user nickname, $2$d is a user ID (number).

locale/he/LC_MESSAGES/statusnet.po

@@ -10,17 +10,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-25 21:42+0000\n"
+"POT-Creation-Date: 2012-03-01 15:45+0000\n"
-"PO-Revision-Date: 2011-09-25 21:45:11+0000\n"
+"PO-Revision-Date: 2012-03-01 15:46:07+0000\n"
 "Language-Team: Hebrew <https://translatewiki.net/wiki/Portal:he>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.19alpha (r98079); Translate extension (2011-09-22)\n"
+"X-Generator: MediaWiki 1.20alpha (r112812); Translate 2012-02-26\n"
-"X-Translation-Project: translatewiki.net at https://translatewiki.net\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-09-11 15:11:17+0000\n"
+"X-POT-Import-Date: 2012-02-25 15:22:46+0000\n"
 
 #. TRANS: Database error message.
 #, php-format
@@ -93,9 +93,8 @@ msgid "Closed"
 msgstr "סגורה"
 
 #. TRANS: Button title to save access settings in site admin panel.
-#, fuzzy
 msgid "Save access settings."
-msgstr "שמירת הגדרות גישה"
+msgstr "שמירת הגדרות גישה."
 
 #. TRANS: Button text to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
@@ -206,7 +205,6 @@ msgstr "אין משתמש כזה."
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
-#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed trying to make a micro summary without providing a valid user.
 #. TRANS: Client error displayed trying to send a direct message to a non-existing user.
 #. TRANS: Client error displayed trying to use "one time password login" without using an existing user.
@@ -315,8 +313,6 @@ msgstr "שליחת הזמנה"
 #. TRANS: %s is a username.
 #. TRANS: Menu item title in personal group navigation menu.
 #. TRANS: %s is a username.
-#. TRANS: Menu item title in settings navigation panel.
-#. TRANS: %s is a username.
 #, php-format
 msgid "%s and friends"
 msgstr "%s וחברים"
@@ -427,17 +423,15 @@ msgid "Unblock user failed."
 msgstr "הסרת החסימה ממשתמש נכשלה."
 
 #. TRANS: Client exception thrown when no conversation ID is given.
-#, fuzzy
 msgid "No conversation ID."
-msgstr "אין מזהה שיחה"
+msgstr "אין מזהה שיחה."
 
 #. TRANS: Client exception thrown when referring to a non-existing conversation ID (%d).
-#, fuzzy, php-format
+#, php-format
 msgid "No conversation with ID %d."
-msgstr "אין שיחה עם מזהה %d"
+msgstr "אין שיחה עם מזהה %d."
 
 #. TRANS: Title for conversion timeline.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Conversation"
 msgstr "שיחה"
@@ -489,7 +483,7 @@ msgstr "לא ניתן לשלוח הודעות ישירות למשתמשים שא
 #. TRANS: Error text shown when trying to send a direct message to self.
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
-msgstr ""
+msgstr "אל תשלח לעצמך הודעה; פשוט אמור את זה לעצמך בשקט."
 
 #. TRANS: Client error displayed when requesting a status with a non-existing ID.
 #. TRANS: Client error displayed when trying to remove a favourite with an invalid ID.
@@ -1912,6 +1906,74 @@ msgstr "הוספה למועדפים"
 msgid "No such document \"%s\"."
 msgstr ""
 
+#. TRANS: Menu item in administrator navigation panel.
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in personal group navigation menu.
+msgctxt "MENU"
+msgid "Home"
+msgstr ""
+
+msgctxt "MENU"
+msgid "Docs"
+msgstr ""
+
+#. TRANS: Secondary navigation menu item leading to help on StatusNet.
+msgctxt "MENU"
+msgid "Help"
+msgstr "עזרה"
+
+msgid "Getting started"
+msgstr "תחילת עבודה"
+
+#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
+msgctxt "MENU"
+msgid "About"
+msgstr ""
+
+msgid "About this site"
+msgstr "אודות האתר הזה"
+
+#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
+msgctxt "MENU"
+msgid "FAQ"
+msgstr ""
+
+msgid "Frequently asked questions"
+msgstr ""
+
+#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgctxt "MENU"
+msgid "Contact"
+msgstr ""
+
+msgid "Contact info"
+msgstr ""
+
+msgctxt "MENU"
+msgid "Tags"
+msgstr ""
+
+msgid "Using tags"
+msgstr ""
+
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in search group navigation panel.
+#. TRANS: Menu item in local navigation menu.
+msgctxt "MENU"
+msgid "Groups"
+msgstr ""
+
+msgid "Using groups"
+msgstr "שימוש בקבוצות"
+
+msgctxt "MENU"
+msgid "API"
+msgstr ""
+
+msgid "RESTful API"
+msgstr ""
+
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
 msgid "Edit application"
@@ -4128,45 +4190,6 @@ msgid ""
 "tool."
 msgstr ""
 
-#. TRANS: Title for page with public list cloud.
-msgid "Public list cloud"
-msgstr ""
-
-#. TRANS: Page notice for page with public list cloud.
-#. TRANS: %s is a StatusNet sitename.
-#, php-format
-msgid "These are largest lists on %s"
-msgstr ""
-
-#. TRANS: Empty list message on page with public list cloud.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, php-format
-msgid "No one has [listed](%%doc.tags%%) anyone yet."
-msgstr ""
-
-#. TRANS: Additional empty list message on page with public list cloud for logged in users.
-msgid "Be the first to list someone!"
-msgstr ""
-
-#. TRANS: Additional empty list message on page with public list cloud for anonymous users.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, php-format
-msgid ""
-"Why not [register an account](%%action.register%%) and be the first to list "
-"someone!"
-msgstr ""
-
-#. TRANS: DT element on on page with public list cloud.
-msgid "List cloud"
-msgstr ""
-
-#. TRANS: Link title for number of listed people. %d is the number of listed people.
-#, php-format
-msgid "1 person listed"
-msgid_plural "%d people listed"
-msgstr[0] ""
-msgstr[1] ""
-
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
 #, php-format
 msgid "%s updates from everyone."
@@ -4859,7 +4882,7 @@ msgid "FOAF for %s group"
 msgstr "חברים של חברים עבר הקבוצה %s"
 
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: %%%%action.register%%%% is the URL for registration, %%%%doc.help%%%% is a URL to help.
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
 #, php-format
@@ -4872,7 +4895,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept no new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
 #, php-format
 msgid ""
@@ -4998,11 +5021,6 @@ msgstr ""
 msgid "Subscribers"
 msgstr "מנויים"
 
-#. TRANS: Link for more "People following tag x"
-#. TRANS: if there are more than the mini list's maximum.
-msgid "All subscribers"
-msgstr "כל המנויים"
-
 #. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag.
 #, php-format
@@ -5588,8 +5606,7 @@ msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
 "people you know. Try [people search](%%action.peoplesearch%%), look for "
 "members in groups you're interested in and in our [featured users](%%action."
-"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
+"featured%%)."
-"automatically subscribe to people you already follow there."
 msgstr ""
 
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user other
@@ -5978,16 +5995,26 @@ msgstr ""
 msgid "Robin thinks something is impossible."
 msgstr ""
 
+#. TRANS: Message used to be inserted as %2$s in  the text "No file may
+#. TRANS: be larger than %1$d byte and the file you sent was %2$s.".
+#. TRANS: %1$d is the number of bytes of an uploaded file.
+#, php-format
+msgid "%1$d byte"
+msgid_plural "%1$d bytes"
+msgstr[0] ""
+msgstr[1] ""
+
 #. TRANS: Message given if an upload is larger than the configured maximum.
-#. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
+#. TRANS: %1$d (used for plural) is the byte limit for uploads,
-#. TRANS: %1$s is used for plural.
+#. TRANS: %2$s is the proper form of "n bytes". This is the only ways to have
+#. TRANS: gettext support multiple plurals in the same message, unfortunately...
 #, php-format
 msgid ""
-"No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
+"No file may be larger than %1$d byte and the file you sent was %2$s. Try to "
-"Try to upload a smaller version."
+"upload a smaller version."
 msgid_plural ""
-"No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
+"No file may be larger than %1$d bytes and the file you sent was %2$s. Try to "
-"Try to upload a smaller version."
+"upload a smaller version."
 msgstr[0] ""
 msgstr[1] ""
 
@@ -6410,13 +6437,13 @@ msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
 "broughtby%%](%%site.broughtbyurl%%)."
 msgstr ""
-"**%%site.name%%** הוא שירות ביקרובלוג הניתן על־ידי [%%site.broughtby%%](%%"
+"**%%site.name%%** הוא שירות מיקרובלוג הניתן על־ידי [%%site.broughtby%%](%%"
 "site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
-msgstr "**%%site.name%%** הוא שרות ביקרובלוג."
+msgstr "**%%site.name%%** הוא שרות מיקרובלוג."
 
 #. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
@@ -6558,19 +6585,10 @@ msgid "saveSettings() not implemented."
 msgstr ""
 
 #. TRANS: Header in administrator navigation panel.
-#. TRANS: Header in settings navigation panel.
 msgctxt "HEADER"
 msgid "Home"
 msgstr ""
 
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in personal group navigation menu.
-#. TRANS: Menu item in settings navigation panel.
-msgctxt "MENU"
-msgid "Home"
-msgstr ""
-
 #. TRANS: Header in administrator navigation panel.
 msgctxt "HEADER"
 msgid "Admin"
@@ -7371,13 +7389,6 @@ msgctxt "MENU"
 msgid "Public"
 msgstr ""
 
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in search group navigation panel.
-#. TRANS: Menu item in local navigation menu.
-msgctxt "MENU"
-msgid "Groups"
-msgstr ""
-
 #. TRANS: Menu item in default local navigation panel.
 #. TRANS: Menu item title in local navigation menu.
 msgctxt "MENU"
@@ -7595,6 +7606,11 @@ msgstr ""
 msgid "See all groups you belong to."
 msgstr ""
 
+#. TRANS: Menu item title in personal group navigation menu.
+#. TRANS: %s is a username.
+msgid "Back to top"
+msgstr ""
+
 #. TRANS: Client exception 406
 msgid "This page is not available in a media type you accept"
 msgstr "עמוד זה אינו זמין בסוג מדיה שאתה יכול לקבל"
@@ -7972,6 +7988,10 @@ msgstr ""
 
 #. TRANS: Subject of group join notification e-mail.
 #. TRANS: %1$s is the joining user's nickname, %2$s is the group name, and %3$s is the StatusNet sitename.
+#, fuzzy, php-format
+msgid "%1$s has joined your group %2$s on %3$s"
+msgstr "%1$s הזמין אותך להצטרף אליהם באתר %2$s"
+
 #. TRANS: Main body of group join notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
 #. TRANS: %4$s is a block of profile info about the subscriber.
@@ -8262,18 +8282,16 @@ msgid " "
 msgstr ""
 
 #. TRANS: Link title in notice list item to reply to a notice.
-#, fuzzy
 msgid "Reply to this notice."
-msgstr "להדהד את העדכון הזה."
+msgstr "להגיב לעדכון הזה।"
 
 #. TRANS: Link text in notice list item to reply to a notice.
 msgid "Reply"
 msgstr "תגובות"
 
 #. TRANS: Link title in notice list item to delete a notice.
-#, fuzzy
 msgid "Delete this notice from the timeline."
-msgstr "למחוק את העדכון הזה."
+msgstr "למחוק את העדכון הזה מציר הזמן."
 
 #. TRANS: Title for repeat form status in notice list when a notice has been repeated.
 msgid "Notice repeated."
@@ -8281,7 +8299,7 @@ msgstr "העדכון הודהד."
 
 #. TRANS: Field label for notice text.
 msgid "Update your status..."
-msgstr ""
+msgstr "עדכון מצב॥।"
 
 #. TRANS: Form legend of form to nudge/ping another user.
 msgid "Nudge this user"
@@ -8706,21 +8724,6 @@ msgstr ""
 msgid "Find groups on this site"
 msgstr ""
 
-#. TRANS: Secondary navigation menu item leading to help on StatusNet.
-msgctxt "MENU"
-msgid "Help"
-msgstr "עזרה"
-
-#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
-msgctxt "MENU"
-msgid "About"
-msgstr ""
-
-#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
-msgctxt "MENU"
-msgid "FAQ"
-msgstr ""
-
 #. TRANS: Secondary navigation menu item leading to Terms of Service.
 msgctxt "MENU"
 msgid "TOS"
@@ -8741,17 +8744,6 @@ msgctxt "MENU"
 msgid "Version"
 msgstr ""
 
-#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgctxt "MENU"
-msgid "Contact"
-msgstr ""
-
-#. TRANS: Secondary navigation menu item. Leads to information about embedding a timeline widget.
-msgctxt "MENU"
-msgid "Badge"
-msgstr ""
-
 #. TRANS: Default title for section/sidebar widget.
 msgid "Untitled section"
 msgstr ""
@@ -9065,17 +9057,28 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: List message for notice repeated by logged in user.
+#, fuzzy
 msgctxt "REPEATLIST"
-msgid "You have repeated this notice."
+msgid "You repeated this."
 msgstr "הדהדת את העדכון הזה."
 
-#. TRANS: List message for repeated notices.
+#. TRANS: List message for when more than 4 people repeat something.
-#. TRANS: %d is the number of users that have repeated a notice.
+#. TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice.
+#. TRANS: Plural is decided on the total number of users liking the notice (count of %%s + %d).
 #, php-format
-msgid "One person has repeated this notice."
+msgid "%%s and %d other repeated this."
-msgid_plural "%d people have repeated this notice."
+msgid_plural "%%s and %d others repeated this."
-msgstr[0] "אדם אחד הדהד את העדכון הזה."
+msgstr[0] ""
-msgstr[1] "%d אנשים הדהדו את העדכון הזה."
+msgstr[1] ""
+
+#. TRANS: List message for favoured notices.
+#. TRANS: %%s is a list of users liking a notice.
+#. TRANS: Plural is based on the number of of users that have favoured a notice.
+#, fuzzy, php-format
+msgid "%%s repeated this."
+msgid_plural "%%s repeated this."
+msgstr[0] "הודהד אל %s"
+msgstr[1] "הודהד אל %s"
 
 #. TRANS: Form legend.
 #, php-format

locale/hu/LC_MESSAGES/statusnet.po

@@ -3,8 +3,10 @@
 #
 # Author: Bdamokos
 # Author: Dani
+# Author: Dj
 # Author: Gerymate
 # Author: Glanthor Reviol
+# Author: Tgr
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -12,14 +14,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-25 21:42+0000\n"
+"POT-Creation-Date: 2012-03-01 15:45+0000\n"
-"PO-Revision-Date: 2011-09-25 21:45:14+0000\n"
+"PO-Revision-Date: 2012-03-01 15:46:10+0000\n"
 "Language-Team: Hungarian <https://translatewiki.net/wiki/Portal:hu>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-09-11 15:11:17+0000\n"
+"X-POT-Import-Date: 2012-02-25 15:22:46+0000\n"
-"X-Generator: MediaWiki 1.19alpha (r98079); Translate extension (2011-09-22)\n"
+"X-Generator: MediaWiki 1.20alpha (r112812); Translate 2012-02-26\n"
-"X-Translation-Project: translatewiki.net at https://translatewiki.net\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: hu\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -44,9 +46,8 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when trying to access a non-existing page.
-#, fuzzy
 msgid "Unknown page"
-msgstr "Ismeretlen fájltípus"
+msgstr "Ismeretlen oldal"
 
 #. TRANS: Error message displayed when trying to perform an undefined action.
 #. TRANS: Title for password recovery page when an unknown action has been specified.
@@ -95,9 +96,8 @@ msgid "Closed"
 msgstr "Zárva"
 
 #. TRANS: Button title to save access settings in site admin panel.
-#, fuzzy
 msgid "Save access settings."
-msgstr "Hozzáférések beállításainak mentése"
+msgstr "Hozzáférések beállításainak mentése."
 
 #. TRANS: Button text to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
@@ -207,7 +207,6 @@ msgstr "Nincs ilyen lap."
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
-#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed trying to make a micro summary without providing a valid user.
 #. TRANS: Client error displayed trying to send a direct message to a non-existing user.
 #. TRANS: Client error displayed trying to use "one time password login" without using an existing user.
@@ -316,8 +315,6 @@ msgstr "Meghívások"
 #. TRANS: %s is a username.
 #. TRANS: Menu item title in personal group navigation menu.
 #. TRANS: %s is a username.
-#. TRANS: Menu item title in settings navigation panel.
-#. TRANS: %s is a username.
 #, php-format
 msgid "%s and friends"
 msgstr "%s és barátai"
@@ -1251,7 +1248,7 @@ msgstr "A csoportban lévő felhasználók listája."
 #. TRANS: Client error displayed trying to approve/deny group membership.
 #. TRANS: Client error displayed trying to approve/deny subscription.
 msgid "Internal error: received neither cancel nor abort."
-msgstr ""
+msgstr "Belső hiba: se cancel se abort nem érkezett."
 
 #. TRANS: Client error displayed trying to approve/deny group membership.
 #. TRANS: Client error displayed trying to approve/deny  subscription
@@ -1991,6 +1988,85 @@ msgstr "Hozzáadás a kedvencekhez"
 msgid "No such document \"%s\"."
 msgstr "Nincs ilyen dokumentum: „%s”"
 
+#. TRANS: Menu item in administrator navigation panel.
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in personal group navigation menu.
+#, fuzzy
+msgctxt "MENU"
+msgid "Home"
+msgstr "Otthon"
+
+msgctxt "MENU"
+msgid "Docs"
+msgstr ""
+
+#. TRANS: Secondary navigation menu item leading to help on StatusNet.
+#, fuzzy
+msgctxt "MENU"
+msgid "Help"
+msgstr "Súgó"
+
+#, fuzzy
+msgid "Getting started"
+msgstr "A beállításokat elmentettük."
+
+#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
+#, fuzzy
+msgctxt "MENU"
+msgid "About"
+msgstr "Névjegy"
+
+#, fuzzy
+msgid "About this site"
+msgstr "Ezen felhasználó blokkjának feloldása"
+
+#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
+#, fuzzy
+msgctxt "MENU"
+msgid "FAQ"
+msgstr "GyIK"
+
+msgid "Frequently asked questions"
+msgstr ""
+
+#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+#, fuzzy
+msgctxt "MENU"
+msgid "Contact"
+msgstr "Kapcsolat"
+
+#, fuzzy
+msgid "Contact info"
+msgstr "Kapcsolat"
+
+#, fuzzy
+msgctxt "MENU"
+msgid "Tags"
+msgstr "Címkék"
+
+msgid "Using tags"
+msgstr ""
+
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in search group navigation panel.
+#. TRANS: Menu item in local navigation menu.
+#, fuzzy
+msgctxt "MENU"
+msgid "Groups"
+msgstr "Csoportok"
+
+#, fuzzy
+msgid "Using groups"
+msgstr "A felhasználó csoportjai"
+
+msgctxt "MENU"
+msgid "API"
+msgstr ""
+
+msgid "RESTful API"
+msgstr ""
+
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
 msgid "Edit application"
@@ -2170,7 +2246,7 @@ msgstr "Beállíthatod, milyen email-eket kapj a(z) %%site.name%% webhelyről."
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
 msgid "Email address"
-msgstr "Email-cím"
+msgstr "E-mail cím"
 
 #. TRANS: Form note in e-mail settings form.
 msgid "Current confirmed email address."
@@ -2350,7 +2426,6 @@ msgstr "Nincs bejövő e-mail cím."
 #. TRANS: Server error thrown on database error removing incoming e-mail address.
 #. TRANS: Server error thrown on database error adding incoming e-mail address.
 #. TRANS: Server error displayed when the user could not be updated in SMS settings.
-#, fuzzy
 msgid "Could not update user record."
 msgstr "Nem sikerült frissíteni a felhasználó rekordját."
 
@@ -3175,9 +3250,8 @@ msgid "Could not create application."
 msgstr "Nem sikerült létrehozni az alkalmazást."
 
 #. TRANS: Form validation error messages displayed when uploading an invalid application logo.
-#, fuzzy
 msgid "Invalid image."
-msgstr "Érvénytelen méret."
+msgstr "Érvénytelen kép."
 
 #. TRANS: Title for form to create a group.
 msgid "New group"
@@ -3731,7 +3805,6 @@ msgid "Directory where attachments are located."
 msgstr "A nyelvi fájlok elérési útvonala"
 
 #. TRANS: Fieldset legend in Paths admin panel.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "SSL"
 msgstr "SSL"
@@ -4146,9 +4219,8 @@ msgid "Language"
 msgstr "Nyelv"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#, fuzzy
 msgid "Preferred language."
-msgstr "Előnyben részesített nyelv"
+msgstr "Előnyben részesített nyelv."
 
 #. TRANS: Dropdownlist label in form for profile settings.
 msgid "Timezone"
@@ -4321,45 +4393,6 @@ msgid ""
 "tool."
 msgstr ""
 
-#. TRANS: Title for page with public list cloud.
-msgid "Public list cloud"
-msgstr ""
-
-#. TRANS: Page notice for page with public list cloud.
-#. TRANS: %s is a StatusNet sitename.
-#, php-format
-msgid "These are largest lists on %s"
-msgstr ""
-
-#. TRANS: Empty list message on page with public list cloud.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, php-format
-msgid "No one has [listed](%%doc.tags%%) anyone yet."
-msgstr ""
-
-#. TRANS: Additional empty list message on page with public list cloud for logged in users.
-msgid "Be the first to list someone!"
-msgstr ""
-
-#. TRANS: Additional empty list message on page with public list cloud for anonymous users.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, php-format
-msgid ""
-"Why not [register an account](%%action.register%%) and be the first to list "
-"someone!"
-msgstr ""
-
-#. TRANS: DT element on on page with public list cloud.
-msgid "List cloud"
-msgstr "Listafelhő"
-
-#. TRANS: Link title for number of listed people. %d is the number of listed people.
-#, php-format
-msgid "1 person listed"
-msgid_plural "%d people listed"
-msgstr[0] ""
-msgstr[1] ""
-
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
 #, fuzzy, php-format
 msgid "%s updates from everyone."
@@ -5079,7 +5112,7 @@ msgid "FOAF for %s group"
 msgstr "FOAF a %s csoportnak"
 
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: %%%%action.register%%%% is the URL for registration, %%%%doc.help%%%% is a URL to help.
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
 #, php-format
@@ -5098,15 +5131,21 @@ msgstr ""
 "még sok másiknak is! ([Tudj meg többet](%%%%doc.help%%%%))"
 
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept no new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
 "[StatusNet](http://status.net/) tool. Its members share short messages about "
 "their life and interests."
 msgstr ""
+"**%s** egy felhasználói csoport a %%%%site.name%%%% webhelyen - ami egy "
+"[mikroblog](http://hu.wikipedia.org/wiki/Mikroblog#Mikroblog), mely a szabad "
+"[StatusNet](http://status.net/) szoftveren fut. A csoport tagjai rövid "
+"üzeneteket írnak az életükről és az érdeklődési körükkel kapcsolatban.\n"
+"[Csatlakozz](%%%%action.register%%%%), és légy tagja ennek a csoportnak - és "
+"még sok másiknak is! ([Tudj meg többet](%%%%doc.help%%%%))"
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
 msgid "No such message."
@@ -5225,11 +5264,6 @@ msgstr "Összes megjelenítése"
 msgid "Subscribers"
 msgstr "Feliratkozók"
 
-#. TRANS: Link for more "People following tag x"
-#. TRANS: if there are more than the mini list's maximum.
-msgid "All subscribers"
-msgstr "Minden feliratkozott"
-
 #. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag.
 #, fuzzy, php-format
@@ -5320,7 +5354,7 @@ msgstr ""
 
 #. TRANS: Announcement for anonymous users showing a timeline if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
@@ -5837,8 +5871,7 @@ msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
 "people you know. Try [people search](%%action.peoplesearch%%), look for "
 "members in groups you're interested in and in our [featured users](%%action."
-"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
+"featured%%)."
-"automatically subscribe to people you already follow there."
 msgstr ""
 
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user other
@@ -6240,16 +6273,26 @@ msgstr ""
 msgid "Robin thinks something is impossible."
 msgstr ""
 
+#. TRANS: Message used to be inserted as %2$s in  the text "No file may
+#. TRANS: be larger than %1$d byte and the file you sent was %2$s.".
+#. TRANS: %1$d is the number of bytes of an uploaded file.
+#, php-format
+msgid "%1$d byte"
+msgid_plural "%1$d bytes"
+msgstr[0] ""
+msgstr[1] ""
+
 #. TRANS: Message given if an upload is larger than the configured maximum.
-#. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
+#. TRANS: %1$d (used for plural) is the byte limit for uploads,
-#. TRANS: %1$s is used for plural.
+#. TRANS: %2$s is the proper form of "n bytes". This is the only ways to have
+#. TRANS: gettext support multiple plurals in the same message, unfortunately...
 #, php-format
 msgid ""
-"No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
+"No file may be larger than %1$d byte and the file you sent was %2$s. Try to "
-"Try to upload a smaller version."
+"upload a smaller version."
 msgid_plural ""
-"No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
+"No file may be larger than %1$d bytes and the file you sent was %2$s. Try to "
-"Try to upload a smaller version."
+"upload a smaller version."
 msgstr[0] ""
 msgstr[1] ""
 
@@ -6829,21 +6872,11 @@ msgid "saveSettings() not implemented."
 msgstr "a saveSettings() nincs megvalósítva."
 
 #. TRANS: Header in administrator navigation panel.
-#. TRANS: Header in settings navigation panel.
 #, fuzzy
 msgctxt "HEADER"
 msgid "Home"
 msgstr "Otthon"
 
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in personal group navigation menu.
-#. TRANS: Menu item in settings navigation panel.
-#, fuzzy
-msgctxt "MENU"
-msgid "Home"
-msgstr "Otthon"
-
 #. TRANS: Header in administrator navigation panel.
 #, fuzzy
 msgctxt "HEADER"
@@ -7677,14 +7710,6 @@ msgctxt "MENU"
 msgid "Public"
 msgstr "Nyilvános"
 
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in search group navigation panel.
-#. TRANS: Menu item in local navigation menu.
-#, fuzzy
-msgctxt "MENU"
-msgid "Groups"
-msgstr "Csoportok"
-
 #. TRANS: Menu item in default local navigation panel.
 #. TRANS: Menu item title in local navigation menu.
 msgctxt "MENU"
@@ -7919,6 +7944,11 @@ msgstr "Összes megjelenítése"
 msgid "See all groups you belong to."
 msgstr ""
 
+#. TRANS: Menu item title in personal group navigation menu.
+#. TRANS: %s is a username.
+msgid "Back to top"
+msgstr ""
+
 #. TRANS: Client exception 406
 msgid "This page is not available in a media type you accept"
 msgstr "A lap nem érhető el abban a médiatípusban, amit elfogadsz"
@@ -8367,6 +8397,10 @@ msgstr ""
 
 #. TRANS: Subject of group join notification e-mail.
 #. TRANS: %1$s is the joining user's nickname, %2$s is the group name, and %3$s is the StatusNet sitename.
+#, fuzzy, php-format
+msgid "%1$s has joined your group %2$s on %3$s"
+msgstr "%1$s csatlakozott a(z) %2$s csoporthoz"
+
 #. TRANS: Main body of group join notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
 #. TRANS: %4$s is a block of profile info about the subscriber.
@@ -9139,24 +9173,6 @@ msgstr "Keressünk a hírek tartalmában"
 msgid "Find groups on this site"
 msgstr "Csoportok keresése az oldalon"
 
-#. TRANS: Secondary navigation menu item leading to help on StatusNet.
-#, fuzzy
-msgctxt "MENU"
-msgid "Help"
-msgstr "Súgó"
-
-#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
-#, fuzzy
-msgctxt "MENU"
-msgid "About"
-msgstr "Névjegy"
-
-#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
-#, fuzzy
-msgctxt "MENU"
-msgid "FAQ"
-msgstr "GyIK"
-
 #. TRANS: Secondary navigation menu item leading to Terms of Service.
 #, fuzzy
 msgctxt "MENU"
@@ -9181,19 +9197,6 @@ msgctxt "MENU"
 msgid "Version"
 msgstr "Munkamenetek"
 
-#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-#, fuzzy
-msgctxt "MENU"
-msgid "Contact"
-msgstr "Kapcsolat"
-
-#. TRANS: Secondary navigation menu item. Leads to information about embedding a timeline widget.
-#, fuzzy
-msgctxt "MENU"
-msgid "Badge"
-msgstr "Megbök"
-
 #. TRANS: Default title for section/sidebar widget.
 msgid "Untitled section"
 msgstr "Névtelen szakasz"
@@ -9529,16 +9532,26 @@ msgstr[1] ""
 #. TRANS: List message for notice repeated by logged in user.
 #, fuzzy
 msgctxt "REPEATLIST"
-msgid "You have repeated this notice."
+msgid "You repeated this."
 msgstr "Ne töröljük ezt a hírt"
 
-#. TRANS: List message for repeated notices.
+#. TRANS: List message for when more than 4 people repeat something.
-#. TRANS: %d is the number of users that have repeated a notice.
+#. TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice.
+#. TRANS: Plural is decided on the total number of users liking the notice (count of %%s + %d).
+#, php-format
+msgid "%%s and %d other repeated this."
+msgid_plural "%%s and %d others repeated this."
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: List message for favoured notices.
+#. TRANS: %%s is a list of users liking a notice.
+#. TRANS: Plural is based on the number of of users that have favoured a notice.
 #, fuzzy, php-format
-msgid "One person has repeated this notice."
+msgid "%%s repeated this."
-msgid_plural "%d people have repeated this notice."
+msgid_plural "%%s repeated this."
-msgstr[0] "Már megismételted azt a hírt."
+msgstr[0] "Ne töröljük ezt a hírt"
-msgstr[1] "Már megismételted azt a hírt."
+msgstr[1] "Ne töröljük ezt a hírt"
 
 #. TRANS: Form legend.
 #, php-format

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: 2011-09-25 21:42+0000\n"
+"POT-Creation-Date: 2012-03-01 15:45+0000\n"
-"PO-Revision-Date: 2011-09-25 21:45:16+0000\n"
+"PO-Revision-Date: 2012-03-01 15:46:13+0000\n"
 "Language-Team: Interlingua <https://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.19alpha (r98079); Translate extension (2011-09-22)\n"
+"X-Generator: MediaWiki 1.20alpha (r112812); Translate 2012-02-26\n"
-"X-Translation-Project: translatewiki.net at https://translatewiki.net\n"
+"X-Translation-Project: translatewiki.net <https://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: 2011-09-11 15:11:17+0000\n"
+"X-POT-Import-Date: 2012-02-25 15:22:46+0000\n"
 
 #. TRANS: Database error message.
 #, php-format
@@ -208,7 +208,6 @@ msgstr "Pagina non existe."
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
-#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed trying to make a micro summary without providing a valid user.
 #. TRANS: Client error displayed trying to send a direct message to a non-existing user.
 #. TRANS: Client error displayed trying to use "one time password login" without using an existing user.
@@ -319,8 +318,6 @@ msgstr "Inviar invitation"
 #. TRANS: %s is a username.
 #. TRANS: Menu item title in personal group navigation menu.
 #. TRANS: %s is a username.
-#. TRANS: Menu item title in settings navigation panel.
-#. TRANS: %s is a username.
 #, php-format
 msgid "%s and friends"
 msgstr "%s e amicos"
@@ -1965,6 +1962,74 @@ msgstr "Adder al favorites"
 msgid "No such document \"%s\"."
 msgstr "Le documento \"%s\" non existe."
 
+#. TRANS: Menu item in administrator navigation panel.
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in personal group navigation menu.
+msgctxt "MENU"
+msgid "Home"
+msgstr "Initio"
+
+msgctxt "MENU"
+msgid "Docs"
+msgstr "Documentation"
+
+#. TRANS: Secondary navigation menu item leading to help on StatusNet.
+msgctxt "MENU"
+msgid "Help"
+msgstr "Adjuta"
+
+msgid "Getting started"
+msgstr "Como initiar"
+
+#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
+msgctxt "MENU"
+msgid "About"
+msgstr "A proposito"
+
+msgid "About this site"
+msgstr "A proposito de iste sito"
+
+#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
+msgctxt "MENU"
+msgid "FAQ"
+msgstr "FAQ"
+
+msgid "Frequently asked questions"
+msgstr "Folio a questiones"
+
+#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgctxt "MENU"
+msgid "Contact"
+msgstr "Contacto"
+
+msgid "Contact info"
+msgstr "Information de contacto"
+
+msgctxt "MENU"
+msgid "Tags"
+msgstr "Etiquettas"
+
+msgid "Using tags"
+msgstr "Como usar etiquettas"
+
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in search group navigation panel.
+#. TRANS: Menu item in local navigation menu.
+msgctxt "MENU"
+msgid "Groups"
+msgstr "Gruppos"
+
+msgid "Using groups"
+msgstr "Como usar gruppos"
+
+msgctxt "MENU"
+msgid "API"
+msgstr "API"
+
+msgid "RESTful API"
+msgstr "API conforme a REST"
+
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
 msgid "Edit application"
@@ -3380,13 +3445,12 @@ msgid "Not a supported data format."
 msgstr "Formato de datos non supportate."
 
 #. TRANS: Page title for profile settings.
-#, fuzzy
 msgid "Old school UI settings"
-msgstr "Configuration de messageria instantanee"
+msgstr "Configuration del ancian interfacie"
 
 #. TRANS: Usage instructions for profile settings.
 msgid "If you like it \"the old way\", you can set that here."
-msgstr ""
+msgstr "Si tu prefere \"le vetule maniera\", tu pote indicar lo hic."
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
@@ -3394,13 +3458,13 @@ msgid "Settings saved."
 msgstr "Preferentias confirmate."
 
 msgid "Only stream mode (no conversations) in timelines"
-msgstr ""
+msgstr "Solmente modo de fluxo (sin conversationes) in chronologias"
 
 msgid "Show conversation page as hierarchical trees"
-msgstr ""
+msgstr "Monstrar pagina de conversation como arbore hierarchic"
 
 msgid "Show nicknames (not full names) in timelines"
-msgstr ""
+msgstr "Monstrar pseudonymos (non nomines complete) in chronologias"
 
 #. TRANS: Button text to save a list.
 msgid "Save"
@@ -3838,7 +3902,7 @@ msgstr "Monstrar etiquettas public."
 #. TRANS: Submit button text on gallery action page.
 msgctxt "BUTTON"
 msgid "Go"
-msgstr "Ir"
+msgstr "Va"
 
 #. TRANS: Message displayed for anonymous users on page that displays lists by a user.
 #. TRANS: This message contains Markdown links in the form [description](links).
@@ -4274,47 +4338,6 @@ msgstr ""
 "Isto es %%site.name%%, un servicio de [micro-blog](http://ia.wikipedia.org/"
 "wiki/Microblog) a base del software libere [StatusNet](http://status.net/)."
 
-#. TRANS: Title for page with public list cloud.
-msgid "Public list cloud"
-msgstr "Listario public"
-
-#. TRANS: Page notice for page with public list cloud.
-#. TRANS: %s is a StatusNet sitename.
-#, php-format
-msgid "These are largest lists on %s"
-msgstr "Istes es le listas le plus grande in %s"
-
-#. TRANS: Empty list message on page with public list cloud.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, php-format
-msgid "No one has [listed](%%doc.tags%%) anyone yet."
-msgstr "Nemo ha ancora [listate](%%doc.tags%%) alcuno."
-
-#. TRANS: Additional empty list message on page with public list cloud for logged in users.
-msgid "Be the first to list someone!"
-msgstr "Sia le prime a listar alcuno!"
-
-#. TRANS: Additional empty list message on page with public list cloud for anonymous users.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, php-format
-msgid ""
-"Why not [register an account](%%action.register%%) and be the first to list "
-"someone!"
-msgstr ""
-"!Proque non [crear un conto](%%action.register%%) e devenir le prime a "
-"listar alcuno?"
-
-#. TRANS: DT element on on page with public list cloud.
-msgid "List cloud"
-msgstr "Listario"
-
-#. TRANS: Link title for number of listed people. %d is the number of listed people.
-#, php-format
-msgid "1 person listed"
-msgid_plural "%d people listed"
-msgstr[0] "1 persona listate"
-msgstr[1] "%d personas listate"
-
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
 #, php-format
 msgid "%s updates from everyone."
@@ -5057,7 +5080,7 @@ msgid "FOAF for %s group"
 msgstr "Amico de un amico pro le gruppo %s"
 
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: %%%%action.register%%%% is the URL for registration, %%%%doc.help%%%% is a URL to help.
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
 #, php-format
@@ -5075,7 +5098,7 @@ msgstr ""
 "parte de iste gruppo e multe alteres! ([Lege plus](%%%%doc.help%%%%))"
 
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept no new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
 #, php-format
 msgid ""
@@ -5086,7 +5109,7 @@ msgid ""
 msgstr ""
 "**%s** es un gruppo de usatores in %%%%site.name%%%%, un servicio de [micro-"
 "blogging](http://ia.wikipedia.org/wiki/Microblog) a base del software libere "
-"[StatusNet](http://status.net/). Su membros condivide breve messages super "
+"[StatusNet](http://status.net/). Su membros intercambia breve messages super "
 "lor vita e interesses."
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
@@ -5209,11 +5232,6 @@ msgstr "Monstrar totes"
 msgid "Subscribers"
 msgstr "Subscriptores"
 
-#. TRANS: Link for more "People following tag x"
-#. TRANS: if there are more than the mini list's maximum.
-msgid "All subscribers"
-msgstr "Tote le subscriptores"
-
 #. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag.
 #, php-format
@@ -5316,7 +5334,7 @@ msgid ""
 "[StatusNet](http://status.net/) tool."
 msgstr ""
 "**%s** ha un conto in %%%%site.name%%%%, un servicio de [micro-blogging]"
-"(http://en.wikipedia.org/wiki/Microblog) a base del software libere "
+"(http://ia.wikipedia.org/wiki/Microblog) a base del software libere "
 "[StatusNet](http://status.net/)."
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
@@ -5824,15 +5842,12 @@ msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
 "people you know. Try [people search](%%action.peoplesearch%%), look for "
 "members in groups you're interested in and in our [featured users](%%action."
-"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
+"featured%%)."
-"automatically subscribe to people you already follow there."
 msgstr ""
 "Tu non seque le notas de alcuno in iste momento. Tenta subscriber te a "
 "personas que tu cognosce. Proba [le recerca de personas](%%action."
 "peoplesearch%%), cerca membros in le gruppos de tu interesse e in le "
-"[usatores in evidentia](%%action.featured%%). Si tu es [usator de Twitter](%%"
+"[usatores in evidentia](%%action.featured%%)."
-"action.twittersettings%%), tu pote automaticamente subscriber te a personas "
-"que tu ja seque la."
 
 #. TRANS: Subscription list text when looking at the subscriptions for a of a user other
 #. TRANS: than the logged in user that has no subscriptions. %s is the user nickname.
@@ -6242,22 +6257,32 @@ msgstr "Impossibile processar le URL '%s'"
 msgid "Robin thinks something is impossible."
 msgstr "Robin pensa que alique es impossibile."
 
+#. TRANS: Message used to be inserted as %2$s in  the text "No file may
+#. TRANS: be larger than %1$d byte and the file you sent was %2$s.".
+#. TRANS: %1$d is the number of bytes of an uploaded file.
+#, php-format
+msgid "%1$d byte"
+msgid_plural "%1$d bytes"
+msgstr[0] "%1$d byte"
+msgstr[1] "%1$d bytes"
+
 #. TRANS: Message given if an upload is larger than the configured maximum.
-#. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
+#. TRANS: %1$d (used for plural) is the byte limit for uploads,
-#. TRANS: %1$s is used for plural.
+#. TRANS: %2$s is the proper form of "n bytes". This is the only ways to have
+#. TRANS: gettext support multiple plurals in the same message, unfortunately...
 #, php-format
 msgid ""
-"No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
+"No file may be larger than %1$d byte and the file you sent was %2$s. Try to "
-"Try to upload a smaller version."
+"upload a smaller version."
 msgid_plural ""
-"No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
+"No file may be larger than %1$d bytes and the file you sent was %2$s. Try to "
-"Try to upload a smaller version."
+"upload a smaller version."
 msgstr[0] ""
 "Nulle file pote esser plus grande que %1$d byte e le file que tu inviava ha %"
-"2$d bytes. Tenta incargar un version minus grande."
+"2$s. Tenta incargar un version minus grande."
 msgstr[1] ""
 "Nulle file pote esser plus grande que %1$d bytes e le file que tu inviava ha "
-"%2$d bytes. Tenta incargar un version minus grande."
+"%2$s. Tenta incargar un version minus grande."
 
 #. TRANS: Message given if an upload would exceed user quota.
 #. TRANS: %d (number) is the user quota in bytes and is used for plural.
@@ -6487,8 +6512,8 @@ msgid ""
 "You already have %1$d or more people in list %2$s, which is the maximum "
 "allowed number. Try unlisting others first."
 msgstr ""
-"Il ha jam %1$d o plus personas in le lista %2$s, que es le numero maxime "
+"Il ha jam %1$d o plus personas in le lista %2$s, que es le maximo "
-"permittite. Tenta primo remover alteres del lista."
+"permittite. Remove alteres del lista primo."
 
 #. TRANS: Exception thrown when inserting a list subscription in the database fails.
 msgid "Adding list subscription failed."
@@ -6841,19 +6866,10 @@ msgid "saveSettings() not implemented."
 msgstr "saveSettings() non implementate."
 
 #. TRANS: Header in administrator navigation panel.
-#. TRANS: Header in settings navigation panel.
 msgctxt "HEADER"
 msgid "Home"
 msgstr "Initio"
 
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in personal group navigation menu.
-#. TRANS: Menu item in settings navigation panel.
-msgctxt "MENU"
-msgid "Home"
-msgstr "Initio"
-
 #. TRANS: Header in administrator navigation panel.
 msgctxt "HEADER"
 msgid "Admin"
@@ -7663,13 +7679,6 @@ msgctxt "MENU"
 msgid "Public"
 msgstr "Public"
 
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in search group navigation panel.
-#. TRANS: Menu item in local navigation menu.
-msgctxt "MENU"
-msgid "Groups"
-msgstr "Gruppos"
-
 #. TRANS: Menu item in default local navigation panel.
 #. TRANS: Menu item title in local navigation menu.
 msgctxt "MENU"
@@ -7892,6 +7901,11 @@ msgstr "Vider totes"
 msgid "See all groups you belong to."
 msgstr "Vider tote le gruppos al quales tu pertine."
 
+#. TRANS: Menu item title in personal group navigation menu.
+#. TRANS: %s is a username.
+msgid "Back to top"
+msgstr "Retornar in alto"
+
 #. TRANS: Client exception 406
 msgid "This page is not available in a media type you accept"
 msgstr "Iste pagina non es disponibile in un formato que tu accepta"
@@ -8355,6 +8369,10 @@ msgstr ""
 
 #. TRANS: Subject of group join notification e-mail.
 #. TRANS: %1$s is the joining user's nickname, %2$s is the group name, and %3$s is the StatusNet sitename.
+#, php-format
+msgid "%1$s has joined your group %2$s on %3$s"
+msgstr "%1$s ha adherite a tu gruppo %2$s in %3$s"
+
 #. TRANS: Main body of group join notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
 #. TRANS: %4$s is a block of profile info about the subscriber.
@@ -8651,9 +8669,8 @@ msgstr "in contexto"
 msgid "Repeated by"
 msgstr "Repetite per"
 
-#, fuzzy
 msgid " "
-msgstr ", "
+msgstr " "
 
 #. TRANS: Link title in notice list item to reply to a notice.
 msgid "Reply to this notice."
@@ -9112,21 +9129,6 @@ msgstr "Cercar in contento de notas"
 msgid "Find groups on this site"
 msgstr "Cercar gruppos in iste sito"
 
-#. TRANS: Secondary navigation menu item leading to help on StatusNet.
-msgctxt "MENU"
-msgid "Help"
-msgstr "Adjuta"
-
-#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
-msgctxt "MENU"
-msgid "About"
-msgstr "A proposito"
-
-#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
-msgctxt "MENU"
-msgid "FAQ"
-msgstr "FAQ"
-
 #. TRANS: Secondary navigation menu item leading to Terms of Service.
 msgctxt "MENU"
 msgid "TOS"
@@ -9147,17 +9149,6 @@ msgctxt "MENU"
 msgid "Version"
 msgstr "Version"
 
-#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgctxt "MENU"
-msgid "Contact"
-msgstr "Contacto"
-
-#. TRANS: Secondary navigation menu item. Leads to information about embedding a timeline widget.
-msgctxt "MENU"
-msgid "Badge"
-msgstr "Insignia"
-
 #. TRANS: Default title for section/sidebar widget.
 msgid "Untitled section"
 msgstr "Section sin titulo"
@@ -9241,11 +9232,11 @@ msgstr "Applicationes autorisate connectite"
 #. TRANS: Menu item in settings navigation panel.
 msgctxt "MENU"
 msgid "Old school"
-msgstr ""
+msgstr "Interfacie ancian"
 
 #. TRANS: Menu item title in settings navigation panel.
 msgid "UI tweaks for old-school users"
-msgstr ""
+msgstr "Adjustamentos de interfacie pro usatores del vetule maniera"
 
 #. TRANS: Title of form to silence a user.
 msgctxt "TITLE"
@@ -9466,7 +9457,7 @@ msgstr "%1$s e %2$s"
 #. TRANS: List message for notice favoured by logged in user.
 msgctxt "FAVELIST"
 msgid "You like this."
-msgstr "Isto te place."
+msgstr "Tu apprecia isto."
 
 #. TRANS: List message for when more than 4 people like something.
 #. TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice.
@@ -9474,8 +9465,8 @@ msgstr "Isto te place."
 #, php-format
 msgid "%%s and %d others like this."
 msgid_plural "%%s and %d others like this."
-msgstr[0] "Isto place a %%s e a %d alteres."
+msgstr[0] "%%s e %d alteres apprecia isto."
-msgstr[1] "Isto place a %%s e a %d alteres."
+msgstr[1] "%%s e %d alteres apprecia isto."
 
 #. TRANS: List message for favoured notices.
 #. TRANS: %%s is a list of users liking a notice.
@@ -9483,21 +9474,31 @@ msgstr[1] "Isto place a %%s e a %d alteres."
 #, php-format
 msgid "%%s likes this."
 msgid_plural "%%s like this."
-msgstr[0] "%%s ama isto."
+msgstr[0] "%%s apprecia isto."
-msgstr[1] "%%s ama isto."
+msgstr[1] "%%s apprecia isto."
 
 #. TRANS: List message for notice repeated by logged in user.
 msgctxt "REPEATLIST"
-msgid "You have repeated this notice."
+msgid "You repeated this."
-msgstr "Tu ha repetite iste nota."
+msgstr "Tu ha repetite isto."
 
-#. TRANS: List message for repeated notices.
+#. TRANS: List message for when more than 4 people repeat something.
-#. TRANS: %d is the number of users that have repeated a notice.
+#. TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice.
+#. TRANS: Plural is decided on the total number of users liking the notice (count of %%s + %d).
 #, php-format
-msgid "One person has repeated this notice."
+msgid "%%s and %d other repeated this."
-msgid_plural "%d people have repeated this notice."
+msgid_plural "%%s and %d others repeated this."
-msgstr[0] "Un persona ha repetite iste nota."
+msgstr[0] "%%s e %d alteres ha repetite isto."
-msgstr[1] "%d personas ha repetite iste nota."
+msgstr[1] "%%s e %d alteres ha repetite isto."
+
+#. TRANS: List message for favoured notices.
+#. TRANS: %%s is a list of users liking a notice.
+#. TRANS: Plural is based on the number of of users that have favoured a notice.
+#, php-format
+msgid "%%s repeated this."
+msgid_plural "%%s repeated this."
+msgstr[0] "%%s ha repetite isto."
+msgstr[1] "%%s ha repetite isto."
 
 #. TRANS: Form legend.
 #, php-format